From 1a796160e74eeb6f13d86373bbe7976e29ae8581 Mon Sep 17 00:00:00 2001
From: yophilav <54859653+yophilav@users.noreply.github.com>
Date: Wed, 7 Apr 2021 17:39:52 -0700
Subject: [PATCH] Update the dev version to 1.2

Update the dev version to 1.2
---
 edgelet/contrib/centos/aziot-edge.spec     | 2 +-
 edgelet/contrib/config/linux/default.toml  | 2 +-
 edgelet/contrib/config/linux/template.toml | 2 +-
 edgelet/contrib/debian/control             | 2 +-
 edgelet/iotedge/src/config/super_config.rs | 2 +-
 edgelet/version.txt                        | 2 +-
 versionInfo.json                           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/edgelet/contrib/centos/aziot-edge.spec b/edgelet/contrib/centos/aziot-edge.spec
index bff1de7b55a..0ab776a4892 100644
--- a/edgelet/contrib/centos/aziot-edge.spec
+++ b/edgelet/contrib/centos/aziot-edge.spec
@@ -17,7 +17,7 @@ URL:            https://github.com/azure/iotedge
 %{?systemd_requires}
 BuildRequires:  systemd
 Requires(pre):  shadow-utils
-Requires:       aziot-identity-service >= 1.2.0~rc4-1
+Requires:       aziot-identity-service = 1.2.0-1
 Source0:        aziot-edge-%{version}.tar.gz
 
 %description
diff --git a/edgelet/contrib/config/linux/default.toml b/edgelet/contrib/config/linux/default.toml
index 4ec953c4d74..ba15de8f125 100644
--- a/edgelet/contrib/config/linux/default.toml
+++ b/edgelet/contrib/config/linux/default.toml
@@ -11,7 +11,7 @@ name = "edgeAgent"
 type = "docker"
 
 [agent.config]
-image = "mcr.microsoft.com/azureiotedge-agent:1.2.0-rc4"
+image = "mcr.microsoft.com/azureiotedge-agent:1.2"
 
 [connect]
 workload_uri = "@connect_workload_uri@"
diff --git a/edgelet/contrib/config/linux/template.toml b/edgelet/contrib/config/linux/template.toml
index 5ca02bfafcb..08a342053ff 100644
--- a/edgelet/contrib/config/linux/template.toml
+++ b/edgelet/contrib/config/linux/template.toml
@@ -215,7 +215,7 @@
 # imagePullPolicy = "..."   # "on-create" or "never". Defaults to "on-create"
 
 # [agent.config]
-# image = "mcr.microsoft.com/azureiotedge-agent:1.2.0-rc4"
+# image = "mcr.microsoft.com/azureiotedge-agent:1.2"
 # createOptions = { HostConfig = { Binds = ["/iotedge/storage:/iotedge/storage"] } }
 
 # [agent.config.auth]
diff --git a/edgelet/contrib/debian/control b/edgelet/contrib/debian/control
index a627fd2f113..2ac7beddc8d 100644
--- a/edgelet/contrib/debian/control
+++ b/edgelet/contrib/debian/control
@@ -9,7 +9,7 @@ Homepage: https://github.com/azure/iotedge
 
 Package: aziot-edge
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, ca-certificates, hostname, aziot-identity-service (>= 1.2.0~rc4-1), sed
+Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, ca-certificates, hostname, aziot-identity-service (= 1.2.0-1), sed
 Description: Azure IoT Edge Module Runtime
  Azure IoT Edge is a fully managed service that delivers cloud intelligence
  locally by deploying and running artificial intelligence (AI), Azure services,
diff --git a/edgelet/iotedge/src/config/super_config.rs b/edgelet/iotedge/src/config/super_config.rs
index b741c752990..748440a6749 100644
--- a/edgelet/iotedge/src/config/super_config.rs
+++ b/edgelet/iotedge/src/config/super_config.rs
@@ -51,7 +51,7 @@ pub fn default_agent() -> edgelet_core::ModuleSpec<edgelet_docker::DockerConfig>
         type_: "docker".to_owned(),
         image_pull_policy: Default::default(),
         config: edgelet_docker::DockerConfig {
-            image: "mcr.microsoft.com/azureiotedge-agent:1.2.0-rc4".to_owned(),
+            image: "mcr.microsoft.com/azureiotedge-agent:1.2".to_owned(),
             image_id: None,
             create_options: docker::models::ContainerCreateBody::new(),
             digest: None,
diff --git a/edgelet/version.txt b/edgelet/version.txt
index 0f9d9f73628..d3262df3354 100644
--- a/edgelet/version.txt
+++ b/edgelet/version.txt
@@ -1 +1 @@
-1.1.0~dev
+1.2.0~dev
diff --git a/versionInfo.json b/versionInfo.json
index cc9e02fbc7f..324f2fe8d98 100644
--- a/versionInfo.json
+++ b/versionInfo.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-dev",
+  "version": "1.2.0-dev",
   "build": "BUILDNUMBER",
   "commit": "COMMITID"
 }