diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
index a4f0dca78255..e6c356335207 100644
--- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
+++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
@@ -5,11 +5,11 @@ Generating CSharp code
Executing AutoRest command
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/main/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk
Autorest CSharp Version: 2.3.82
-2022-06-14 00:17:03 UTC
+2022-09-05 01:05:22 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: main
-Commit: de400f7204d30d25543ac967636180728d52a88f
+Commit: 40dae7f7ac39afa3ae8289e99df25858ea18f286
AutoRest information
Requested version: v2
-Bootstrapper version: autorest@2.0.4413
+Bootstrapper version: autorest@3.6.1
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
index c6bef5e48f5f..f47f8a6c6754 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md
@@ -1,5 +1,10 @@
# Changelog for the Azure Data Factory V2 .NET SDK
+## Version 6.4.0
+### Feature Additions
+- Added GoogleSheets connector in ADF
+- Added Synapse Spark activities in ADF
+
## Version 6.3.0
### Feature Additions
- Changed FactoryGitHubConfiguration url format for hostName description
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSynapseArtifactsLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSynapseArtifactsLinkedService.cs
new file mode 100644
index 000000000000..e2cc0fd29de8
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSynapseArtifactsLinkedService.cs
@@ -0,0 +1,99 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+ using Microsoft.Rest;
+ using Microsoft.Rest.Serialization;
+ using Newtonsoft.Json;
+ using System.Collections;
+ using System.Collections.Generic;
+ using System.Linq;
+
+ ///
+ /// Azure Synapse Analytics (Artifacts) linked service.
+ ///
+ [Newtonsoft.Json.JsonObject("AzureSynapseArtifacts")]
+ [Rest.Serialization.JsonTransformation]
+ public partial class AzureSynapseArtifactsLinkedService : LinkedService
+ {
+ ///
+ /// Initializes a new instance of the
+ /// AzureSynapseArtifactsLinkedService class.
+ ///
+ public AzureSynapseArtifactsLinkedService()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the
+ /// AzureSynapseArtifactsLinkedService class.
+ ///
+ /// https://<workspacename>.dev.azuresynapse.net,
+ /// Azure Synapse Analytics workspace URL. Type: string (or Expression
+ /// with resultType string).
+ /// Unmatched properties from the
+ /// message are deserialized this collection
+ /// The integration runtime reference.
+ /// Linked service description.
+ /// Parameters for linked service.
+ /// List of tags that can be used for
+ /// describing the linked service.
+ /// Required to specify MSI, if using
+ /// system assigned managed identity as authentication method. Type:
+ /// string (or Expression with resultType string).
+ public AzureSynapseArtifactsLinkedService(object endpoint, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object authentication = default(object))
+ : base(additionalProperties, connectVia, description, parameters, annotations)
+ {
+ Endpoint = endpoint;
+ Authentication = authentication;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets
+ /// https://<workspacename>.dev.azuresynapse.net, Azure
+ /// Synapse Analytics workspace URL. Type: string (or Expression with
+ /// resultType string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.endpoint")]
+ public object Endpoint { get; set; }
+
+ ///
+ /// Gets or sets required to specify MSI, if using system assigned
+ /// managed identity as authentication method. Type: string (or
+ /// Expression with resultType string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.authentication")]
+ public object Authentication { get; set; }
+
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public override void Validate()
+ {
+ base.Validate();
+ if (Endpoint == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "Endpoint");
+ }
+ }
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/BigDataPoolParametrizationReference.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/BigDataPoolParametrizationReference.cs
new file mode 100644
index 000000000000..f23ca69df67d
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/BigDataPoolParametrizationReference.cs
@@ -0,0 +1,82 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+ using Microsoft.Rest;
+ using Newtonsoft.Json;
+ using System.Linq;
+
+ ///
+ /// Big data pool reference type.
+ ///
+ public partial class BigDataPoolParametrizationReference
+ {
+ ///
+ /// Initializes a new instance of the
+ /// BigDataPoolParametrizationReference class.
+ ///
+ public BigDataPoolParametrizationReference()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the
+ /// BigDataPoolParametrizationReference class.
+ ///
+ /// Reference big data pool name. Type:
+ /// string (or Expression with resultType string).
+ public BigDataPoolParametrizationReference(object referenceName)
+ {
+ ReferenceName = referenceName;
+ CustomInit();
+ }
+ ///
+ /// Static constructor for BigDataPoolParametrizationReference class.
+ ///
+ static BigDataPoolParametrizationReference()
+ {
+ Type = "BigDataPoolReference";
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets reference big data pool name. Type: string (or
+ /// Expression with resultType string).
+ ///
+ [JsonProperty(PropertyName = "referenceName")]
+ public object ReferenceName { get; set; }
+
+ ///
+ /// Big data pool reference type.
+ ///
+ [JsonProperty(PropertyName = "type")]
+ public static string Type { get; private set; }
+
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public virtual void Validate()
+ {
+ if (ReferenceName == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "ReferenceName");
+ }
+ }
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleSheetsLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleSheetsLinkedService.cs
new file mode 100644
index 000000000000..0003135eb630
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleSheetsLinkedService.cs
@@ -0,0 +1,93 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+ using Microsoft.Rest;
+ using Microsoft.Rest.Serialization;
+ using Newtonsoft.Json;
+ using System.Collections;
+ using System.Collections.Generic;
+ using System.Linq;
+
+ ///
+ /// Linked service for GoogleSheets.
+ ///
+ [Newtonsoft.Json.JsonObject("GoogleSheets")]
+ [Rest.Serialization.JsonTransformation]
+ public partial class GoogleSheetsLinkedService : LinkedService
+ {
+ ///
+ /// Initializes a new instance of the GoogleSheetsLinkedService class.
+ ///
+ public GoogleSheetsLinkedService()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the GoogleSheetsLinkedService class.
+ ///
+ /// The api token for the GoogleSheets
+ /// source.
+ /// Unmatched properties from the
+ /// message are deserialized this collection
+ /// The integration runtime reference.
+ /// Linked service description.
+ /// Parameters for linked service.
+ /// List of tags that can be used for
+ /// describing the linked service.
+ /// The encrypted credential used for
+ /// authentication. Credentials are encrypted using the integration
+ /// runtime credential manager. Type: string (or Expression with
+ /// resultType string).
+ public GoogleSheetsLinkedService(SecretBase apiToken, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object))
+ : base(additionalProperties, connectVia, description, parameters, annotations)
+ {
+ ApiToken = apiToken;
+ EncryptedCredential = encryptedCredential;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets the api token for the GoogleSheets source.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.apiToken")]
+ public SecretBase ApiToken { get; set; }
+
+ ///
+ /// Gets or sets the encrypted credential used for authentication.
+ /// Credentials are encrypted using the integration runtime credential
+ /// manager. Type: string (or Expression with resultType string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.encryptedCredential")]
+ public object EncryptedCredential { get; set; }
+
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public override void Validate()
+ {
+ base.Validate();
+ if (ApiToken == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "ApiToken");
+ }
+ }
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HttpLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HttpLinkedService.cs
index 5c4832f8b56d..79e58d44a14e 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HttpLinkedService.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HttpLinkedService.cs
@@ -36,7 +36,7 @@ public HttpLinkedService()
/// Initializes a new instance of the HttpLinkedService class.
///
/// The base URL of the HTTP endpoint, e.g.
- /// http://www.microsoft.com. Type: string (or Expression with
+ /// https://www.microsoft.com. Type: string (or Expression with
/// resultType string).
/// Unmatched properties from the
/// message are deserialized this collection
@@ -95,7 +95,7 @@ public HttpLinkedService()
///
/// Gets or sets the base URL of the HTTP endpoint, e.g.
- /// http://www.microsoft.com. Type: string (or Expression with
+ /// https://www.microsoft.com. Type: string (or Expression with
/// resultType string).
///
[JsonProperty(PropertyName = "typeProperties.url")]
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedService.cs
index 8febd80e1fd9..063ee4c8a4b8 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedService.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedService.cs
@@ -16,9 +16,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models
using System.Linq;
///
- /// The Azure Data Factory nested object which contains the information and
- /// credential which can be used to connect with related store or compute
- /// resource.
+ /// The nested object which contains the information and credential which
+ /// can be used to connect with related store or compute resource.
///
public partial class LinkedService
{
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/NotebookParameter.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/NotebookParameter.cs
new file mode 100644
index 000000000000..a19bd2572cbd
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/NotebookParameter.cs
@@ -0,0 +1,63 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+ using Newtonsoft.Json;
+ using System.Linq;
+
+ ///
+ /// Notebook parameter.
+ ///
+ public partial class NotebookParameter
+ {
+ ///
+ /// Initializes a new instance of the NotebookParameter class.
+ ///
+ public NotebookParameter()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the NotebookParameter class.
+ ///
+ /// Notebook parameter value. Type: string (or
+ /// Expression with resultType string).
+ /// Notebook parameter type. Possible values
+ /// include: 'string', 'int', 'float', 'bool'
+ public NotebookParameter(object value = default(object), string type = default(string))
+ {
+ Value = value;
+ Type = type;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets notebook parameter value. Type: string (or Expression
+ /// with resultType string).
+ ///
+ [JsonProperty(PropertyName = "value")]
+ public object Value { get; set; }
+
+ ///
+ /// Gets or sets notebook parameter type. Possible values include:
+ /// 'string', 'int', 'float', 'bool'
+ ///
+ [JsonProperty(PropertyName = "type")]
+ public string Type { get; set; }
+
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/NotebookParameterType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/NotebookParameterType.cs
new file mode 100644
index 000000000000..6ecdf6de7c15
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/NotebookParameterType.cs
@@ -0,0 +1,24 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+
+ ///
+ /// Defines values for NotebookParameterType.
+ ///
+ public static class NotebookParameterType
+ {
+ public const string String = "string";
+ public const string Int = "int";
+ public const string Float = "float";
+ public const string Bool = "bool";
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SynapseNotebookActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SynapseNotebookActivity.cs
new file mode 100644
index 000000000000..1a50ff8d86bb
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SynapseNotebookActivity.cs
@@ -0,0 +1,160 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+ using Microsoft.Rest;
+ using Microsoft.Rest.Serialization;
+ using Newtonsoft.Json;
+ using System.Collections;
+ using System.Collections.Generic;
+ using System.Linq;
+
+ ///
+ /// Execute Synapse notebook activity.
+ ///
+ [Newtonsoft.Json.JsonObject("SynapseNotebook")]
+ [Rest.Serialization.JsonTransformation]
+ public partial class SynapseNotebookActivity : ExecutionActivity
+ {
+ ///
+ /// Initializes a new instance of the SynapseNotebookActivity class.
+ ///
+ public SynapseNotebookActivity()
+ {
+ Notebook = new SynapseNotebookReference();
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the SynapseNotebookActivity class.
+ ///
+ /// Activity name.
+ /// Synapse notebook reference.
+ /// Unmatched properties from the
+ /// message are deserialized this collection
+ /// Activity description.
+ /// Activity depends on condition.
+ /// Activity user properties.
+ /// Linked service reference.
+ /// Activity policy.
+ /// The name of the big data pool which will be
+ /// used to execute the notebook.
+ /// Notebook parameters.
+ /// Number of core and memory to be used for
+ /// executors allocated in the specified Spark pool for the session,
+ /// which will be used for overriding 'executorCores' and
+ /// 'executorMemory' of the notebook you provide. Type: string (or
+ /// Expression with resultType string).
+ /// Spark configuration properties, which will
+ /// override the 'conf' of the notebook you provide.
+ /// Number of core and memory to be used for
+ /// driver allocated in the specified Spark pool for the session, which
+ /// will be used for overriding 'driverCores' and 'driverMemory' of the
+ /// notebook you provide. Type: string (or Expression with resultType
+ /// string).
+ /// Number of executors to launch for this
+ /// session, which will override the 'numExecutors' of the notebook you
+ /// provide.
+ public SynapseNotebookActivity(string name, SynapseNotebookReference notebook, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), BigDataPoolParametrizationReference sparkPool = default(BigDataPoolParametrizationReference), IDictionary parameters = default(IDictionary), object executorSize = default(object), object conf = default(object), object driverSize = default(object), int? numExecutors = default(int?))
+ : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy)
+ {
+ Notebook = notebook;
+ SparkPool = sparkPool;
+ Parameters = parameters;
+ ExecutorSize = executorSize;
+ Conf = conf;
+ DriverSize = driverSize;
+ NumExecutors = numExecutors;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets synapse notebook reference.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.notebook")]
+ public SynapseNotebookReference Notebook { get; set; }
+
+ ///
+ /// Gets or sets the name of the big data pool which will be used to
+ /// execute the notebook.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.sparkPool")]
+ public BigDataPoolParametrizationReference SparkPool { get; set; }
+
+ ///
+ /// Gets or sets notebook parameters.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.parameters")]
+ public IDictionary Parameters { get; set; }
+
+ ///
+ /// Gets or sets number of core and memory to be used for executors
+ /// allocated in the specified Spark pool for the session, which will
+ /// be used for overriding 'executorCores' and 'executorMemory' of the
+ /// notebook you provide. Type: string (or Expression with resultType
+ /// string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.executorSize")]
+ public object ExecutorSize { get; set; }
+
+ ///
+ /// Gets or sets spark configuration properties, which will override
+ /// the 'conf' of the notebook you provide.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.conf")]
+ public object Conf { get; set; }
+
+ ///
+ /// Gets or sets number of core and memory to be used for driver
+ /// allocated in the specified Spark pool for the session, which will
+ /// be used for overriding 'driverCores' and 'driverMemory' of the
+ /// notebook you provide. Type: string (or Expression with resultType
+ /// string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.driverSize")]
+ public object DriverSize { get; set; }
+
+ ///
+ /// Gets or sets number of executors to launch for this session, which
+ /// will override the 'numExecutors' of the notebook you provide.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.numExecutors")]
+ public int? NumExecutors { get; set; }
+
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public override void Validate()
+ {
+ base.Validate();
+ if (Notebook == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "Notebook");
+ }
+ if (Notebook != null)
+ {
+ Notebook.Validate();
+ }
+ if (SparkPool != null)
+ {
+ SparkPool.Validate();
+ }
+ }
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SynapseNotebookReference.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SynapseNotebookReference.cs
new file mode 100644
index 000000000000..66acc9048c61
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SynapseNotebookReference.cs
@@ -0,0 +1,80 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+ using Microsoft.Rest;
+ using Newtonsoft.Json;
+ using System.Linq;
+
+ ///
+ /// Synapse notebook reference type.
+ ///
+ public partial class SynapseNotebookReference
+ {
+ ///
+ /// Initializes a new instance of the SynapseNotebookReference class.
+ ///
+ public SynapseNotebookReference()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the SynapseNotebookReference class.
+ ///
+ /// Reference notebook name. Type: string
+ /// (or Expression with resultType string).
+ public SynapseNotebookReference(object referenceName)
+ {
+ ReferenceName = referenceName;
+ CustomInit();
+ }
+ ///
+ /// Static constructor for SynapseNotebookReference class.
+ ///
+ static SynapseNotebookReference()
+ {
+ Type = "NotebookReference";
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets reference notebook name. Type: string (or Expression
+ /// with resultType string).
+ ///
+ [JsonProperty(PropertyName = "referenceName")]
+ public object ReferenceName { get; set; }
+
+ ///
+ /// Synapse notebook reference type.
+ ///
+ [JsonProperty(PropertyName = "type")]
+ public static string Type { get; private set; }
+
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public virtual void Validate()
+ {
+ if (ReferenceName == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "ReferenceName");
+ }
+ }
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SynapseSparkJobDefinitionActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SynapseSparkJobDefinitionActivity.cs
new file mode 100644
index 000000000000..c427ef65ab77
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SynapseSparkJobDefinitionActivity.cs
@@ -0,0 +1,207 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+ using Microsoft.Rest;
+ using Microsoft.Rest.Serialization;
+ using Newtonsoft.Json;
+ using System.Collections;
+ using System.Collections.Generic;
+ using System.Linq;
+
+ ///
+ /// Execute spark job activity.
+ ///
+ [Newtonsoft.Json.JsonObject("SparkJob")]
+ [Rest.Serialization.JsonTransformation]
+ public partial class SynapseSparkJobDefinitionActivity : ExecutionActivity
+ {
+ ///
+ /// Initializes a new instance of the SynapseSparkJobDefinitionActivity
+ /// class.
+ ///
+ public SynapseSparkJobDefinitionActivity()
+ {
+ SparkJob = new SynapseSparkJobReference();
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the SynapseSparkJobDefinitionActivity
+ /// class.
+ ///
+ /// Activity name.
+ /// Synapse spark job reference.
+ /// Unmatched properties from the
+ /// message are deserialized this collection
+ /// Activity description.
+ /// Activity depends on condition.
+ /// Activity user properties.
+ /// Linked service reference.
+ /// Activity policy.
+ /// User specified arguments to
+ /// SynapseSparkJobDefinitionActivity.
+ /// The main file used for the job, which will
+ /// override the 'file' of the spark job definition you provide. Type:
+ /// string (or Expression with resultType string).
+ /// The fully-qualified identifier or the main
+ /// class that is in the main definition file, which will override the
+ /// 'className' of the spark job definition you provide. Type: string
+ /// (or Expression with resultType string).
+ /// Additional files used for reference in the main
+ /// definition file, which will override the 'files' of the spark job
+ /// definition you provide.
+ /// The name of the big data pool which
+ /// will be used to execute the spark batch job, which will override
+ /// the 'targetBigDataPool' of the spark job definition you
+ /// provide.
+ /// Number of core and memory to be used for
+ /// executors allocated in the specified Spark pool for the job, which
+ /// will be used for overriding 'executorCores' and 'executorMemory' of
+ /// the spark job definition you provide. Type: string (or Expression
+ /// with resultType string).
+ /// Spark configuration properties, which will
+ /// override the 'conf' of the spark job definition you
+ /// provide.
+ /// Number of core and memory to be used for
+ /// driver allocated in the specified Spark pool for the job, which
+ /// will be used for overriding 'driverCores' and 'driverMemory' of the
+ /// spark job definition you provide. Type: string (or Expression with
+ /// resultType string).
+ /// Number of executors to launch for this
+ /// job, which will override the 'numExecutors' of the spark job
+ /// definition you provide.
+ public SynapseSparkJobDefinitionActivity(string name, SynapseSparkJobReference sparkJob, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), IList arguments = default(IList), object file = default(object), object className = default(object), IList files = default(IList), BigDataPoolParametrizationReference targetBigDataPool = default(BigDataPoolParametrizationReference), object executorSize = default(object), object conf = default(object), object driverSize = default(object), int? numExecutors = default(int?))
+ : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy)
+ {
+ SparkJob = sparkJob;
+ Arguments = arguments;
+ File = file;
+ ClassName = className;
+ Files = files;
+ TargetBigDataPool = targetBigDataPool;
+ ExecutorSize = executorSize;
+ Conf = conf;
+ DriverSize = driverSize;
+ NumExecutors = numExecutors;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets synapse spark job reference.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.sparkJob")]
+ public SynapseSparkJobReference SparkJob { get; set; }
+
+ ///
+ /// Gets or sets user specified arguments to
+ /// SynapseSparkJobDefinitionActivity.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.args")]
+ public IList Arguments { get; set; }
+
+ ///
+ /// Gets or sets the main file used for the job, which will override
+ /// the 'file' of the spark job definition you provide. Type: string
+ /// (or Expression with resultType string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.file")]
+ public object File { get; set; }
+
+ ///
+ /// Gets or sets the fully-qualified identifier or the main class that
+ /// is in the main definition file, which will override the 'className'
+ /// of the spark job definition you provide. Type: string (or
+ /// Expression with resultType string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.className")]
+ public object ClassName { get; set; }
+
+ ///
+ /// Gets or sets additional files used for reference in the main
+ /// definition file, which will override the 'files' of the spark job
+ /// definition you provide.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.files")]
+ public IList Files { get; set; }
+
+ ///
+ /// Gets or sets the name of the big data pool which will be used to
+ /// execute the spark batch job, which will override the
+ /// 'targetBigDataPool' of the spark job definition you provide.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.targetBigDataPool")]
+ public BigDataPoolParametrizationReference TargetBigDataPool { get; set; }
+
+ ///
+ /// Gets or sets number of core and memory to be used for executors
+ /// allocated in the specified Spark pool for the job, which will be
+ /// used for overriding 'executorCores' and 'executorMemory' of the
+ /// spark job definition you provide. Type: string (or Expression with
+ /// resultType string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.executorSize")]
+ public object ExecutorSize { get; set; }
+
+ ///
+ /// Gets or sets spark configuration properties, which will override
+ /// the 'conf' of the spark job definition you provide.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.conf")]
+ public object Conf { get; set; }
+
+ ///
+ /// Gets or sets number of core and memory to be used for driver
+ /// allocated in the specified Spark pool for the job, which will be
+ /// used for overriding 'driverCores' and 'driverMemory' of the spark
+ /// job definition you provide. Type: string (or Expression with
+ /// resultType string).
+ ///
+ [JsonProperty(PropertyName = "typeProperties.driverSize")]
+ public object DriverSize { get; set; }
+
+ ///
+ /// Gets or sets number of executors to launch for this job, which will
+ /// override the 'numExecutors' of the spark job definition you
+ /// provide.
+ ///
+ [JsonProperty(PropertyName = "typeProperties.numExecutors")]
+ public int? NumExecutors { get; set; }
+
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public override void Validate()
+ {
+ base.Validate();
+ if (SparkJob == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "SparkJob");
+ }
+ if (SparkJob != null)
+ {
+ SparkJob.Validate();
+ }
+ if (TargetBigDataPool != null)
+ {
+ TargetBigDataPool.Validate();
+ }
+ }
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SynapseSparkJobReference.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SynapseSparkJobReference.cs
new file mode 100644
index 000000000000..35872c2c622e
--- /dev/null
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SynapseSparkJobReference.cs
@@ -0,0 +1,78 @@
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+//
+
+namespace Microsoft.Azure.Management.DataFactory.Models
+{
+ using Microsoft.Rest;
+ using Newtonsoft.Json;
+ using System.Linq;
+
+ ///
+ /// Synapse spark job reference type.
+ ///
+ public partial class SynapseSparkJobReference
+ {
+ ///
+ /// Initializes a new instance of the SynapseSparkJobReference class.
+ ///
+ public SynapseSparkJobReference()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the SynapseSparkJobReference class.
+ ///
+ /// Reference spark job name.
+ public SynapseSparkJobReference(string referenceName)
+ {
+ ReferenceName = referenceName;
+ CustomInit();
+ }
+ ///
+ /// Static constructor for SynapseSparkJobReference class.
+ ///
+ static SynapseSparkJobReference()
+ {
+ Type = "SparkJobDefinitionReference";
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+ ///
+ /// Gets or sets reference spark job name.
+ ///
+ [JsonProperty(PropertyName = "referenceName")]
+ public string ReferenceName { get; set; }
+
+ ///
+ /// Synapse spark job reference type.
+ ///
+ [JsonProperty(PropertyName = "type")]
+ public static string Type { get; private set; }
+
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public virtual void Validate()
+ {
+ if (ReferenceName == null)
+ {
+ throw new ValidationException(ValidationRules.CannotBeNull, "ReferenceName");
+ }
+ }
+ }
+}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebAnonymousAuthentication.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebAnonymousAuthentication.cs
index bf3877872de6..8158688a8df3 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebAnonymousAuthentication.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebAnonymousAuthentication.cs
@@ -32,7 +32,7 @@ public WebAnonymousAuthentication()
/// Initializes a new instance of the WebAnonymousAuthentication class.
///
/// The URL of the web service endpoint, e.g.
- /// http://www.microsoft.com . Type: string (or Expression with
+ /// https://www.microsoft.com . Type: string (or Expression with
/// resultType string).
public WebAnonymousAuthentication(object url)
: base(url)
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebBasicAuthentication.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebBasicAuthentication.cs
index 739807b64a7d..d1732d2293b2 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebBasicAuthentication.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebBasicAuthentication.cs
@@ -33,7 +33,7 @@ public WebBasicAuthentication()
/// Initializes a new instance of the WebBasicAuthentication class.
///
/// The URL of the web service endpoint, e.g.
- /// http://www.microsoft.com . Type: string (or Expression with
+ /// https://www.microsoft.com . Type: string (or Expression with
/// resultType string).
/// User name for Basic authentication. Type:
/// string (or Expression with resultType string).
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebClientCertificateAuthentication.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebClientCertificateAuthentication.cs
index 47dd5ab229d4..09ba85143ef5 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebClientCertificateAuthentication.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebClientCertificateAuthentication.cs
@@ -37,7 +37,7 @@ public WebClientCertificateAuthentication()
/// WebClientCertificateAuthentication class.
///
/// The URL of the web service endpoint, e.g.
- /// http://www.microsoft.com . Type: string (or Expression with
+ /// https://www.microsoft.com . Type: string (or Expression with
/// resultType string).
/// Base64-encoded contents of a PFX file.
/// Password for the PFX file.
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebLinkedServiceTypeProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebLinkedServiceTypeProperties.cs
index 7a4f8008b724..f14c8be215a5 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebLinkedServiceTypeProperties.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebLinkedServiceTypeProperties.cs
@@ -35,7 +35,7 @@ public WebLinkedServiceTypeProperties()
/// class.
///
/// The URL of the web service endpoint, e.g.
- /// http://www.microsoft.com . Type: string (or Expression with
+ /// https://www.microsoft.com . Type: string (or Expression with
/// resultType string).
public WebLinkedServiceTypeProperties(object url)
{
@@ -50,7 +50,7 @@ public WebLinkedServiceTypeProperties(object url)
///
/// Gets or sets the URL of the web service endpoint, e.g.
- /// http://www.microsoft.com . Type: string (or Expression with
+ /// https://www.microsoft.com . Type: string (or Expression with
/// resultType string).
///
[JsonProperty(PropertyName = "url")]
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj
index 7953b080cd97..f655af087e0e 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj
@@ -5,14 +5,13 @@
Microsoft.Azure.Management.DataFactory
Azure Data Factory V2 is the data integration platform that goes beyond Azure Data Factory V1's orchestration and batch-processing of time-series data, with a general purpose app model supporting modern data warehousing patterns and scenarios, lift-and-shift SSIS, and data-driven SaaS applications. Compose and manage reliable and secure data integration workflows at scale. Use native ADF data connectors and Integration Runtimes to move and transform cloud and on-premises data that can be unstructured, semi-structured, and structured with Hadoop, Azure Data Lake, Spark, SQL Server, Cosmos DB and many other data platforms.
- 6.3.0
+ 6.4.0
Microsoft.Azure.Management.DataFactory
Microsoft Azure resource management;Data Factory;ADF;
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs
index 6c219afa4ac9..312cda5c6987 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@
[assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")]
[assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")]
[assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.3.0.0")]
+[assembly: AssemblyFileVersion("6.4.0.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Microsoft Azure .NET SDK")]
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs
index bc66d2cf449b..1a6e0fb731c5 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs
@@ -3408,5 +3408,21 @@ public class LinkedServiceJsonSamples : JsonSampleCollection