From f774184efbd415190f66d8e66dea4adb567155e1 Mon Sep 17 00:00:00 2001
From: Mikhail Chatillon <chmikhai@microsoft.com>
Date: Fri, 14 Oct 2022 08:45:04 +0200
Subject: [PATCH] Prepare for release 2.2.0 (#1848)

---
 .../LoraTools/CommonAPI/ApiVersion.cs                 | 11 +++++++++++
 Template/azuredeploy.json                             |  6 +++---
 Template/deviceConfiguration.json                     |  8 ++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/CommonAPI/ApiVersion.cs b/LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/CommonAPI/ApiVersion.cs
index f59648df30..c149fe38d8 100644
--- a/LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/CommonAPI/ApiVersion.cs
+++ b/LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/CommonAPI/ApiVersion.cs
@@ -111,6 +111,13 @@ public sealed class ApiVersion
 
         public static ApiVersion Version_2022_03_04 { get; }
 
+        /// <summary>
+        /// Gets2022_09_01 version
+        /// Enable outside of Edge support
+        /// Not backward compatible.
+        /// </summary>
+        public static ApiVersion Version_2022_09_01 { get; }
+
         /// <summary>
         /// Gets the version that is assumed in case none is specified.
         /// </summary>
@@ -136,6 +143,7 @@ public static IEnumerable<ApiVersion> ApiVersions
                 yield return Version_2020_08_11;
                 yield return Version_2020_10_09;
                 yield return Version_2022_03_04;
+                yield return Version_2022_09_01;
             }
         }
 
@@ -205,6 +213,9 @@ static ApiVersion()
 
             Version_2022_03_04 = new ApiVersion("2022-03-04");
             Version_2022_03_04.MinCompatibleVersion = Version_2022_03_04;
+
+            Version_2022_09_01 = new ApiVersion("2022-09-01");
+            Version_2022_09_01.MinCompatibleVersion = Version_2022_09_01;
         }
 
         /// <summary>
diff --git a/Template/azuredeploy.json b/Template/azuredeploy.json
index 68e4d101da..8dfafda51c 100644
--- a/Template/azuredeploy.json
+++ b/Template/azuredeploy.json
@@ -92,9 +92,9 @@
         "firmwareUpgradesContainerName": "fwupgrades",
         "functionAppName": "[concat(parameters('uniqueSolutionPrefix'), 'function')]",
         "gitUsername": "Azure",
-        "functionZipBinary": "https://github.com/Azure/iotedge-lorawan-starterkit/releases/download/v2.1.0/function-2.1.0.zip",
-        "discoveryServiceZipBinary": "https://github.com/Azure/iotedge-lorawan-starterkit/releases/download/v2.1.0/discoveryservice-2.1.0.zip",
-        "gitBranch": "v2.1.0",
+        "functionZipBinary": "https://github.com/Azure/iotedge-lorawan-starterkit/releases/download/v2.2.0/function-2.2.0.zip",
+        "discoveryServiceZipBinary": "https://github.com/Azure/iotedge-lorawan-starterkit/releases/download/v2.2.0/discoveryservice-2.2.0.zip",
+        "gitBranch": "v2.2.0",
         "storageAccountId": "[concat(resourceGroup().id, '/providers/', 'Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
         "iotHubOwnerPolicyName": "iothubowner",
         "appInsightName": "[concat(parameters('uniqueSolutionPrefix'), 'insight')]",
diff --git a/Template/deviceConfiguration.json b/Template/deviceConfiguration.json
index 58439c4b6e..8b47deae18 100644
--- a/Template/deviceConfiguration.json
+++ b/Template/deviceConfiguration.json
@@ -14,14 +14,14 @@
 					"edgeAgent": {
 						"type": "docker",
 						"settings": {
-							"image": "mcr.microsoft.com/azureiotedge-agent:1.2.2",
+							"image": "mcr.microsoft.com/azureiotedge-agent:1.2.6",
 							"createOptions": "{}"
 						}
 					},
 					"edgeHub": {
 						"type": "docker",
 						"settings": {
-							"image": "mcr.microsoft.com/azureiotedge-hub:1.2.2",
+							"image": "mcr.microsoft.com/azureiotedge-hub:1.2.6",
 							"createOptions": "{ \"HostConfig\": {   \"PortBindings\": {\"8883/tcp\": [  {\"HostPort\": \"8883\" }  ], \"443/tcp\": [ { \"HostPort\": \"443\" } ], \"5671/tcp\": [ { \"HostPort\": \"5671\"  }] } }}"
 						},
 						"env": {
@@ -46,7 +46,7 @@
 					"LoRaWanNetworkSrvModule": {
 						"type": "docker",
 						"settings": {
-							"image": "loraedge/lorawannetworksrvmodule:2.1.0",
+							"image": "loraedge/lorawannetworksrvmodule:2.2.0",
 							"createOptions": "{\"ExposedPorts\": { \"5000/tcp\": {}}, \"HostConfig\": {  \"PortBindings\": {\"5000/tcp\": [  { \"HostPort\": \"5000\", \"HostIp\":\"172.17.0.1\" } ]}}}"
 						},
 						"version": "1.0",
@@ -64,7 +64,7 @@
 					"LoRaBasicsStationModule": {
 						"type": "docker",
 						"settings": {
-							"image": "loraedge/lorabasicsstationmodule:2.1.0",
+							"image": "loraedge/lorabasicsstationmodule:2.2.0",
 							"createOptions": "  {\"HostConfig\": {\"NetworkMode\": \"host\", \"Privileged\": true },  \"NetworkingConfig\": {\"EndpointsConfig\": {\"host\": {} }}}"
 						},
 						"env": {