Merge Mixed Reality Changes to Master (Azure#9502)

* Version Iteration for new Releases (Azure#8848) * Version Iteration for new Releases There are going to be 2 significant releases: 1. Public Preview of Remote Rendering in April 6th 2. GA of Spatial Anchors in May * Referring new swagger files in readme.md * Specifying default package version as 2020-05-01 * Fix MV * Fix MV (Azure#9397) Fix MV in Patch examples * Add MSI property to Remote Rendering Account (Azure#9476) * Add MSI property to Remote Rendering Account * Fix typo * Fix examples * Fix case mismatch in examples Co-authored-by: Lei Ni <leni@microsoft.com>
00Kai0 · Oct 12, 2020 · 680445c · 680445c
1 parent 664896c
commit 680445c
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 1 deletion.
diff --git a/...ager/Microsoft.MixedReality/preview/2020-04-06-preview/examples/remote-rendering/Get.json b/...ager/Microsoft.MixedReality/preview/2020-04-06-preview/examples/remote-rendering/Get.json
@@ -13,6 +13,9 @@
           "accountDomain": "mixedreality.azure.com"
         },
         "tags": {},
+        "identity": {
+          "type": "SystemAssigned"
+        },
         "location": "eastus2euap",
         "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/MyResourceGroup/providers/Microsoft.MixedReality/remoteRenderingAccounts/MyAccount",
         "name": "MyAccount",

diff --git a/...MixedReality/preview/2020-04-06-preview/examples/remote-rendering/GetByResourceGroup.json b/...MixedReality/preview/2020-04-06-preview/examples/remote-rendering/GetByResourceGroup.json
@@ -14,6 +14,9 @@
               "accountDomain": "mixedreality.azure.com"
             },
             "tags": {},
+            "identity": {
+              "type": "SystemAssigned"
+            },
             "location": "eastus2euap",
             "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/MyResourceGroup/providers/Microsoft.MixedReality/remoteRenderingAccounts/alpha",
             "name": "alpha",
@@ -25,6 +28,9 @@
               "accountDomain": "mixedreality.azure.com"
             },
             "tags": {},
+            "identity": {
+              "type": "SystemAssigned"
+            },
             "location": "eastus2euap",
             "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/MyResourceGroup/providers/Microsoft.MixedReality/remoteRenderingAccounts/omega",
             "name": "omega",

diff --git a/....MixedReality/preview/2020-04-06-preview/examples/remote-rendering/GetBySubscription.json b/....MixedReality/preview/2020-04-06-preview/examples/remote-rendering/GetBySubscription.json
@@ -13,6 +13,9 @@
               "accountDomain": "mixedreality.azure.com"
             },
             "tags": {},
+            "identity": {
+              "type": "SystemAssigned"
+            },
             "location": "eastus2euap",
             "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/MyResourceGroup/providers/Microsoft.MixedReality/remoteRenderingAccounts/alpha",
             "name": "alpha",
@@ -24,6 +27,9 @@
               "accountDomain": "mixedreality.azure.com"
             },
             "tags": {},
+            "identity": {
+              "type": "SystemAssigned"
+            },
             "location": "eastus2euap",
             "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/MyResourceGroup/providers/Microsoft.MixedReality/remoteRenderingAccounts/omega",
             "name": "omega",

diff --git a/...er/Microsoft.MixedReality/preview/2020-04-06-preview/examples/remote-rendering/Patch.json b/...er/Microsoft.MixedReality/preview/2020-04-06-preview/examples/remote-rendering/Patch.json
@@ -5,6 +5,9 @@
     "accountName": "MyAccount",
     "api-version": "2020-04-06-preview",
     "remoteRenderingAccount": {
+      "identity": {
+        "type": "SystemAssigned"
+      },
       "location": "eastus2euap",
       "tags": {
         "heroine": "juliet",
@@ -23,6 +26,9 @@
           "heroine": "juliet",
           "hero": "romeo"
         },
+        "identity": {
+          "type": "SystemAssigned"
+        },
         "location": "eastus2euap",
         "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/MyResourceGroup/providers/Microsoft.MixedReality/remoteRenderingAccounts/MyAccount",
         "name": "MyAccount",

diff --git a/...ager/Microsoft.MixedReality/preview/2020-04-06-preview/examples/remote-rendering/Put.json b/...ager/Microsoft.MixedReality/preview/2020-04-06-preview/examples/remote-rendering/Put.json
@@ -5,6 +5,9 @@
     "accountName": "MyAccount",
     "api-version": "2020-04-06-preview",
     "remoteRenderingAccount": {
+      "identity": {
+        "type": "SystemAssigned"
+      },
       "location": "eastus2euap"
     }
   },
@@ -16,6 +19,9 @@
           "accountDomain": "mixedreality.azure.com"
         },
         "tags": {},
+        "identity": {
+          "type": "SystemAssigned"
+        },
         "location": "eastus2euap",
         "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/MyResourceGroup/providers/Microsoft.MixedReality/remoteRenderingAccounts/MyAccount",
         "name": "MyAccount",
@@ -29,6 +35,9 @@
           "accountDomain": "mixedreality.azure.com"
         },
         "tags": {},
+        "identity": {
+          "type": "SystemAssigned"
+        },
         "location": "eastus2euap",
         "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/MyResourceGroup/providers/Microsoft.MixedReality/remoteRenderingAccounts/MyAccount",
         "name": "MyAccount",

diff --git a/.../resource-manager/Microsoft.MixedReality/preview/2020-04-06-preview/remote-rendering.json b/.../resource-manager/Microsoft.MixedReality/preview/2020-04-06-preview/remote-rendering.json
@@ -388,6 +388,13 @@
       "description": "RemoteRenderingAccount Response.",
       "type": "object",
       "properties": {
+        "identity": {
+          "allOf": [
+            {
+              "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Identity"
+            }
+          ]
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "description": "Property bag.",

diff --git a/specification/mixedreality/resource-manager/readme.md b/specification/mixedreality/resource-manager/readme.md
@@ -155,8 +155,8 @@ require: $(this-folder)/../../../profiles/readme.md
 input-file:
   - $(this-folder)/Microsoft.MixedReality/stable/2020-05-01/proxy.json
   - $(this-folder)/Microsoft.MixedReality/stable/2020-05-01/spatial-anchors.json
-  - $(this-folder)/Microsoft.MixedReality/preview/2020-04-06-preview/remote-rendering.json
   - $(this-folder)/Microsoft.MixedReality/preview/2020-04-06-preview/proxy.json
+  - $(this-folder)/Microsoft.MixedReality/preview/2020-04-06-preview/remote-rendering.json
   - $(this-folder)/Microsoft.MixedReality/preview/2019-12-02-preview/proxy.json
   - $(this-folder)/Microsoft.MixedReality/preview/2019-12-02-preview/remote-rendering.json
   - $(this-folder)/Microsoft.MixedReality/preview/2019-12-02-preview/spatial-anchors.json