diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/IntegrationRuntimeComputeProperties.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/IntegrationRuntimeComputeProperties.cs index 7ef59ce76888..04ed5aefb1f2 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/IntegrationRuntimeComputeProperties.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/IntegrationRuntimeComputeProperties.cs @@ -117,10 +117,6 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.InclusiveMinimum, "NumberOfNodes", 1); } - if (MaxParallelExecutionsPerNode > 8) - { - throw new ValidationException(ValidationRules.InclusiveMaximum, "MaxParallelExecutionsPerNode", 8); - } if (MaxParallelExecutionsPerNode < 1) { throw new ValidationException(ValidationRules.InclusiveMinimum, "MaxParallelExecutionsPerNode", 1); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TabularTranslator.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TabularTranslator.cs index 8550c7df141e..05d0edfcce4f 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TabularTranslator.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/TabularTranslator.cs @@ -33,12 +33,19 @@ public TabularTranslator() /// /// Unmatched properties from the /// message are deserialized this collection - /// Column mappings. Type: string (or - /// Expression with resultType string). - public TabularTranslator(IDictionary additionalProperties = default(IDictionary), object columnMappings = default(object)) + /// Column mappings. Example: "UserId: + /// MyUserId, Group: MyGroup, Name: MyName" Type: string (or Expression + /// with resultType string). + /// The schema mapping to map between + /// tabular data and hierarchical data. Example: {"Column1": + /// "$.Column1", "Column2": "$.Column2.Property1", "Column3": + /// "$.Column2.Property2"}. Type: object (or Expression with resultType + /// object). + public TabularTranslator(IDictionary additionalProperties = default(IDictionary), object columnMappings = default(object), object schemaMapping = default(object)) : base(additionalProperties) { ColumnMappings = columnMappings; + SchemaMapping = schemaMapping; CustomInit(); } @@ -48,11 +55,21 @@ public TabularTranslator() partial void CustomInit(); /// - /// Gets or sets column mappings. Type: string (or Expression with - /// resultType string). + /// Gets or sets column mappings. Example: "UserId: MyUserId, Group: + /// MyGroup, Name: MyName" Type: string (or Expression with resultType + /// string). /// [JsonProperty(PropertyName = "columnMappings")] public object ColumnMappings { get; set; } + /// + /// Gets or sets the schema mapping to map between tabular data and + /// hierarchical data. Example: {"Column1": "$.Column1", "Column2": + /// "$.Column2.Property1", "Column3": "$.Column2.Property2"}. Type: + /// object (or Expression with resultType object). + /// + [JsonProperty(PropertyName = "schemaMapping")] + public object SchemaMapping { get; set; } + } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj b/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj index 4cf7d8aacd4e..cac4ceb3d5b4 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj +++ b/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj @@ -6,16 +6,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. - 0.8.0-preview + 0.9.0-preview Microsoft.Azure.Management.DataFactory Microsoft Azure resource management;Data Factory;ADF; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Properties/AssemblyInfo.cs b/src/SDKs/DataFactory/Management.DataFactory/Properties/AssemblyInfo.cs index 27c3102a3ca4..e25c7ee17047 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Properties/AssemblyInfo.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/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("0.8.0.0")] -[assembly: AssemblyFileVersion("0.8.0.0")] +[assembly: AssemblyVersion("0.9.0.0")] +[assembly: AssemblyFileVersion("0.9.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/src/SDKs/DataFactory/Management.DataFactory/changelog.md b/src/SDKs/DataFactory/Management.DataFactory/changelog.md index fa96688d7cc2..c6531e11f9d6 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/changelog.md +++ b/src/SDKs/DataFactory/Management.DataFactory/changelog.md @@ -4,6 +4,12 @@ ### Feature Additions +## Version 0.9.0-preview + +### Feature Additions + +* Remove maxParallelExecutionsPerNode limitation + ## Version 0.8.0-preview ### Feature Additions diff --git a/src/SDKs/_metadata/datafactory_resource-manager.txt b/src/SDKs/_metadata/datafactory_resource-manager.txt index 399680c9bab5..91d3a746dcfe 100644 --- a/src/SDKs/_metadata/datafactory_resource-manager.txt +++ b/src/SDKs/_metadata/datafactory_resource-manager.txt @@ -1,17 +1,35 @@ -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=latest --reflect-api-versions --csharp-sdks-folder=E:\ADF\azure-sdk-for-net\tools\..\src\SDKs\ -2018-05-23 20:04:22 UTC +Installing AutoRest version: latest + +> autorest@2.0.4280 preinstall C:\Users\meiyl\AppData\Roaming\npm\node_modules\autorest +> node ./preinstall-check + +C:\Users\meiyl\AppData\Roaming\npm\autorest -> C:\Users\meiyl\AppData\Roaming\npm\node_modules\autorest\dist\app.js ++ autorest@2.0.4280 +updated 1 package in 1.45s + +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=latest --reflect-api-versions --csharp-sdks-folder=D:\PSH\azure-sdk-for-net\src\SDKs +AutoRest code generation utility [version: 2.0.4280; node: v8.11.3] +(C) 2018 Microsoft Corporation. +https://aka.ms/autorest + Loading AutoRest core 'C:\Users\meiyl\.autorest\@microsoft.azure_autorest-core@2.0.4280\node_modules\@microsoft.azure\autorest-core\dist' (2.0.4280) + Loading AutoRest extension '@microsoft.azure/autorest.csharp' (~2.2.51->2.2.57) + Loading AutoRest extension '@microsoft.azure/autorest.modeler' (2.3.43->2.3.43) + +2018-06-19 04:01:09 UTC 1) azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: 0d97bd1e397779473c8863fdf3ca66a6b075f9c2 +Commit: f4f3345b797c11625d994de6012203041e8ee04c 2) AutoRest information Requested version: latest -Bootstrapper version: C:\Users\fgutierr\AppData\Roaming\npm +-- autorest@2.0.4262 `-- oad@0.1.7 `-- autorest@1.9.1 +Bootstrapper version: C:\Users\meiyl\AppData\Roaming\npm `-- autorest@2.0.4280 Latest installed version: -.\tools\generate.ps1 was invoked by generate.ps1