[ReleasePR sql] Removed unused definition of ResourceIdentityWithUserAssignedIdentities (#1798)

msftbot[bot] · web-flow · commit 586e91271f55 · 2021-07-14T05:39:42.000Z
Create to sync Azure/azure-rest-api-specs#15027 [ReCreate this PR](https://github.com/azure-resource-manager-schemas/compare/master...AzureSDKAutomation:sdkAuto/sql?expand=1)
diff --git a/schemas/2015-05-01-preview/Microsoft.Sql.json b/schemas/2015-05-01-preview/Microsoft.Sql.json
@@ -998,7 +998,8 @@
               "enum": [
                 "None",
                 "SystemAssigned",
-                "UserAssigned"
+                "UserAssigned",
+                "SystemAssigned,UserAssigned"
               ]
             },
             {
diff --git a/schemas/2018-06-01-preview/Microsoft.Sql.json b/schemas/2018-06-01-preview/Microsoft.Sql.json
@@ -1114,7 +1114,8 @@
               "enum": [
                 "None",
                 "SystemAssigned",
-                "UserAssigned"
+                "UserAssigned",
+                "SystemAssigned,UserAssigned"
               ]
             },
             {
diff --git a/schemas/2019-06-01-preview/Microsoft.Sql.json b/schemas/2019-06-01-preview/Microsoft.Sql.json
@@ -788,7 +788,8 @@
               "enum": [
                 "None",
                 "SystemAssigned",
-                "UserAssigned"
+                "UserAssigned",
+                "SystemAssigned,UserAssigned"
               ]
             },
             {
diff --git a/schemas/2020-02-02-preview/Microsoft.Sql.json b/schemas/2020-02-02-preview/Microsoft.Sql.json
@@ -5774,7 +5774,8 @@
               "enum": [
                 "None",
                 "SystemAssigned",
-                "UserAssigned"
+                "UserAssigned",
+                "SystemAssigned,UserAssigned"
               ]
             },
             {
diff --git a/schemas/2020-08-01-preview/Microsoft.Sql.json b/schemas/2020-08-01-preview/Microsoft.Sql.json
@@ -5909,7 +5909,8 @@
               "enum": [
                 "None",
                 "SystemAssigned",
-                "UserAssigned"
+                "UserAssigned",
+                "SystemAssigned,UserAssigned"
               ]
             },
             {
diff --git a/schemas/2020-11-01-preview/Microsoft.Sql.json b/schemas/2020-11-01-preview/Microsoft.Sql.json
@@ -6003,7 +6003,8 @@
               "enum": [
                 "None",
                 "SystemAssigned",
-                "UserAssigned"
+                "UserAssigned",
+                "SystemAssigned,UserAssigned"
               ]
             },
             {
diff --git a/schemas/2021-02-01-preview/Microsoft.Sql.json b/schemas/2021-02-01-preview/Microsoft.Sql.json
@@ -6130,7 +6130,8 @@
               "enum": [
                 "None",
                 "SystemAssigned",
-                "UserAssigned"
+                "UserAssigned",
+                "SystemAssigned,UserAssigned"
               ]
             },
             {

Original file line number	Diff line number	Diff line change
`@@ -998,7 +998,8 @@`
`998`	`998`	`"enum": [`
`999`	`999`	`"None",`
`1000`	`1000`	`"SystemAssigned",`
`1001`		`- "UserAssigned"`
	`1001`	`+ "UserAssigned",`
	`1002`	`+ "SystemAssigned,UserAssigned"`
`1002`	`1003`	`]`
`1003`	`1004`	`},`
`1004`	`1005`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1114,7 +1114,8 @@`
`1114`	`1114`	`"enum": [`
`1115`	`1115`	`"None",`
`1116`	`1116`	`"SystemAssigned",`
`1117`		`- "UserAssigned"`
	`1117`	`+ "UserAssigned",`
	`1118`	`+ "SystemAssigned,UserAssigned"`
`1118`	`1119`	`]`
`1119`	`1120`	`},`
`1120`	`1121`	`{`
Original file line number	Diff line number	Diff line change
`@@ -788,7 +788,8 @@`
`788`	`788`	`"enum": [`
`789`	`789`	`"None",`
`790`	`790`	`"SystemAssigned",`
`791`		`- "UserAssigned"`
	`791`	`+ "UserAssigned",`
	`792`	`+ "SystemAssigned,UserAssigned"`
`792`	`793`	`]`
`793`	`794`	`},`
`794`	`795`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5774,7 +5774,8 @@`
`5774`	`5774`	`"enum": [`
`5775`	`5775`	`"None",`
`5776`	`5776`	`"SystemAssigned",`
`5777`		`- "UserAssigned"`
	`5777`	`+ "UserAssigned",`
	`5778`	`+ "SystemAssigned,UserAssigned"`
`5778`	`5779`	`]`
`5779`	`5780`	`},`
`5780`	`5781`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5909,7 +5909,8 @@`
`5909`	`5909`	`"enum": [`
`5910`	`5910`	`"None",`
`5911`	`5911`	`"SystemAssigned",`
`5912`		`- "UserAssigned"`
	`5912`	`+ "UserAssigned",`
	`5913`	`+ "SystemAssigned,UserAssigned"`
`5913`	`5914`	`]`
`5914`	`5915`	`},`
`5915`	`5916`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6003,7 +6003,8 @@`
`6003`	`6003`	`"enum": [`
`6004`	`6004`	`"None",`
`6005`	`6005`	`"SystemAssigned",`
`6006`		`- "UserAssigned"`
	`6006`	`+ "UserAssigned",`
	`6007`	`+ "SystemAssigned,UserAssigned"`
`6007`	`6008`	`]`
`6008`	`6009`	`},`
`6009`	`6010`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6130,7 +6130,8 @@`
`6130`	`6130`	`"enum": [`
`6131`	`6131`	`"None",`
`6132`	`6132`	`"SystemAssigned",`
`6133`		`- "UserAssigned"`
	`6133`	`+ "UserAssigned",`
	`6134`	`+ "SystemAssigned,UserAssigned"`
`6134`	`6135`	`]`
`6135`	`6136`	`},`
`6136`	`6137`	`{`