Update from master

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md

@@ -1,12 +1,5 @@
 # Changelog for the Azure Data Factory V2 .NET SDK
 
-## Version 4.11.0
-###  Feature Additions
-- Added support for Trigger Run Cancel API
-- Added column delimiter for SAP Table/open hub
-- Added azureCloudType for Aad Auth
-- Added snapshot to Azure File Storage linked service
-
 ## Version 4.10.0
 ###  Feature Additions
 - Added connectionProperties property to QuickBooks, Square, Xero, Zoho, SalesforceMarketingCloud linked service

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj

@@ -5,15 +5,18 @@
   <PropertyGroup>
     <PackageId>Microsoft.Azure.Management.DataFactory</PackageId>
     <Description>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.</Description>
-    <Version>4.11.0</Version>
+    <Version>4.10.0</Version>
     <AssemblyName>Microsoft.Azure.Management.DataFactory</AssemblyName>
     <PackageTags>Microsoft Azure resource management;Data Factory;ADF;</PackageTags>
     <PackageReleaseNotes>
   <![CDATA[
-- Added support for Trigger Run Cancel API
-- Added column delimiter for SAP Table/open hub
-- Added azureCloudType for Aad Auth
-- Added snapshot to Azure File Storage linked service
+- Added connectionProperties property to QuickBooks, Square, Xero, Zoho, SalesforceMarketingCloud linked service
+- Added support of Message server connecting from SAP Open Hub
+- Enable Sql Sources (AzureSqlDatabase, SqlSever, Synapse, SqlMI) read in parallel, support partition by dynamic range and sql built-in partitions.
+- Added Rest as Sink Type in Copy Sink
+- Added NewClusterLogDestination property to Azure Databricks linked service
+- Support expression (object) type for data flow staging folder path
+- Add new type "AzPowerShellSetup" to parameter "ExpressCustomSetup" for "AzureRmDataFactoryV2IntegrationRuntime" cmd to install Azure PowerShell
   ]]></PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup>

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs

@@ -6,8 +6,8 @@
 
 [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")]
 [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")]
-[assembly: AssemblyVersion("4.11.0.0")]
-[assembly: AssemblyFileVersion("4.11.0.0")]
+[assembly: AssemblyVersion("4.10.0.0")]
+[assembly: AssemblyFileVersion("4.10.0.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Microsoft Azure .NET SDK")]

sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs

@@ -11,27 +11,6 @@ namespace DataFactory.Tests.JsonSamples
     /// </summary>
     public class LinkedServiceJsonSamples : JsonSampleCollection<LinkedServiceJsonSamples>
     {
-        [JsonSample]
-        public const string AzureBlobFSLinkedService = @"
-{
-    name: ""Test-Windows-Azure-storage-account-linkedService"",
-    properties:
-    {
-        type: ""AzureBlobFS"",
-        typeProperties:
-        {
-          url: ""https://testblobfs.dfs.core.windows.net"",
-          servicePrincipalId: ""9c8b1ab1-a894-4639-8fb9-75f98a36e9ab"",
-          servicePrincipalKey: {
-             type: ""SecureString"",
-             value: ""mykey""
-          },
-          tenant: ""72f988bf-86f1-41af-91ab-2d7cd011db47"",
-          azureCloudType: ""AzurePublic""
-        }
-    }
-}";
-
         [JsonSample]
         public const string AzureStorageLinkedService = @"
 {
@@ -154,10 +133,9 @@ public class LinkedServiceJsonSamples : JsonSampleCollection<LinkedServiceJsonSa
             connectionString: {
                 value : ""fakeConnString"",
                 type : ""SecureString""
-            },
-            azureCloudType: ""AzurePublic""
+            }
         }
-}
+    }
 }";
 
         [JsonSample]
@@ -178,8 +156,7 @@ public class LinkedServiceJsonSamples : JsonSampleCollection<LinkedServiceJsonSa
                 value: ""fakeSPKey"",
                 type: ""SecureString""
             },
-            tenant: ""fakeTenant"",
-            azureCloudType: ""AzurePublic""
+            tenant: ""fakeTenant""
         }
     }
 }";
@@ -221,8 +198,7 @@ public class LinkedServiceJsonSamples : JsonSampleCollection<LinkedServiceJsonSa
             connectionString: {
                 value : ""fakeConnString"",
                 type : ""SecureString""
-            },
-            azureCloudType: ""AzurePublic""
+            }
         }
     }
 }";
@@ -800,8 +776,7 @@ public class LinkedServiceJsonSamples : JsonSampleCollection<LinkedServiceJsonSa
             password : {
                 value : ""fakepassword"",
                 type : ""SecureString""
-            },
-            azureCloudType: ""AzurePublic""
+            }
         }
     }
 }";
@@ -2707,8 +2682,7 @@ public class LinkedServiceJsonSamples : JsonSampleCollection<LinkedServiceJsonSa
             ""password"": {
                 ""type"": ""SecureString"",
                 ""value"": ""fakepsw""
-            },
-            ""azureCloudType"": ""AzurePublic""
+            }
         }
     }
 }";
@@ -2788,25 +2762,6 @@ public class LinkedServiceJsonSamples : JsonSampleCollection<LinkedServiceJsonSa
     }
 }";
 
-        [JsonSample]
-        public const string AzureFileStorageLinkedServiceWithConnectionStringWithAccountKey = @"
-{
-    name: ""AzureFileStorageLinkedServiceWithConnectionString"",
-    properties:
-    {
-        type: ""AzureFileStorage"",
-        typeProperties:
-        {
-            connectionString: {
-                value : ""fakeConnString"",
-                type : ""SecureString""
-            },
-            fileShare: ""myFileShareName"",
-            snapshot: ""2020-06-18T02:35.43""
-        }
-}
-}";
-
         [JsonSample]
         public const string AzureFileStorageLinkedServiceWithConnectionStringAndAccountKeyInAKV = @"
 {

sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs

@@ -3815,9 +3815,7 @@ public class PipelineJsonSamples : JsonSampleCollection<PipelineJsonSamples>
                     {
                         type: ""SapOpenHubSource"",
                         excludeLastRequest: false,
-                        baseRequestId: ""123"",
-                        customRfcReadTableFunctionModule: ""fakecustomRfcReadTableFunctionModule"",
-                        sapDataColumnDelimiter: ""|""
+                        baseRequestId: ""123""
                     },
                     sink:
                     {
@@ -5589,7 +5587,6 @@ public class PipelineJsonSamples : JsonSampleCollection<PipelineJsonSamples>
                     {
                         type: ""SapTableSource"",
                         rowCount: 3,
-                        sapDataColumnDelimiter: ""|"",
                         partitionOption: ""PartitionOnCalendarDate"",
                         partitionSettings: 
                         {