diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/AzureSearchIndexWriteBehaviorType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/AzureSearchIndexWriteBehaviorType.cs new file mode 100644 index 0000000000000..1835e10bed81f --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/AzureSearchIndexWriteBehaviorType.cs @@ -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 +{ + + /// + /// Defines values for AzureSearchIndexWriteBehaviorType. + /// + public static class AzureSearchIndexWriteBehaviorType + { + public const string Merge = "Merge"; + public const string Upload = "Upload"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/CassandraSourceReadConsistencyLevels.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/CassandraSourceReadConsistencyLevels.cs new file mode 100644 index 0000000000000..59087b1bada47 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/CassandraSourceReadConsistencyLevels.cs @@ -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 +{ + + /// + /// Defines values for CassandraSourceReadConsistencyLevels. + /// + 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"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/CopyBehaviorType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/CopyBehaviorType.cs new file mode 100644 index 0000000000000..42805261ca0e6 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/CopyBehaviorType.cs @@ -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 +{ + + /// + /// Defines values for CopyBehaviorType. + /// + public static class CopyBehaviorType + { + public const string PreserveHierarchy = "PreserveHierarchy"; + public const string FlattenHierarchy = "FlattenHierarchy"; + public const string MergeFiles = "MergeFiles"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/DynamicsSinkWriteBehavior.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/DynamicsSinkWriteBehavior.cs new file mode 100644 index 0000000000000..ab51de7a5277e --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/DynamicsSinkWriteBehavior.cs @@ -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 +{ + + /// + /// Defines values for DynamicsSinkWriteBehavior. + /// + public static class DynamicsSinkWriteBehavior + { + public const string Upsert = "Upsert"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/SalesforceSinkWriteBehavior.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/SalesforceSinkWriteBehavior.cs new file mode 100644 index 0000000000000..b30937daac68d --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/SalesforceSinkWriteBehavior.cs @@ -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 +{ + + /// + /// Defines values for SalesforceSinkWriteBehavior. + /// + public static class SalesforceSinkWriteBehavior + { + public const string Insert = "Insert"; + public const string Upsert = "Upsert"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/SalesforceSourceReadBehavior.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/SalesforceSourceReadBehavior.cs new file mode 100644 index 0000000000000..c1ee3f01a2041 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/SalesforceSourceReadBehavior.cs @@ -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 +{ + + /// + /// Defines values for SalesforceSourceReadBehavior. + /// + public static class SalesforceSourceReadBehavior + { + public const string Query = "Query"; + public const string QueryAll = "QueryAll"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/SapCloudForCustomerSinkWriteBehavior.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/SapCloudForCustomerSinkWriteBehavior.cs new file mode 100644 index 0000000000000..e0a2487c44a2b --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/SapCloudForCustomerSinkWriteBehavior.cs @@ -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 +{ + + /// + /// Defines values for SapCloudForCustomerSinkWriteBehavior. + /// + public static class SapCloudForCustomerSinkWriteBehavior + { + public const string Insert = "Insert"; + public const string Update = "Update"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/TabularPartitionOption.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/TabularPartitionOption.cs new file mode 100644 index 0000000000000..9730699a3c58b --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Extensions/TabularPartitionOption.cs @@ -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 +{ + + /// + /// Defines values for TabularPartitionOption. + /// + 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"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index 5361f1b8cbffc..c6734a09523d0 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj @@ -6,20 +6,28 @@ 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. - 3.0.2 + 4.0.0 Microsoft.Azure.Management.DataFactory Microsoft Azure resource management;Data Factory;ADF; $(SdkTargetFx) - true - true + false + false diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs index 561d5581311d8..0c72202d95a5b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/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("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")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/changelog.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/changelog.md index bed6370772335..b895ea920625f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/changelog.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/changelog.md @@ -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 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/Microsoft.Azure.Management.DataFactory.Tests.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/Microsoft.Azure.Management.DataFactory.Tests.csproj index 8b274b109d5ad..adf6bd222e691 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/Microsoft.Azure.Management.DataFactory.Tests.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/Microsoft.Azure.Management.DataFactory.Tests.csproj @@ -7,8 +7,8 @@ 1.0.0 - true - true + false + false