Azure · timtay-microsoft · Oct 5, 2020 · Oct 5, 2020 · Sep 22, 2020
diff --git a/sdk/digitaltwins/azure-digitaltwins-core/autorest.md b/sdk/digitaltwins/azure-digitaltwins-core/autorest.md
@@ -20,7 +20,7 @@ Run `generate.ps1` in this directory to generate the code.
 
 ``` yaml
 #When generating from the official specifications repository
-input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/specification/digitaltwins/data-plane/Microsoft.DigitalTwins/preview/2020-05-31-preview/digitaltwins.json
+input-file: 2020-10-31/digitaltwins.json
 
 #When generating from the local copy:
 #input-file: 2020-05-31-preview/digitaltwins.json

diff --git a/...gitaltwins/azure-digitaltwins-core/swagger/2020-05-31-preview/examples/SendTelemetry.json b/...gitaltwins/azure-digitaltwins-core/swagger/2020-05-31-preview/examples/SendTelemetry.json
diff --git a/...gger/2020-05-31-preview/digitaltwins.json → ...core/swagger/2020-10-31/digitaltwins.json b/...gger/2020-05-31-preview/digitaltwins.json → ...core/swagger/2020-10-31/digitaltwins.json
diff --git a/...es/CreateRelationshipAdvancedExample.json → ...es/CreateRelationshipAdvancedExample.json b/...es/CreateRelationshipAdvancedExample.json → ...es/CreateRelationshipAdvancedExample.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "mySourceTwin",
     "relationshipId": "myRelationshipId",
     "relationship": {
@@ -18,7 +18,8 @@
         "$targetId": "myTargetTwin",
         "$relationshipName": "myRelationship",
         "relationshipProperty1": 1,
-        "relationshipProperty2": "some value"
+        "relationshipProperty2": "some value",
+        "$etag": "W/\"1553dbf5-0052-4be8-bea8-46269075b503\""
       }
     }
   }

diff --git a/...mples/CreateRelationshipBasicExample.json → ...mples/CreateRelationshipBasicExample.json b/...mples/CreateRelationshipBasicExample.json → ...mples/CreateRelationshipBasicExample.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "mySourceTwin",
     "relationshipId": "myRelationshipId",
     "relationship": {
@@ -14,7 +14,8 @@
         "$relationshipId": "myRelationshipId",
         "$sourceId": "mySourceTwin",
         "$targetId": "myTargetTwin",
-        "$relationshipName": "myRelationship"
+        "$relationshipName": "myRelationship",
+        "$etag": "W/\"1553dbf5-0052-4be8-bea8-46269075b503\""
       }
     }
   }

diff --git a/...0-05-31-preview/examples/DeleteModel.json → ...gger/2020-10-31/examples/DeleteModel.json b/...0-05-31-preview/examples/DeleteModel.json → ...gger/2020-10-31/examples/DeleteModel.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "dtmi:com:example:Sample;1"
   },
   "responses": {

diff --git a/...-preview/examples/DeleteRelationship.json → ...20-10-31/examples/DeleteRelationship.json b/...-preview/examples/DeleteRelationship.json → ...20-10-31/examples/DeleteRelationship.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "myTwinId",
     "relationshipId": "myRelationshipId"
   },

diff --git a/...20-05-31-preview/examples/DeleteTwin.json → ...agger/2020-10-31/examples/DeleteTwin.json b/...20-05-31-preview/examples/DeleteTwin.json → ...agger/2020-10-31/examples/DeleteTwin.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "myTwinId"
   },
   "responses": {

diff --git a/...31-preview/examples/EventRouteDelete.json → ...2020-10-31/examples/EventRouteDelete.json b/...31-preview/examples/EventRouteDelete.json → ...2020-10-31/examples/EventRouteDelete.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "id": "eventroute-001",
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "204": {}

diff --git a/...05-31-preview/examples/EventRouteGet.json → ...er/2020-10-31/examples/EventRouteGet.json b/...05-31-preview/examples/EventRouteGet.json → ...er/2020-10-31/examples/EventRouteGet.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "id": "eventroute-001",
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "200": {

diff --git a/...05-31-preview/examples/EventRoutePut.json → ...er/2020-10-31/examples/EventRoutePut.json b/...05-31-preview/examples/EventRoutePut.json → ...er/2020-10-31/examples/EventRoutePut.json
@@ -5,7 +5,7 @@
       "endpointName": "endpoint-001",
       "filter": "true"
     },
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "204": {}

diff --git a/...iew/examples/EventRoutePutWithFilter.json → ...-31/examples/EventRoutePutWithFilter.json b/...iew/examples/EventRoutePutWithFilter.json → ...-31/examples/EventRoutePutWithFilter.json
@@ -5,7 +5,7 @@
       "endpointName": "endpoint-001",
       "filter": "type = 'Microsoft.DigitalTwins.Twin.Create'"
     },
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "204": {}

diff --git a/...-31-preview/examples/EventRoutesList.json → .../2020-10-31/examples/EventRoutesList.json b/...-31-preview/examples/EventRoutesList.json → .../2020-10-31/examples/EventRoutesList.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "200": {

diff --git a/...-05-31-preview/examples/GetComponent.json → ...ger/2020-10-31/examples/GetComponent.json b/...-05-31-preview/examples/GetComponent.json → ...ger/2020-10-31/examples/GetComponent.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "myTwinId",
     "componentPath": "myComponent"
   },
@@ -36,7 +36,6 @@
         },
         "component1": {
           "$metadata": {
-            "$model": "dtmi:com:example:interfaces:subInterfaceName;1",
             "componentProperty": {
               "desiredValue": "some value",
               "desiredVersion": 1,

diff --git a/...iew/examples/GetIncomingRelationship.json → ...-31/examples/GetIncomingRelationship.json b/...iew/examples/GetIncomingRelationship.json → ...-31/examples/GetIncomingRelationship.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "mySourceTwin"
   },
   "responses": {

diff --git a/...-31-preview/examples/GetRelationship.json → .../2020-10-31/examples/GetRelationship.json b/...-31-preview/examples/GetRelationship.json → .../2020-10-31/examples/GetRelationship.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "mySourceTwin"
   },
   "responses": {
@@ -12,13 +12,15 @@
             "$relationshipId": "firstRelationshipId",
             "$targetId": "targetTwinId",
             "$relationshipName": "myRelationship",
+            "$etag": "W/\"1553dbf5-0052-4be8-bea8-46269075b503\"",
             "property": "value"
           },
           {
             "$sourceId": "mySourceTwin",
             "$relationshipId": "secondRelationshipId",
             "$targetId": "targetTwinId",
             "$relationshipName": "myRelationship",
+            "$etag": "W/\"2552a0a7-0666-4d5e-a67f-ece5b9b81fe0\"",
             "property": "value"
           }
         ],

diff --git a/...preview/examples/GetRelationshipById.json → ...0-10-31/examples/GetRelationshipById.json b/...preview/examples/GetRelationshipById.json → ...0-10-31/examples/GetRelationshipById.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "mySourceTwin",
     "relationshipId": "myRelationshipId"
   },
@@ -11,6 +11,7 @@
         "$sourceId": "mySourceTwin",
         "$targetId": "myTargetTwin",
         "$relationshipName": "myRelationship",
+        "$etag": "W/\"1553dbf5-0052-4be8-bea8-46269075b503\"",
         "relationshipProperty": "some value"
       }
     }

diff --git a/...es/GetRelationshipByRelationshipName.json → ...es/GetRelationshipByRelationshipName.json b/...es/GetRelationshipByRelationshipName.json → ...es/GetRelationshipByRelationshipName.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "mySourceTwin",
     "relationshipName": "myRelationship"
   },
@@ -13,13 +13,15 @@
             "$relationshipId": "firstRelationshipId",
             "$targetId": "targetTwinId",
             "$relationshipName": "myRelationship",
+            "$etag": "W/\"1553dbf5-0052-4be8-bea8-46269075b503\"",
             "property": "value"
           },
           {
             "$sourceId": "mySourceTwin",
             "$relationshipId": "secondRelationshipId",
             "$targetId": "targetTwinId",
             "$relationshipName": "myRelationship",
+            "$etag": "W/\"2552a0a7-0666-4d5e-a67f-ece5b9b81fe0\"",
             "property": "value"
           }
         ],

diff --git a/.../2020-05-31-preview/examples/GetTwin.json → .../swagger/2020-10-31/examples/GetTwin.json b/.../2020-05-31-preview/examples/GetTwin.json → .../swagger/2020-10-31/examples/GetTwin.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "myTwinId"
   },
   "responses": {
@@ -36,7 +36,6 @@
         },
         "component1": {
           "$metadata": {
-            "$model": "dtmi:com:example:interfaces:subInterfaceName;1",
             "componentProperty": {
               "desiredValue": "some value",
               "desiredVersion": 1,

diff --git a/...2020-05-31-preview/examples/ModelAdd.json → ...swagger/2020-10-31/examples/ModelAdd.json b/...2020-05-31-preview/examples/ModelAdd.json → ...swagger/2020-10-31/examples/ModelAdd.json
@@ -28,7 +28,7 @@
         "@context": "dtmi:dtdl:context;2"
       }
     ],
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "201": {

diff --git a/...-05-31-preview/examples/ModelGetById.json → ...ger/2020-10-31/examples/ModelGetById.json b/...-05-31-preview/examples/ModelGetById.json → ...ger/2020-10-31/examples/ModelGetById.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "id": "dtmi:com:example:Sample;1",
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "200": {

diff --git a/...delGetByIdWithIncludeModelDefinition.json → ...delGetByIdWithIncludeModelDefinition.json b/...delGetByIdWithIncludeModelDefinition.json → ...delGetByIdWithIncludeModelDefinition.json
@@ -2,7 +2,7 @@
   "parameters": {
     "id": "dtmi:com:example:Sample;1",
     "includeModelDefinition": true,
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "200": {

diff --git a/...w/examples/ModelUpdateDecommissioned.json → ...1/examples/ModelUpdateDecommissioned.json b/...w/examples/ModelUpdateDecommissioned.json → ...1/examples/ModelUpdateDecommissioned.json
@@ -8,7 +8,7 @@
         "value": true
       }
     ],
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "204": {}

diff --git a/...020-05-31-preview/examples/ModelsGet.json → ...wagger/2020-10-31/examples/ModelsGet.json b/...020-05-31-preview/examples/ModelsGet.json → ...wagger/2020-10-31/examples/ModelsGet.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "200": {

diff --git a/...ependenciesAndIncludeModelDefinition.json → ...ependenciesAndIncludeModelDefinition.json b/...ependenciesAndIncludeModelDefinition.json → ...ependenciesAndIncludeModelDefinition.json
@@ -5,7 +5,7 @@
       "dtmi:com:example:SampleDeviceModel;1"
     ],
     "x-ms-max-item-count": 20,
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "200": {

diff --git a/...amples/PatchComponentAdvancedExample.json → ...amples/PatchComponentAdvancedExample.json b/...amples/PatchComponentAdvancedExample.json → ...amples/PatchComponentAdvancedExample.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "myTwinId",
     "componentPath": "myComponent",
     "patchDocument": [

diff --git a/.../examples/PatchComponentBasicExample.json → .../examples/PatchComponentBasicExample.json b/.../examples/PatchComponentBasicExample.json → .../examples/PatchComponentBasicExample.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "myTwinId",
     "componentPath": "myComponent",
     "patchDocument": [

diff --git a/...les/PatchRelationshipAdvancedExample.json → ...les/PatchRelationshipAdvancedExample.json b/...les/PatchRelationshipAdvancedExample.json → ...les/PatchRelationshipAdvancedExample.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "myTwinId",
     "relationshipId": "myRelationshipId",
     "patchDocument": [

diff --git a/...amples/PatchRelationshipBasicExample.json → ...amples/PatchRelationshipBasicExample.json b/...amples/PatchRelationshipBasicExample.json → ...amples/PatchRelationshipBasicExample.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "myTwinId",
     "relationshipId": "myRelationshipId",
     "patchDocument": [

diff --git a/...ew/examples/PatchTwinAdvancedExample.json → ...31/examples/PatchTwinAdvancedExample.json b/...ew/examples/PatchTwinAdvancedExample.json → ...31/examples/PatchTwinAdvancedExample.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "myNewTwinId",
     "patchDocument": [
       {

diff --git a/...eview/examples/PatchTwinBasicExample.json → ...10-31/examples/PatchTwinBasicExample.json b/...eview/examples/PatchTwinBasicExample.json → ...10-31/examples/PatchTwinBasicExample.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "myNewTwinId",
     "patchDocument": [
       {

diff --git a/...view/examples/PutTwinAdvancedExample.json → ...0-31/examples/PutTwinAdvancedExample.json b/...view/examples/PutTwinAdvancedExample.json → ...0-31/examples/PutTwinAdvancedExample.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "myNewTwinId",
     "If-None-Match": "*",
     "twin": {
@@ -13,9 +13,7 @@
         "subProperty2": "some other value"
       },
       "component1": {
-        "$metadata": {
-          "$model": "dtmi:com:example:interfaces:subInterfaceName;1"
-        },
+        "$metadata": {},
         "componentProperty": "some value"
       }
     }
@@ -53,7 +51,6 @@
         },
         "component1": {
           "$metadata": {
-            "$model": "dtmi:com:example:interfaces:subInterfaceName;1",
             "componentProperty": {
               "desiredValue": "some value",
               "desiredVersion": 1,

diff --git a/...preview/examples/PutTwinBasicExample.json → ...0-10-31/examples/PutTwinBasicExample.json b/...preview/examples/PutTwinBasicExample.json → ...0-10-31/examples/PutTwinBasicExample.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2020-05-31-preview",
+    "api-version": "2020-10-31",
     "id": "myNewTwinId",
     "twin": {
       "$metadata": {

diff --git a/...5-31-preview/examples/QueryFirstPage.json → ...r/2020-10-31/examples/QueryFirstPage.json b/...5-31-preview/examples/QueryFirstPage.json → ...r/2020-10-31/examples/QueryFirstPage.json
@@ -3,12 +3,12 @@
     "querySpecification": {
       "query": "SELECT * FROM DIGITALTWINS WHERE temp = 79"
     },
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "200": {
       "body": {
-        "items": [
+        "value": [
           {
             "$dtId": "Twin-01",
             "$metadata": {

diff --git a/...020-05-31-preview/examples/QueryJoin.json → ...wagger/2020-10-31/examples/QueryJoin.json b/...020-05-31-preview/examples/QueryJoin.json → ...wagger/2020-10-31/examples/QueryJoin.json
@@ -3,12 +3,12 @@
     "querySpecification": {
       "query": "SELECT Widget, Gadget FROM DIGITALTWINS Widget JOIN Gadget RELATED Widget.Contains WHERE Widget.$dtId = 'Twin-01'"
     },
-    "api-version": "2020-05-31-preview"
+    "api-version": "2020-10-31"
   },
   "responses": {
     "200": {
       "body": {
-        "items": [
+        "value": [
           {
             "Widget": {
               "$dtId": "Twin-01",