diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index f9ea1aa224f4..3500e9016c64 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -3,12 +3,12 @@ AutoRest installed successfully. Commencing code generation Generating CSharp code Executing AutoRest command -cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Git\Azure\azure-sdk-for-net\sdk -2020-06-03 08:26:23 UTC +cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=C:\Users\rizh\Documents\azure-sdk-for-net\sdk +2020-06-05 14:15:34 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: 41346a1b8bcf8265d7e86d844a72acc7ed9cfa1a +Commit: 09ac2b33d780dbf2f74de2083012f62aaa33c451 AutoRest information Requested version: v2 Bootstrapper version: autorest@2.0.4413 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 402f0de42436..1f8d6a01c856 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -2,6 +2,8 @@ ## Version 4.9.0 ### Feature Additions +- Added support for specifying a linked service as a Data Flow source and sink type +- Added support for providing a schema linked service reference within Data Flow sources and sinks - Added support for xml dataset in ADF - Added support for excel dataset in ADF - Added new type conversion support in Copy activity diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs index efb339dec941..a1c453f7fb67 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs @@ -40,10 +40,10 @@ public static IEnumerable> ApiInfo_DataFactoryMana // BEGIN: Code Generation Metadata Section public static readonly String AutoRestVersion = "v2"; public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - 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=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\\Git\\Azure\\azure-sdk-for-net\\sdk"; + 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=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=C:\\Users\\rizh\\Documents\\azure-sdk-for-net\\sdk"; public static readonly String GithubForkName = "Azure"; public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "41346a1b8bcf8265d7e86d844a72acc7ed9cfa1a"; + public static readonly String GithubCommidId = "09ac2b33d780dbf2f74de2083012f62aaa33c451"; public static readonly String CodeGenerationErrors = ""; public static readonly String GithubRepoName = "azure-rest-api-specs"; // END: Code Generation Metadata Section diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs index addd011f0c23..a37aa53bfd05 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DataFlowJsonSamples.cs @@ -52,6 +52,45 @@ public class DataFlowJsonSamples : JsonSampleCollection } } } +"; + [JsonSample] + public const string MappingDataFlowWithLinkedServices = @" + { + ""name"": ""exampleDataFlow"", + ""properties"": { + ""description"": ""Sample demo data flow to convert currencies showing usage of union, derive and conditional split transformation."", + ""type"": ""MappingDataFlow"", + ""typeProperties"": { + ""sources"": [ + { + ""linkedService"": { + ""referenceName"": ""SourceLinkedService"", + ""type"": ""LinkedServiceReference"" + }, + ""schemaLinkedService"": { + ""referenceName"": ""SourceSchemaLinkedService"", + ""type"": ""LinkedServiceReference"" + }, + ""name"": ""USDCurrency"" + } + ], + ""sinks"": [ + { + ""linkedService"": { + ""referenceName"": ""SinkLinkedService"", + ""type"": ""LinkedServiceReference"" + }, + ""schemaLinkedService"": { + ""referenceName"": ""SinkSchemaLinkedService"", + ""type"": ""LinkedServiceReference"" + }, + ""name"": ""USDSink"" + } + ], + ""script"": ""some script"" + } + } + } "; } }