Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,19 @@ public TabularTranslator()
/// </summary>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="columnMappings">Column mappings. Type: string (or
/// Expression with resultType string).</param>
public TabularTranslator(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object columnMappings = default(object))
/// <param name="columnMappings">Column mappings. Example: "UserId:
/// MyUserId, Group: MyGroup, Name: MyName" Type: string (or Expression
/// with resultType string).</param>
/// <param name="schemaMapping">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).</param>
public TabularTranslator(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object columnMappings = default(object), object schemaMapping = default(object))
: base(additionalProperties)
{
ColumnMappings = columnMappings;
SchemaMapping = schemaMapping;
CustomInit();
}

Expand All @@ -48,11 +55,21 @@ public TabularTranslator()
partial void CustomInit();

/// <summary>
/// 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).
/// </summary>
[JsonProperty(PropertyName = "columnMappings")]
public object ColumnMappings { get; set; }

/// <summary>
/// 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).
/// </summary>
[JsonProperty(PropertyName = "schemaMapping")]
public object SchemaMapping { get; set; }

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,13 @@
<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>0.8.0-preview</Version>
<Version>0.9.0-preview</Version>
<AssemblyName>Microsoft.Azure.Management.DataFactory</AssemblyName>
<PackageTags>Microsoft Azure resource management;Data Factory;ADF;</PackageTags>
<PackageReleaseNotes>
<![CDATA[
Updates in this release:
- Added Configure factory repository operation
- Updated QuickBooks LinkedService to expose consumerKey and consumerSecret properties
- Updated Several model types from SecretBase to Object
- Added Blob Events trigger
- Remove maximum maxParallelExecutionsPerNode limitation
]]>
</PackageReleaseNotes>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
6 changes: 6 additions & 0 deletions src/SDKs/DataFactory/Management.DataFactory/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@

### Feature Additions

## Version 0.9.0-preview

### Feature Additions

* Remove maxParallelExecutionsPerNode limitation

## Version 0.8.0-preview

### Feature Additions
Expand Down
30 changes: 24 additions & 6 deletions src/SDKs/_metadata/datafactory_resource-manager.txt
Original file line number Diff line number Diff line change
@@ -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