diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs index 6f66212d22e8..3025552c5ede 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs @@ -62,10 +62,12 @@ public ExecuteWranglingDataflowActivity() /// flow execution. Allows sinks with the same save order to be /// processed concurrently. Type: boolean (or Expression with /// resultType boolean) - /// List of Power Query activity sinks mapped to a - /// queryName. + /// (Deprecated. Please use Queries). List of Power + /// Query activity sinks mapped to a queryName. + /// List of mapping for Power Query mashup query + /// to sink dataset(s). /// Activity policy. - public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), IDictionary sinks = default(IDictionary), ActivityPolicy policy = default(ActivityPolicy)) + public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), IDictionary sinks = default(IDictionary), IList queries = default(IList), ActivityPolicy policy = default(ActivityPolicy)) : base(name, additionalProperties, description, dependsOn, userProperties) { DataFlow = dataFlow; @@ -76,6 +78,7 @@ public ExecuteWranglingDataflowActivity() ContinueOnError = continueOnError; RunConcurrently = runConcurrently; Sinks = sinks; + Queries = queries; Policy = policy; CustomInit(); } @@ -134,12 +137,19 @@ public ExecuteWranglingDataflowActivity() public object RunConcurrently { get; set; } /// - /// Gets or sets list of Power Query activity sinks mapped to a - /// queryName. + /// Gets or sets (Deprecated. Please use Queries). List of Power Query + /// activity sinks mapped to a queryName. /// [JsonProperty(PropertyName = "typeProperties.sinks")] public IDictionary Sinks { get; set; } + /// + /// Gets or sets list of mapping for Power Query mashup query to sink + /// dataset(s). + /// + [JsonProperty(PropertyName = "typeProperties.queries")] + public IList Queries { get; set; } + /// /// Gets or sets activity policy. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySinkMapping.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySinkMapping.cs new file mode 100644 index 000000000000..f4dae5123fb1 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySinkMapping.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.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Map Power Query mashup query to sink dataset(s). + /// + public partial class PowerQuerySinkMapping + { + /// + /// Initializes a new instance of the PowerQuerySinkMapping class. + /// + public PowerQuerySinkMapping() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the PowerQuerySinkMapping class. + /// + /// Name of the query in Power Query mashup + /// document. + /// List of sinks mapped to Power Query + /// mashup query. + public PowerQuerySinkMapping(string queryName = default(string), IList dataflowSinks = default(IList)) + { + QueryName = queryName; + DataflowSinks = dataflowSinks; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets name of the query in Power Query mashup document. + /// + [JsonProperty(PropertyName = "queryName")] + public string QueryName { get; set; } + + /// + /// Gets or sets list of sinks mapped to Power Query mashup query. + /// + [JsonProperty(PropertyName = "dataflowSinks")] + public IList DataflowSinks { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs similarity index 100% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WranglingDataFlow.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WranglingDataFlow.cs index aad4c5a477ba..5712b59b5f01 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WranglingDataFlow.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WranglingDataFlow.cs @@ -41,11 +41,14 @@ public WranglingDataFlow() /// specified, Data flow will appear at the root level. /// List of sources in Power Query. /// Power query mashup script. - public WranglingDataFlow(string description = default(string), IList annotations = default(IList), DataFlowFolder folder = default(DataFlowFolder), IList sources = default(IList), string script = default(string)) + /// Locale of the Power query mashup + /// document. + public WranglingDataFlow(string description = default(string), IList annotations = default(IList), DataFlowFolder folder = default(DataFlowFolder), IList sources = default(IList), string script = default(string), string documentLocale = default(string)) : base(description, annotations, folder) { Sources = sources; Script = script; + DocumentLocale = documentLocale; CustomInit(); } @@ -66,5 +69,11 @@ public WranglingDataFlow() [JsonProperty(PropertyName = "typeProperties.script")] public string Script { get; set; } + /// + /// Gets or sets locale of the Power query mashup document. + /// + [JsonProperty(PropertyName = "typeProperties.documentLocale")] + public string DocumentLocale { get; set; } + } } 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 fcaa64287cb3..ac665f5acd05 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 @@ -43,16 +43,5 @@ public static IEnumerable> ApiInfo_DataFactoryMana }.AsEnumerable(); } } - // 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:\\Projects\\azure-sdk-for-net-1\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "2a8a9a79b23c72c6092d5b1212acf6d69b1b3850"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -