diff --git a/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/Models/IdentityType.cs b/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/Models/IdentityType.cs
index 83b18afcdd7e..77309161091c 100644
--- a/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/Models/IdentityType.cs
+++ b/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/Models/IdentityType.cs
@@ -19,5 +19,6 @@ public static class IdentityType
public const string None = "None";
public const string SystemAssigned = "SystemAssigned";
public const string UserAssigned = "UserAssigned";
+ public const string SystemAssignedUserAssigned = "SystemAssigned,UserAssigned";
}
}
diff --git a/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/Models/ResourceIdentity.cs b/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/Models/ResourceIdentity.cs
index f1c2678f640b..f199bc092a0f 100644
--- a/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/Models/ResourceIdentity.cs
+++ b/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/Models/ResourceIdentity.cs
@@ -38,7 +38,8 @@ public ResourceIdentity()
/// The identity type. Set this to 'SystemAssigned'
/// in order to automatically create and assign an Azure Active
/// Directory principal for the resource. Possible values include:
- /// 'None', 'SystemAssigned', 'UserAssigned'
+ /// 'None', 'SystemAssigned', 'UserAssigned',
+ /// 'SystemAssigned,UserAssigned'
/// The Azure Active Directory tenant
/// id.
public ResourceIdentity(IDictionary userAssignedIdentities = default(IDictionary), System.Guid? principalId = default(System.Guid?), string type = default(string), System.Guid? tenantId = default(System.Guid?))
@@ -72,7 +73,7 @@ public ResourceIdentity()
/// Gets or sets the identity type. Set this to 'SystemAssigned' in
/// order to automatically create and assign an Azure Active Directory
/// principal for the resource. Possible values include: 'None',
- /// 'SystemAssigned', 'UserAssigned'
+ /// 'SystemAssigned', 'UserAssigned', 'SystemAssigned,UserAssigned'
///
[JsonProperty(PropertyName = "type")]
public string Type { get; set; }
diff --git a/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/Models/ResourceIdentityWithUserAssignedIdentities.cs b/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/Models/ResourceIdentityWithUserAssignedIdentities.cs
deleted file mode 100644
index 6df0be98d2ba..000000000000
--- a/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/Models/ResourceIdentityWithUserAssignedIdentities.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// 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.Sql.Models
-{
- using Newtonsoft.Json;
- using System.Collections;
- using System.Collections.Generic;
- using System.Linq;
-
- ///
- /// Azure Active Directory identity configuration for a resource.
- ///
- public partial class ResourceIdentityWithUserAssignedIdentities
- {
- ///
- /// Initializes a new instance of the
- /// ResourceIdentityWithUserAssignedIdentities class.
- ///
- public ResourceIdentityWithUserAssignedIdentities()
- {
- CustomInit();
- }
-
- ///
- /// Initializes a new instance of the
- /// ResourceIdentityWithUserAssignedIdentities class.
- ///
- /// The resource ids of the user
- /// assigned identities to use
- /// The Azure Active Directory principal
- /// id.
- /// The identity type. Set this to 'SystemAssigned'
- /// in order to automatically create and assign an Azure Active
- /// Directory principal for the resource. Possible values include:
- /// 'None', 'SystemAssigned', 'UserAssigned'
- /// The Azure Active Directory tenant
- /// id.
- public ResourceIdentityWithUserAssignedIdentities(IDictionary userAssignedIdentities = default(IDictionary), System.Guid? principalId = default(System.Guid?), string type = default(string), System.Guid? tenantId = default(System.Guid?))
- {
- UserAssignedIdentities = userAssignedIdentities;
- PrincipalId = principalId;
- Type = type;
- TenantId = tenantId;
- CustomInit();
- }
-
- ///
- /// An initialization method that performs custom operations like setting defaults
- ///
- partial void CustomInit();
-
- ///
- /// Gets or sets the resource ids of the user assigned identities to
- /// use
- ///
- [JsonProperty(PropertyName = "userAssignedIdentities")]
- public IDictionary UserAssignedIdentities { get; set; }
-
- ///
- /// Gets the Azure Active Directory principal id.
- ///
- [JsonProperty(PropertyName = "principalId")]
- public System.Guid? PrincipalId { get; private set; }
-
- ///
- /// Gets or sets the identity type. Set this to 'SystemAssigned' in
- /// order to automatically create and assign an Azure Active Directory
- /// principal for the resource. Possible values include: 'None',
- /// 'SystemAssigned', 'UserAssigned'
- ///
- [JsonProperty(PropertyName = "type")]
- public string Type { get; set; }
-
- ///
- /// Gets the Azure Active Directory tenant id.
- ///
- [JsonProperty(PropertyName = "tenantId")]
- public System.Guid? TenantId { get; private set; }
-
- }
-}
diff --git a/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/SdkInfo_SqlManagementClient.cs b/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/SdkInfo_SqlManagementClient.cs
index b5e176540664..aff31577b3cd 100644
--- a/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/SdkInfo_SqlManagementClient.cs
+++ b/sdk/sqlmanagement/Microsoft.Azure.Management.Sql/src/Generated/SdkInfo_SqlManagementClient.cs
@@ -145,16 +145,5 @@ public static IEnumerable> ApiInfo_SqlManagementCl
}.AsEnumerable();
}
}
- // BEGIN: Code Generation Metadata Section
- public static readonly String AutoRestVersion = "v2";
- public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413";
- public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/sql/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=D:\\azure-sdk-for-net\\sdk";
- public static readonly String GithubForkName = "Azure";
- public static readonly String GithubBranchName = "master";
- public static readonly String GithubCommidId = "78c2a3fb24bfd4cd3372520bb9df203561c71487";
- public static readonly String CodeGenerationErrors = "";
- public static readonly String GithubRepoName = "azure-rest-api-specs";
- // END: Code Generation Metadata Section
}
}
-