diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 260c7dfa6b45..90e8582c7279 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -3,12 +3,12 @@ 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 --tag=package-2018-06 --csharp-sdks-folder=C:\Git\azure-sdk-for-net\sdk -2019-10-11 21:16:15 UTC +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 --tag=package-2018-06 --csharp-sdks-folder=C:\Users\zhenqxu\Source\Repos\azure-sdk-for-net\sdk +2019-10-21 10:53:53 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: 6560b6724324bc795979e807bac151336b2b3153 +Commit: 3e8d1784d5a765406505f22cb51935376062da3f AutoRest information Requested version: latest Bootstrapper version: autorest@2.0.4283 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CommonDataServiceForAppsLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CommonDataServiceForAppsLinkedService.cs index 75a317ca35c8..65b850d9567f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CommonDataServiceForAppsLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CommonDataServiceForAppsLinkedService.cs @@ -45,12 +45,11 @@ public CommonDataServiceForAppsLinkedService() /// 'OnPremisesWithIfd' /// The authentication type to connect /// to Common Data Service for Apps server. 'Office365' for online - /// scenario, 'Ifd' for on-premises with Ifd scenario. Type: string (or - /// Expression with resultType string). Possible values include: - /// 'Office365', 'Ifd' - /// User name to access the Common Data Service - /// for Apps instance. Type: string (or Expression with resultType - /// string). + /// scenario, 'Ifd' for on-premises with Ifd scenario. + /// 'AADServicePrincipal' for Server-To-Server authentication in online + /// scenario. Type: string (or Expression with resultType string). + /// Possible values include: 'Office365', 'Ifd', + /// 'AADServicePrincipal' /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -75,13 +74,31 @@ public CommonDataServiceForAppsLinkedService() /// on-prem and required for online when there are more than one Common /// Data Service for Apps instances associated with the user. Type: /// string (or Expression with resultType string). + /// User name to access the Common Data Service + /// for Apps instance. Type: string (or Expression with resultType + /// string). /// Password to access the Common Data Service /// for Apps instance. + /// The client ID of the application + /// in Azure Active Directory used for Server-To-Server authentication. + /// Type: string (or Expression with resultType string). + /// The service principal + /// credential type to use in Server-To-Server authentication. + /// 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for + /// certificate. Type: string (or Expression with resultType + /// string). + /// The credential of the + /// service principal object in Azure Active Directory. If + /// servicePrincipalCredentialType is 'ServicePrincipalKey', + /// servicePrincipalCredential can be SecureString or + /// AzureKeyVaultSecretReference. If servicePrincipalCredentialType is + /// 'ServicePrincipalCert', servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public CommonDataServiceForAppsLinkedService(string deploymentType, string authenticationType, object username, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), SecretBase password = default(SecretBase), object encryptedCredential = default(object)) + public CommonDataServiceForAppsLinkedService(string deploymentType, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { DeploymentType = deploymentType; @@ -92,6 +109,9 @@ public CommonDataServiceForAppsLinkedService() AuthenticationType = authenticationType; Username = username; Password = password; + ServicePrincipalId = servicePrincipalId; + ServicePrincipalCredentialType = servicePrincipalCredentialType; + ServicePrincipalCredential = servicePrincipalCredential; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -150,8 +170,10 @@ public CommonDataServiceForAppsLinkedService() /// /// Gets or sets the authentication type to connect to Common Data /// Service for Apps server. 'Office365' for online scenario, 'Ifd' for - /// on-premises with Ifd scenario. Type: string (or Expression with - /// resultType string). Possible values include: 'Office365', 'Ifd' + /// on-premises with Ifd scenario. 'AADServicePrincipal' for + /// Server-To-Server authentication in online scenario. Type: string + /// (or Expression with resultType string). Possible values include: + /// 'Office365', 'Ifd', 'AADServicePrincipal' /// [JsonProperty(PropertyName = "typeProperties.authenticationType")] public string AuthenticationType { get; set; } @@ -170,6 +192,35 @@ public CommonDataServiceForAppsLinkedService() [JsonProperty(PropertyName = "typeProperties.password")] public SecretBase Password { get; set; } + /// + /// Gets or sets the client ID of the application in Azure Active + /// Directory used for Server-To-Server authentication. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalId")] + public object ServicePrincipalId { get; set; } + + /// + /// Gets or sets the service principal credential type to use in + /// Server-To-Server authentication. 'ServicePrincipalKey' for + /// key/secret, 'ServicePrincipalCert' for certificate. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredentialType")] + public object ServicePrincipalCredentialType { get; set; } + + /// + /// Gets or sets the credential of the service principal object in + /// Azure Active Directory. If servicePrincipalCredentialType is + /// 'ServicePrincipalKey', servicePrincipalCredential can be + /// SecureString or AzureKeyVaultSecretReference. If + /// servicePrincipalCredentialType is 'ServicePrincipalCert', + /// servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredential")] + public SecretBase ServicePrincipalCredential { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -195,10 +246,6 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); } - if (Username == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Username"); - } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsAuthenticationType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsAuthenticationType.cs index 614215a7b1b4..83d41ff53edc 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsAuthenticationType.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsAuthenticationType.cs @@ -18,5 +18,6 @@ public static class DynamicsAuthenticationType { public const string Office365 = "Office365"; public const string Ifd = "Ifd"; + public const string AADServicePrincipal = "AADServicePrincipal"; } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsCrmLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsCrmLinkedService.cs index 259839e75d2d..2d0c6807e1a4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsCrmLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsCrmLinkedService.cs @@ -42,12 +42,10 @@ public DynamicsCrmLinkedService() /// include: 'Online', 'OnPremisesWithIfd' /// The authentication type to connect /// to Dynamics CRM server. 'Office365' for online scenario, 'Ifd' for - /// on-premises with Ifd scenario. Type: string (or Expression with - /// resultType string). Possible values include: 'Office365', - /// 'Ifd' - /// User name to access the Dynamics CRM - /// instance. Type: string (or Expression with resultType - /// string). + /// on-premises with Ifd scenario, 'AADServicePrincipal' for + /// Server-To-Server authentication in online scenario. Type: string + /// (or Expression with resultType string). Possible values include: + /// 'Office365', 'Ifd', 'AADServicePrincipal' /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -72,13 +70,31 @@ public DynamicsCrmLinkedService() /// required for online when there are more than one Dynamics CRM /// instances associated with the user. Type: string (or Expression /// with resultType string). + /// User name to access the Dynamics CRM + /// instance. Type: string (or Expression with resultType + /// string). /// Password to access the Dynamics CRM /// instance. + /// The client ID of the application + /// in Azure Active Directory used for Server-To-Server authentication. + /// Type: string (or Expression with resultType string). + /// The service principal + /// credential type to use in Server-To-Server authentication. + /// 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for + /// certificate. Type: string (or Expression with resultType + /// string). + /// The credential of the + /// service principal object in Azure Active Directory. If + /// servicePrincipalCredentialType is 'ServicePrincipalKey', + /// servicePrincipalCredential can be SecureString or + /// AzureKeyVaultSecretReference. If servicePrincipalCredentialType is + /// 'ServicePrincipalCert', servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public DynamicsCrmLinkedService(string deploymentType, string authenticationType, object username, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), SecretBase password = default(SecretBase), object encryptedCredential = default(object)) + public DynamicsCrmLinkedService(string deploymentType, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { DeploymentType = deploymentType; @@ -89,6 +105,9 @@ public DynamicsCrmLinkedService() AuthenticationType = authenticationType; Username = username; Password = password; + ServicePrincipalId = servicePrincipalId; + ServicePrincipalCredentialType = servicePrincipalCredentialType; + ServicePrincipalCredential = servicePrincipalCredential; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -145,8 +164,10 @@ public DynamicsCrmLinkedService() /// /// Gets or sets the authentication type to connect to Dynamics CRM /// server. 'Office365' for online scenario, 'Ifd' for on-premises with - /// Ifd scenario. Type: string (or Expression with resultType string). - /// Possible values include: 'Office365', 'Ifd' + /// Ifd scenario, 'AADServicePrincipal' for Server-To-Server + /// authentication in online scenario. Type: string (or Expression with + /// resultType string). Possible values include: 'Office365', 'Ifd', + /// 'AADServicePrincipal' /// [JsonProperty(PropertyName = "typeProperties.authenticationType")] public string AuthenticationType { get; set; } @@ -164,6 +185,35 @@ public DynamicsCrmLinkedService() [JsonProperty(PropertyName = "typeProperties.password")] public SecretBase Password { get; set; } + /// + /// Gets or sets the client ID of the application in Azure Active + /// Directory used for Server-To-Server authentication. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalId")] + public object ServicePrincipalId { get; set; } + + /// + /// Gets or sets the service principal credential type to use in + /// Server-To-Server authentication. 'ServicePrincipalKey' for + /// key/secret, 'ServicePrincipalCert' for certificate. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredentialType")] + public object ServicePrincipalCredentialType { get; set; } + + /// + /// Gets or sets the credential of the service principal object in + /// Azure Active Directory. If servicePrincipalCredentialType is + /// 'ServicePrincipalKey', servicePrincipalCredential can be + /// SecureString or AzureKeyVaultSecretReference. If + /// servicePrincipalCredentialType is 'ServicePrincipalCert', + /// servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredential")] + public SecretBase ServicePrincipalCredential { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -189,10 +239,6 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); } - if (Username == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Username"); - } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs index e0ffeaad8f51..8bc7dbd7d0eb 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs @@ -41,10 +41,9 @@ public DynamicsLinkedService() /// resultType string). /// The authentication type to connect /// to Dynamics server. 'Office365' for online scenario, 'Ifd' for - /// on-premises with Ifd scenario. Type: string (or Expression with - /// resultType string). - /// User name to access the Dynamics instance. - /// Type: string (or Expression with resultType string). + /// on-premises with Ifd scenario, 'AADServicePrincipal' for + /// Server-To-Server authentication in online scenario. Type: string + /// (or Expression with resultType string). /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -68,13 +67,30 @@ public DynamicsLinkedService() /// required for online when there are more than one Dynamics instances /// associated with the user. Type: string (or Expression with /// resultType string). + /// User name to access the Dynamics instance. + /// Type: string (or Expression with resultType string). /// Password to access the Dynamics /// instance. + /// The client ID of the application + /// in Azure Active Directory used for Server-To-Server authentication. + /// Type: string (or Expression with resultType string). + /// The service principal + /// credential type to use in Server-To-Server authentication. + /// 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for + /// certificate. Type: string (or Expression with resultType + /// string). + /// The credential of the + /// service principal object in Azure Active Directory. If + /// servicePrincipalCredentialType is 'ServicePrincipalKey', + /// servicePrincipalCredential can be SecureString or + /// AzureKeyVaultSecretReference. If servicePrincipalCredentialType is + /// 'ServicePrincipalCert', servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public DynamicsLinkedService(object deploymentType, object authenticationType, object username, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), SecretBase password = default(SecretBase), object encryptedCredential = default(object)) + public DynamicsLinkedService(object deploymentType, object authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { DeploymentType = deploymentType; @@ -85,6 +101,9 @@ public DynamicsLinkedService() AuthenticationType = authenticationType; Username = username; Password = password; + ServicePrincipalId = servicePrincipalId; + ServicePrincipalCredentialType = servicePrincipalCredentialType; + ServicePrincipalCredential = servicePrincipalCredential; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -139,7 +158,9 @@ public DynamicsLinkedService() /// /// Gets or sets the authentication type to connect to Dynamics server. /// 'Office365' for online scenario, 'Ifd' for on-premises with Ifd - /// scenario. Type: string (or Expression with resultType string). + /// scenario, 'AADServicePrincipal' for Server-To-Server authentication + /// in online scenario. Type: string (or Expression with resultType + /// string). /// [JsonProperty(PropertyName = "typeProperties.authenticationType")] public object AuthenticationType { get; set; } @@ -157,6 +178,35 @@ public DynamicsLinkedService() [JsonProperty(PropertyName = "typeProperties.password")] public SecretBase Password { get; set; } + /// + /// Gets or sets the client ID of the application in Azure Active + /// Directory used for Server-To-Server authentication. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalId")] + public object ServicePrincipalId { get; set; } + + /// + /// Gets or sets the service principal credential type to use in + /// Server-To-Server authentication. 'ServicePrincipalKey' for + /// key/secret, 'ServicePrincipalCert' for certificate. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredentialType")] + public object ServicePrincipalCredentialType { get; set; } + + /// + /// Gets or sets the credential of the service principal object in + /// Azure Active Directory. If servicePrincipalCredentialType is + /// 'ServicePrincipalKey', servicePrincipalCredential can be + /// SecureString or AzureKeyVaultSecretReference. If + /// servicePrincipalCredentialType is 'ServicePrincipalCert', + /// servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredential")] + public SecretBase ServicePrincipalCredential { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential @@ -182,10 +232,6 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); } - if (Username == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Username"); - } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcCompressionCodec.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcCompressionCodec.cs new file mode 100644 index 000000000000..4c34dd3a5833 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcCompressionCodec.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. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + + /// + /// Defines values for OrcCompressionCodec. + /// + public static class OrcCompressionCodec + { + public const string None = "none"; + public const string Zlib = "zlib"; + public const string Snappy = "snappy"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcDataset.cs index ab3d94b1cc48..a4f9322167b0 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcDataset.cs @@ -53,10 +53,13 @@ public OrcDataset() /// describing the Dataset. /// The folder that this Dataset is in. If not /// specified, Dataset will appear at the root level. - public OrcDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) + /// Possible values include: 'none', + /// 'zlib', 'snappy' + public OrcDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), string orcCompressionCodec = default(string)) : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { Location = location; + OrcCompressionCodec = orcCompressionCodec; CustomInit(); } @@ -71,6 +74,12 @@ public OrcDataset() [JsonProperty(PropertyName = "typeProperties.location")] public DatasetLocation Location { get; set; } + /// + /// Gets or sets possible values include: 'none', 'zlib', 'snappy' + /// + [JsonProperty(PropertyName = "typeProperties.orcCompressionCodec")] + public string OrcCompressionCodec { get; set; } + /// /// Validate the object. /// 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 493bfddc1796..ad7517fc9137 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 @@ -41,10 +41,10 @@ public static IEnumerable> ApiInfo_DataFactoryMana // BEGIN: Code Generation Metadata Section public static readonly String AutoRestVersion = "latest"; public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283"; - 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=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=C:\\Git\\azure-sdk-for-net\\sdk"; + 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=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=C:\\Users\\zhenqxu\\Source\\Repos\\azure-sdk-for-net\\sdk"; public static readonly String GithubForkName = "Azure"; public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "6560b6724324bc795979e807bac151336b2b3153"; + public static readonly String GithubCommidId = "3e8d1784d5a765406505f22cb51935376062da3f"; public static readonly String CodeGenerationErrors = ""; public static readonly String GithubRepoName = "azure-rest-api-specs"; // END: Code Generation Metadata Section 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 c8a5ddbcbda3..42ff0da85547 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 @@ -5,15 +5,14 @@ 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. - 4.3.0 + 4.4.0 Microsoft.Azure.Management.DataFactory Microsoft Azure resource management;Data Factory;ADF; 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 59e5361712a6..eb81eecd95f9 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] [assembly: AssemblyVersion("4.3.0.0")] -[assembly: AssemblyFileVersion("4.3.0.0")] +[assembly: AssemblyFileVersion("4.4.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 74cd0e0acb54..a04fc3d84ed6 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/changelog.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/changelog.md @@ -1,7 +1,10 @@ # Changelog for the Azure Data Factory V2 .NET SDK -## Current version +## Version 4.4.0 ### Feature Additions +- Added Serve-to-Server authentication type for Dynamics 365, Dynamics CRM and Common Data Service for Apps connector +- Changed Username from required to optional in Dynamics 365, Dynamics CRM and Common Data Service for Apps connector +- Added Compression codec proprty to Orc dataset ## Version 4.3.0 ### Feature Additions diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs index 0b35d1d23987..5bcb807c9f97 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs @@ -1209,9 +1209,22 @@ public class DatasetJsonSamples : JsonSampleCollection ""type"": ""AzureBlobStorageLocation"", ""container"": ""ContainerName"", ""folderPath"": ""dataflow/test/input"", - ""fileName"": ""data.parquet"" + ""fileName"": ""data.orc"" + }, + ""orcCompressionCodec"": ""snappy"" + }, + ""schema"": [ + { + ""name"": ""col1"", + ""type"": ""INT_32"" + }, + { + ""name"": ""col2"", + ""type"": ""Decimal"", + ""precision"": ""38"", + ""scale"": ""2"" } - } + ] } }"; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs index 1c7010677e5e..fbf3781b23b2 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -877,6 +877,60 @@ public class LinkedServiceJsonSamples : JsonSampleCollection