Merge branch 'master' into vikas0212git-patch-1

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Change Log
+## 1.24.4 - 2021-10-01
+### Changed
+* Maximum version number for edgeHub/properties.desired.schemaVersion is capped to 1.1
+
 ## 1.24.3 - 2021-7-27
 ### Changed
 * Allow user to select Edge Runtime version between 1.2

assets/solution/deployment.template.json

@@ -55,7 +55,7 @@
     },
     "$edgeHub": {
       "properties.desired": {
-        "schemaVersion": "1.2",
+        "schemaVersion": "1.1",
         "routes": {},
         "storeAndForwardConfiguration": {
           "timeToLiveSecs": 7200

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "azure-iot-edge",
-  "version": "1.24.2",
+  "version": "1.24.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -2,7 +2,7 @@
   "name": "azure-iot-edge",
   "displayName": "Azure IoT Edge",
   "description": "This extension is now a part of Azure IoT Tools extension pack. We highly recommend installing Azure IoT Tools to get full capabilities for Azure IoT development. Develop, deploy, debug, and manage your IoT Edge solution.",
-  "version": "1.24.3",
+  "version": "1.24.4",
   "publisher": "vsciot-vscode",
   "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe",
   "icon": "logo.png",

src/common/version.ts

@@ -22,7 +22,7 @@ export class Versions {
         const edgeHubSchemaVerMap: Map<string, string> = new Map([
             ["1.0", "1.0"],
             ["1.1", "1.1"],
-            ["1.2", "1.2"],
+            ["1.2", "1.1"],
         ]);
 
         const verMap: Map<string, string> = new Map();

testResources/deployment.template.json

@@ -147,7 +147,7 @@
     },
     "$edgeHub": {
       "properties.desired": {
-        "schemaVersion": "1.2",
+        "schemaVersion": "1.1",
         "routes": {
           "sensorToFilter": "FROM /messages/modules/SimulatedTemperatureSensor/outputs/temperatureOutput INTO BrokeredEndpoint(\"/modules/%MODULE%/inputs/input1\")",
           "filterToIoTHub": "FROM /messages/modules/samplemodule/outputs/output1 INTO $upstream"