[DataFactory] Updating the SDK with latest swagger changes and preparing for release

src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/LinkedServiceJsonSamples.cs

@@ -1860,6 +1860,11 @@ public class LinkedServiceJsonSamples : JsonSampleCollection<LinkedServiceJsonSa
             newClusterVersion: ""3.4.x-scala2.11"",
             newClusterNumOfWorker: ""1"",
             newClusterNodeType: ""Standard_DS3_v2"",
+            newClusterDriverNodeType: ""Standard_DS3_v2"",
+            newClusterInitScripts: [
+                ""someScript""
+            ],
+            newClusterEnableElasticDisk: true,
             newClusterSparkConf: {
                 ""spark.speculation"": true
             }

src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/PipelineJsonSamples.cs

@@ -1803,7 +1803,8 @@ public class PipelineJsonSamples : JsonSampleCollection<PipelineJsonSamples>
                         ""PropertyBagPropertyName1"": ""PropertyBagValue1"",
                         ""propertyBagPropertyName2"": ""PropertyBagValue2"",
                         ""dateTime1"": ""2015-04-12T12:13:14Z"",
-                    }
+                    },
+                    ""retentionTimeInDays"": 35
                 }
             }
         ]

src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDatabricksLinkedService.cs

@@ -68,11 +68,20 @@ public AzureDatabricksLinkedService()
         /// user-specified Spark environment variables key-value pairs.</param>
         /// <param name="newClusterCustomTags">Additional tags for cluster
         /// resources.</param>
+        /// <param name="newClusterDriverNodeType">The driver node type for the
+        /// new cluster. Type: string (or Expression with resultType
+        /// string).</param>
+        /// <param name="newClusterInitScripts">User-defined initialization
+        /// scripts for the new cluster. Type: array of strings (or Expression
+        /// with resultType array of strings).</param>
+        /// <param name="newClusterEnableElasticDisk">Enable the elastic disk
+        /// on the new cluster. Type: boolean (or Expression with resultType
+        /// boolean).</param>
         /// <param name="encryptedCredential">The encrypted credential used for
         /// authentication. Credentials are encrypted using the integration
         /// runtime credential manager. Type: string (or Expression with
         /// resultType string).</param>
-        public AzureDatabricksLinkedService(object domain, SecretBase accessToken, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary<string, ParameterSpecification> parameters = default(IDictionary<string, ParameterSpecification>), IList<object> annotations = default(IList<object>), object existingClusterId = default(object), object newClusterVersion = default(object), object newClusterNumOfWorker = default(object), object newClusterNodeType = default(object), IDictionary<string, object> newClusterSparkConf = default(IDictionary<string, object>), IDictionary<string, object> newClusterSparkEnvVars = default(IDictionary<string, object>), IDictionary<string, object> newClusterCustomTags = default(IDictionary<string, object>), object encryptedCredential = default(object))
+        public AzureDatabricksLinkedService(object domain, SecretBase accessToken, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary<string, ParameterSpecification> parameters = default(IDictionary<string, ParameterSpecification>), IList<object> annotations = default(IList<object>), object existingClusterId = default(object), object newClusterVersion = default(object), object newClusterNumOfWorker = default(object), object newClusterNodeType = default(object), IDictionary<string, object> newClusterSparkConf = default(IDictionary<string, object>), IDictionary<string, object> newClusterSparkEnvVars = default(IDictionary<string, object>), IDictionary<string, object> newClusterCustomTags = default(IDictionary<string, object>), object newClusterDriverNodeType = default(object), object newClusterInitScripts = default(object), object newClusterEnableElasticDisk = default(object), object encryptedCredential = default(object))
             : base(additionalProperties, connectVia, description, parameters, annotations)
         {
             Domain = domain;
@@ -84,6 +93,9 @@ public AzureDatabricksLinkedService()
             NewClusterSparkConf = newClusterSparkConf;
             NewClusterSparkEnvVars = newClusterSparkEnvVars;
             NewClusterCustomTags = newClusterCustomTags;
+            NewClusterDriverNodeType = newClusterDriverNodeType;
+            NewClusterInitScripts = newClusterInitScripts;
+            NewClusterEnableElasticDisk = newClusterEnableElasticDisk;
             EncryptedCredential = encryptedCredential;
             CustomInit();
         }
@@ -160,6 +172,28 @@ public AzureDatabricksLinkedService()
         [JsonProperty(PropertyName = "typeProperties.newClusterCustomTags")]
         public IDictionary<string, object> NewClusterCustomTags { get; set; }
 
+        /// <summary>
+        /// Gets or sets the driver node type for the new cluster. Type: string
+        /// (or Expression with resultType string).
+        /// </summary>
+        [JsonProperty(PropertyName = "typeProperties.newClusterDriverNodeType")]
+        public object NewClusterDriverNodeType { get; set; }
+
+        /// <summary>
+        /// Gets or sets user-defined initialization scripts for the new
+        /// cluster. Type: array of strings (or Expression with resultType
+        /// array of strings).
+        /// </summary>
+        [JsonProperty(PropertyName = "typeProperties.newClusterInitScripts")]
+        public object NewClusterInitScripts { get; set; }
+
+        /// <summary>
+        /// Gets or sets enable the elastic disk on the new cluster. Type:
+        /// boolean (or Expression with resultType boolean).
+        /// </summary>
+        [JsonProperty(PropertyName = "typeProperties.newClusterEnableElasticDisk")]
+        public object NewClusterEnableElasticDisk { get; set; }
+
         /// <summary>
         /// Gets or sets the encrypted credential used for authentication.
         /// Credentials are encrypted using the integration runtime credential

src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CustomActivity.cs

@@ -54,14 +54,18 @@ public CustomActivity()
         /// is no restriction on the keys or values that can be used. The user
         /// specified custom activity has the full responsibility to consume
         /// and interpret the content defined.</param>
-        public CustomActivity(string name, object command, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), string description = default(string), IList<ActivityDependency> dependsOn = default(IList<ActivityDependency>), IList<UserProperty> userProperties = default(IList<UserProperty>), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), LinkedServiceReference resourceLinkedService = default(LinkedServiceReference), object folderPath = default(object), CustomActivityReferenceObject referenceObjects = default(CustomActivityReferenceObject), IDictionary<string, object> extendedProperties = default(IDictionary<string, object>))
+        /// <param name="retentionTimeInDays">The retention time for the files
+        /// submitted for custom activity. Type: double (or Expression with
+        /// resultType double).</param>
+        public CustomActivity(string name, object command, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), string description = default(string), IList<ActivityDependency> dependsOn = default(IList<ActivityDependency>), IList<UserProperty> userProperties = default(IList<UserProperty>), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), LinkedServiceReference resourceLinkedService = default(LinkedServiceReference), object folderPath = default(object), CustomActivityReferenceObject referenceObjects = default(CustomActivityReferenceObject), IDictionary<string, object> extendedProperties = default(IDictionary<string, object>), object retentionTimeInDays = default(object))
             : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy)
         {
             Command = command;
             ResourceLinkedService = resourceLinkedService;
             FolderPath = folderPath;
             ReferenceObjects = referenceObjects;
             ExtendedProperties = extendedProperties;
+            RetentionTimeInDays = retentionTimeInDays;
             CustomInit();
         }
 
@@ -105,6 +109,13 @@ public CustomActivity()
         [JsonProperty(PropertyName = "typeProperties.extendedProperties")]
         public IDictionary<string, object> ExtendedProperties { get; set; }
 
+        /// <summary>
+        /// Gets or sets the retention time for the files submitted for custom
+        /// activity. Type: double (or Expression with resultType double).
+        /// </summary>
+        [JsonProperty(PropertyName = "typeProperties.retentionTimeInDays")]
+        public object RetentionTimeInDays { get; set; }
+
         /// <summary>
         /// Validate the object.
         /// </summary>

src/SDKs/DataFactory/Management.DataFactory/Generated/SdkInfo_DataFactoryManagementClient.cs

@@ -39,10 +39,10 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_DataFactoryMana
       // BEGIN: Code Generation Metadata Section
       public static readonly String AutoRestVersion = "latest";
       public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283";
-      public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=C:\\Repos\\azure-sdk-for-net\\src\\SDKs";
+      public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=F:\\git\\azure-sdk-for-net\\src\\SDKs";
       public static readonly String GithubForkName = "Azure";
       public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "29f93fd613a783b7cce749669f24bf8e25aba96a";
+      public static readonly String GithubCommidId = "5df40b9b08b77fe7b78f90f6b7c470600b8ea063";
       public static readonly String CodeGenerationErrors = "";
       public static readonly String GithubRepoName = "azure-rest-api-specs";
       // END: Code Generation Metadata Section

src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj

@@ -10,10 +10,31 @@
 		<AssemblyName>Microsoft.Azure.Management.DataFactory</AssemblyName>
 		<PackageTags>Microsoft Azure resource management;Data Factory;ADF;</PackageTags>
 		<PackageReleaseNotes>	<![CDATA[
+    - Fixed AzureFunctionActivity
     - Added support for RestService Source
     - Added support for SAP BW Open Hub Source
     - Added support for collectionReference
-    - Added support for recovery mode for pipeline runs
+    - Added recovery mode for more advanced pipeline run retry capabilities (i.e. from a specific activity)
+    - Added newClusterDriverNodeType, newClusterInitScripts, and newClusterEnableElasticDisk properties to DataBricks linked service
+    - Added retentionTimeInDays property to CustomActivity
+    - New connectors supported as Copy source:
+        * Office365
+        * Native MongoDB
+        * CosmosDB MongoDB API
+        * ADLS Gen2
+        * Dynamics AX
+        * Azure Data Explorer
+        * Oracle Service Cloud
+        * GoogleAdWords
+    - New connector supported as copy sink:
+        * ADLS Gen2
+        * CosmosDB MongoDB API
+        * Azure Data Explorer
+    - Added support for incremental copy of files based on the lastModifiedTime for S3, File and Blob
+    - Added support to copy data from ADLS Gen1 to ADLS Gen2 with ACL
+    - Added support for ServiceUrl in the existing S3 linked service
+    - Added support for AADServicePrincipal authentication in OData linked service
+    - Added support for maxConcurrentConnections in copy source and sink
             ]]></PackageReleaseNotes>
 	</PropertyGroup>
 	<PropertyGroup>