Skip to content

Commit

Permalink
[Datafactory] Fixing ADF generation issues and the build (#6624)
Browse files Browse the repository at this point in the history
* Updates from public repo

* Adding missing enum classes

* Update for license info and DynamicSink

* Fix erge issues

* Enabling ADF projects

* Regenerated from public repo

* Update for mgmgt.yml

* Updated the release notes and version

* Undo the change for mgmt.yml

* Remove sdk exclusion again
  • Loading branch information
hvermis authored and shahabhijeet committed Jun 20, 2019
1 parent 2fd9944 commit a91073c
Show file tree
Hide file tree
Showing 12 changed files with 202 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// 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 1.1.0.0
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.

namespace Microsoft.Azure.Management.DataFactory.Models
{

/// <summary>
/// Defines values for AzureSearchIndexWriteBehaviorType.
/// </summary>
public static class AzureSearchIndexWriteBehaviorType
{
public const string Merge = "Merge";
public const string Upload = "Upload";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// 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 1.1.0.0
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.

namespace Microsoft.Azure.Management.DataFactory.Models
{

/// <summary>
/// Defines values for CassandraSourceReadConsistencyLevels.
/// </summary>
public static class CassandraSourceReadConsistencyLevels
{
public const string ALL = "ALL";
public const string EACHQUORUM = "EACH_QUORUM";
public const string QUORUM = "QUORUM";
public const string LOCALQUORUM = "LOCAL_QUORUM";
public const string ONE = "ONE";
public const string TWO = "TWO";
public const string THREE = "THREE";
public const string LOCALONE = "LOCAL_ONE";
public const string SERIAL = "SERIAL";
public const string LOCALSERIAL = "LOCAL_SERIAL";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// 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 1.1.0.0
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.

namespace Microsoft.Azure.Management.DataFactory.Models
{

/// <summary>
/// Defines values for CopyBehaviorType.
/// </summary>
public static class CopyBehaviorType
{
public const string PreserveHierarchy = "PreserveHierarchy";
public const string FlattenHierarchy = "FlattenHierarchy";
public const string MergeFiles = "MergeFiles";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// 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 1.1.0.0
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.

namespace Microsoft.Azure.Management.DataFactory.Models
{

/// <summary>
/// Defines values for DynamicsSinkWriteBehavior.
/// </summary>
public static class DynamicsSinkWriteBehavior
{
public const string Upsert = "Upsert";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// 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 1.1.0.0
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.

namespace Microsoft.Azure.Management.DataFactory.Models
{

/// <summary>
/// Defines values for SalesforceSinkWriteBehavior.
/// </summary>
public static class SalesforceSinkWriteBehavior
{
public const string Insert = "Insert";
public const string Upsert = "Upsert";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// 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 1.1.0.0
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.

namespace Microsoft.Azure.Management.DataFactory.Models
{

/// <summary>
/// Defines values for SalesforceSourceReadBehavior.
/// </summary>
public static class SalesforceSourceReadBehavior
{
public const string Query = "Query";
public const string QueryAll = "QueryAll";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// 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 1.1.0.0
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.

namespace Microsoft.Azure.Management.DataFactory.Models
{

/// <summary>
/// Defines values for SapCloudForCustomerSinkWriteBehavior.
/// </summary>
public static class SapCloudForCustomerSinkWriteBehavior
{
public const string Insert = "Insert";
public const string Update = "Update";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// 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 1.1.0.0
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.

namespace Microsoft.Azure.Management.DataFactory.Models
{

/// <summary>
/// Defines values for TabularPartitionOption.
/// </summary>
public static class TabularPartitionOption
{
public const string None = "None";
public const string PartitionOnInt = "PartitionOnInt";
public const string PartitionOnCalendarYear = "PartitionOnCalendarYear";
public const string PartitionOnCalendarMonth = "PartitionOnCalendarMonth";
public const string PartitionOnCalendarDate = "PartitionOnCalendarDate";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,28 @@
<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>3.0.2</Version>
<Version>4.0.0</Version>
<AssemblyName>Microsoft.Azure.Management.DataFactory</AssemblyName>
<PackageTags>Microsoft Azure resource management;Data Factory;ADF;</PackageTags>
<PackageReleaseNotes> <![CDATA[
- Added new Validation and Webhook activities
- Added annotation property to Trigger resource
- Added support for the follwoing new datasets in ADF - ParquetDataset, DelimitedTextDataset, SapTableResourceDataset
- ParquetDataset will support follwoing locations AzureBlobStorageLocation, AzureBlobFSLocation, AzureDataLakeStoreLocation, AmazonS3Location, FileServerLocation, FtpServerLocation, SftpLocation, HttpServerLocation, HdfsLocation
- Added support for parameterization to a number of properties
- The table name is not required anymore for AzureSqlTable, AzureSqlDWTable, SqlServerTable
- Added a new property dataProxyProperties to Integration Runtime
- Added new SapTable Linked Services type
- Added types for Read and Write Connector settings in activities - AzureBlobStorageReadSetting, AzureBlobFSReadSetting, AzureDataLakeStoreReadSetting, AmazonS3ReadSetting, FileServerReadSetting, FtpReadSetting, SftpReadSetting, HttpReadSetting, HdfsReadSetting,
AzureBlobStorageWriteSetting, AzureBlobFSWriteSetting, AzureDataLakeStoreWriteSetting, FileServerWriteSetting, FormatReadSetting, DelimitedTextReadSetting, FormatWriteSetting, DelimitedTextWriteSetting
- Added new Copy sources - SapTableSource, SqlServerSource, AzureSqlSource
- Added new Copy sinks - ParquetSink, SqlServerSink, AzureSqlSink
]]></PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>$(SdkTargetFx)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
<ExcludeFromBuild>false</ExcludeFromBuild>
<ExcludeFromTest>false</ExcludeFromTest>
</PropertyGroup>

<!-- Please do not move/edit code below this line -->
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("3.0.0.0")]
[assembly: AssemblyFileVersion("3.0.2.0")]
[assembly: AssemblyVersion("4.0.0.0")]
[assembly: AssemblyFileVersion("4.0.0.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Microsoft Azure .NET SDK")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@
## Current version
### Feature Additions

## Version 4.0.0
### Feature Additions
### Breaking Changes
- Added support for the follwoing new datasets in ADF - ParquetDataset, DelimitedTextDataset, SapTableResourceDataset
- ParquetDataset will support follwoing locations AzureBlobStorageLocation, AzureBlobFSLocation, AzureDataLakeStoreLocation, AmazonS3Location, FileServerLocation, FtpServerLocation, SftpLocation, HttpServerLocation, HdfsLocation
- Added support for parameterization to a number of properties
- The table name is not required anymore for AzureSqlTable, AzureSqlDWTable, SqlServerTable
- Added a new property dataProxyProperties to Integration Runtime
- Added new SapTable Linked Services type
- Added types for Read and Write Connector settings in activities - AzureBlobStorageReadSetting, AzureBlobFSReadSetting, AzureDataLakeStoreReadSetting, AmazonS3ReadSetting, FileServerReadSetting, FtpReadSetting, SftpReadSetting, HttpReadSetting, HdfsReadSetting,
AzureBlobStorageWriteSetting, AzureBlobFSWriteSetting, AzureDataLakeStoreWriteSetting, FileServerWriteSetting, FormatReadSetting, DelimitedTextReadSetting, FormatWriteSetting, DelimitedTextWriteSetting
- Added new Copy sources - SapTableSource, SqlServerSource, AzureSqlSource
- Added new Copy sinks - ParquetSink, SqlServerSink, AzureSqlSink

## Version 3.0.2
### Feature Additions
- Added new Validation and Webhook activities
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<Version>1.0.0</Version>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
<ExcludeFromBuild>false</ExcludeFromBuild>
<ExcludeFromTest>false</ExcludeFromTest>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\src\Microsoft.Azure.Management.DataFactory.csproj" />
Expand Down

0 comments on commit a91073c

Please sign in to comment.