Update dotnetcore to 3.0.0-preview5 on Linux ARM64 and 2.1.10 for all…

… other (#1168) Update to dotnet core version
Azure · May 7, 2019 · ad345ef · ad345ef
1 parent 1779fca
commit ad345ef
Show file tree

Hide file tree

Showing 58 changed files with 87 additions and 79 deletions.
diff --git a/builds/misc/images.yaml b/builds/misc/images.yaml
@@ -17,7 +17,7 @@ jobs:
         displayName: Install .NET Core
         inputs:
           packageType: sdk
-          version: 3.0.100-preview-010184
+          version: 3.0.100-preview5-011568
 
       - bash: 'docker login $(registry.address) --username $(registry.user) --password $(registry.password)'
         displayName: 'Docker Login'

diff --git a/edge-agent/docker/linux/amd64/Dockerfile b/edge-agent/docker/linux/amd64/Dockerfile
@@ -1,7 +1,7 @@
-ARG base_tag=2.1.6-runtime-alpine3.7
+ARG base_tag=2.1.10-alpine3.7
 FROM azureiotedge/azureiotedge-runtime-base:1.0.0-preview001-linux-amd64 as builder
 
-FROM microsoft/dotnet:${base_tag}
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-agent/docker/linux/arm32v7/Dockerfile b/edge-agent/docker/linux/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm32v7
+ARG base_tag=1.0.0-preview013-linux-arm32v7
 FROM azureiotedge/azureiotedge-agent-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-agent/docker/linux/arm32v7/base/Dockerfile b/edge-agent/docker/linux/arm32v7/base/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-bionic-arm32v7
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-bionic-arm32v7
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 RUN apt-get update && \
     apt-get install -y libsnappy1v5 && \

diff --git a/edge-agent/docker/linux/arm64v8/Dockerfile b/edge-agent/docker/linux/arm64v8/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm64v8
+ARG base_tag=1.0.0-preview014-linux-arm64v8
 
 FROM azureiotedge/azureiotedge-agent-base:${base_tag}
 

diff --git a/edge-agent/docker/linux/arm64v8/base/Dockerfile b/edge-agent/docker/linux/arm64v8/base/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.0-bionic-arm64v8
+ARG base_tag=3.0.0-preview5-bionic-arm64v8
 ARG num_procs=4
 
 FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}

diff --git a/edge-agent/docker/windows/amd64/Dockerfile b/edge-agent/docker/windows/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-nanoserver-1809
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-nanoserver-1809
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 USER ContainerAdministrator
 

diff --git a/edge-agent/docker/windows/arm32v7/Dockerfile b/edge-agent/docker/windows/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-windows-arm32v7
+ARG base_tag=1.0.2-windows-arm32v7
 ARG base_registry
 FROM ${base_registry}/azureiotedge/azureiotedge-agent-base:${base_tag}
 

diff --git a/edge-agent/docker/windows/arm32v7/base/Dockerfile b/edge-agent/docker/windows/arm32v7/base/Dockerfile
@@ -1,7 +1,7 @@
 # Base image for arm32v7 dotnet-runtime container
-FROM mcr.microsoft.com/windows/nanoserver:1809_arm
+FROM mcr.microsoft.com/windows/nanoserver:1809-arm32v7
 
-ENV DOTNET_VERSION 2.1.6
+ENV DOTNET_VERSION 2.1.10
 ENV DOTNET_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-${DOTNET_VERSION}-win-arm.zip
 
 RUN curl -SL %DOTNET_DOWNLOAD_URL% --output dotnet.zip \

diff --git a/edge-agent/test/Microsoft.Azure.Devices.Edge.Agent.Edgelet.Test/TestServer/Startup.cs b/edge-agent/test/Microsoft.Azure.Devices.Edge.Agent.Edgelet.Test/TestServer/Startup.cs
@@ -23,6 +23,8 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton<IController, EdgeletTestImplementation>();
         }
 
+        // TODO: Remove warning disable for Obsolete when project is moved to dotnetcore 3.0
+#pragma warning disable 612, 618
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
@@ -33,5 +35,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             app.UseMvc();
         }
+#pragma warning restore 612, 618
     }
 }
diff --git a/edge-hub/docker/linux/amd64/Dockerfile b/edge-hub/docker/linux/amd64/Dockerfile
@@ -1,7 +1,7 @@
-ARG base_tag=2.1.6-runtime-alpine3.7
+ARG base_tag=2.1.10-alpine3.7
 FROM azureiotedge/azureiotedge-runtime-base:1.0.0-preview001-linux-amd64 as builder
 
-FROM microsoft/dotnet:${base_tag}
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-hub/docker/linux/arm32v7/Dockerfile b/edge-hub/docker/linux/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm32v7
+ARG base_tag=1.0.0-preview013-linux-arm32v7
 FROM azureiotedge/azureiotedge-hub-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-hub/docker/linux/arm32v7/base/Dockerfile b/edge-hub/docker/linux/arm32v7/base/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-bionic-arm32v7
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-bionic-arm32v7
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 # Add an unprivileged user account for running Edge Hub
 ARG EDGEHUBUSER_ID=1000

diff --git a/edge-hub/docker/linux/arm64v8/Dockerfile b/edge-hub/docker/linux/arm64v8/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm64v8
+ARG base_tag=1.0.0-preview014-linux-arm64v8
 FROM azureiotedge/azureiotedge-hub-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-hub/docker/linux/arm64v8/base/Dockerfile b/edge-hub/docker/linux/arm64v8/base/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.0-bionic-arm64v8
+ARG base_tag=3.0.0-preview5-bionic-arm64v8
 FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 # Add an unprivileged user account for running Edge Hub

diff --git a/edge-hub/docker/windows/amd64/Dockerfile b/edge-hub/docker/windows/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-nanoserver-1809
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-nanoserver-1809
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-hub/docker/windows/arm32v7/Dockerfile b/edge-hub/docker/windows/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.1-windows-arm32v7
+ARG base_tag=1.0.2-windows-arm32v7
 ARG base_registry
 FROM ${base_registry}/azureiotedge/azureiotedge-hub-base:${base_tag}
 

diff --git a/edge-hub/docker/windows/arm32v7/base/Dockerfile b/edge-hub/docker/windows/arm32v7/base/Dockerfile
@@ -1,7 +1,7 @@
 # Base image for arm32v7 dotnet-runtime container
-FROM mcr.microsoft.com/windows/nanoserver:1809_arm
+FROM mcr.microsoft.com/windows/nanoserver:1809-arm32v7
 
-ENV DOTNET_VERSION 2.1.6
+ENV DOTNET_VERSION 2.1.10
 ENV DOTNET_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-${DOTNET_VERSION}-win-arm.zip
 
 RUN curl -SL %DOTNET_DOWNLOAD_URL% --output dotnet.zip \

diff --git a/edge-hub/src/Microsoft.Azure.Devices.Edge.Hub.Service/Startup.cs b/edge-hub/src/Microsoft.Azure.Devices.Edge.Hub.Service/Startup.cs
@@ -22,7 +22,6 @@ public class Startup : IStartup
 
         // ReSharper disable once UnusedParameter.Local
         public Startup(
-            IHostingEnvironment env,
             IConfigurationRoot configuration,
             IDependencyManager dependencyManager)
         {

diff --git a/edge-modules/DirectMethodCloudSender/docker/linux/amd64/Dockerfile b/edge-modules/DirectMethodCloudSender/docker/linux/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-alpine3.7
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-alpine3.7
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/DirectMethodCloudSender/docker/linux/arm32v7/Dockerfile b/edge-modules/DirectMethodCloudSender/docker/linux/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm32v7
+ARG base_tag=1.0.0-preview013-linux-arm32v7
 FROM azureiotedge/azureiotedge-module-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/DirectMethodCloudSender/docker/linux/arm64v8/Dockerfile b/edge-modules/DirectMethodCloudSender/docker/linux/arm64v8/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm64v8
+ARG base_tag=1.0.0-preview014-linux-arm64v8
 FROM azureiotedge/azureiotedge-module-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/DirectMethodCloudSender/docker/windows/amd64/Dockerfile b/edge-modules/DirectMethodCloudSender/docker/windows/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-nanoserver-1809
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-nanoserver-1809
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/DirectMethodCloudSender/docker/windows/arm32v7/Dockerfile b/edge-modules/DirectMethodCloudSender/docker/windows/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-windows-arm32v7
+ARG base_tag=1.0.2-windows-arm32v7
 ARG base_registry
 FROM ${base_registry}/azureiotedge/azureiotedge-module-base:${base_tag}
 

diff --git a/edge-modules/DirectMethodReceiver/docker/linux/amd64/Dockerfile b/edge-modules/DirectMethodReceiver/docker/linux/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-alpine3.7
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-alpine3.7
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/DirectMethodReceiver/docker/linux/arm64v8/Dockerfile b/edge-modules/DirectMethodReceiver/docker/linux/arm64v8/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm64v8
+ARG base_tag=1.0.0-preview014-linux-arm64v8
 FROM azureiotedge/azureiotedge-module-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/DirectMethodReceiver/docker/windows/amd64/Dockerfile b/edge-modules/DirectMethodReceiver/docker/windows/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-nanoserver-1809
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-nanoserver-1809
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/DirectMethodReceiver/docker/windows/arm32v7/Dockerfile b/edge-modules/DirectMethodReceiver/docker/windows/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-windows-arm32v7
+ARG base_tag=1.0.2-windows-arm32v7
 ARG base_registry
 FROM ${base_registry}/azureiotedge/azureiotedge-module-base:${base_tag}
 

diff --git a/edge-modules/DirectMethodSender/docker/linux/amd64/Dockerfile b/edge-modules/DirectMethodSender/docker/linux/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-alpine3.7
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-alpine3.7
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/DirectMethodSender/docker/linux/arm32v7/Dockerfile b/edge-modules/DirectMethodSender/docker/linux/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm32v7
+ARG base_tag=1.0.0-preview013-linux-arm32v7
 FROM azureiotedge/azureiotedge-module-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/DirectMethodSender/docker/linux/arm64v8/Dockerfile b/edge-modules/DirectMethodSender/docker/linux/arm64v8/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm64v8
+ARG base_tag=1.0.0-preview014-linux-arm64v8
 FROM azureiotedge/azureiotedge-module-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/DirectMethodSender/docker/windows/amd64/Dockerfile b/edge-modules/DirectMethodSender/docker/windows/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-nanoserver-1809
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-nanoserver-1809
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/DirectMethodSender/docker/windows/arm32v7/Dockerfile b/edge-modules/DirectMethodSender/docker/windows/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-windows-arm32v7
+ARG base_tag=1.0.2-windows-arm32v7
 ARG base_registry
 FROM ${base_registry}/azureiotedge/azureiotedge-module-base:${base_tag}
 

diff --git a/edge-modules/MessagesAnalyzer/Startup.cs b/edge-modules/MessagesAnalyzer/Startup.cs
@@ -21,6 +21,8 @@ public void ConfigureServices(IServiceCollection services)
             services.AddMvc();
         }
 
+        // TODO: Remove warning disable for Obsolete when project is moved to dotnetcore 3.0
+#pragma warning disable 612, 618
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
@@ -31,5 +33,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             app.UseMvc();
         }
+#pragma warning restore 612, 618
     }
 }
diff --git a/edge-modules/MessagesAnalyzer/docker/linux/amd64/Dockerfile b/edge-modules/MessagesAnalyzer/docker/linux/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-alpine3.7
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-alpine3.7
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/MessagesAnalyzer/docker/linux/arm32v7/Dockerfile b/edge-modules/MessagesAnalyzer/docker/linux/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm32v7
+ARG base_tag=1.0.0-preview013-linux-arm32v7
 FROM azureiotedge/azureiotedge-module-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/MessagesAnalyzer/docker/linux/arm64v8/Dockerfile b/edge-modules/MessagesAnalyzer/docker/linux/arm64v8/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm64v8
+ARG base_tag=1.0.0-preview014-linux-arm64v8
 FROM azureiotedge/azureiotedge-module-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/MessagesAnalyzer/docker/windows/amd64/Dockerfile b/edge-modules/MessagesAnalyzer/docker/windows/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-nanoserver-1809
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-nanoserver-1809
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/MessagesAnalyzer/docker/windows/arm32v7/Dockerfile b/edge-modules/MessagesAnalyzer/docker/windows/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-windows-arm32v7
+ARG base_tag=1.0.2-windows-arm32v7
 ARG base_registry
 FROM ${base_registry}/azureiotedge/azureiotedge-module-base:${base_tag}
 

diff --git a/edge-modules/SimulatedTemperatureSensor/docker/linux/amd64/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/linux/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-alpine3.7
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-alpine3.7
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/SimulatedTemperatureSensor/docker/linux/arm32v7/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/linux/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm32v7
+ARG base_tag=1.0.0-preview013-linux-arm32v7
 FROM azureiotedge/azureiotedge-module-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/SimulatedTemperatureSensor/docker/linux/arm32v7/base/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/linux/arm32v7/base/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-bionic-arm32v7
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-bionic-arm32v7
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 # Add an unprivileged user account for running the module
 RUN useradd -ms /bin/bash moduleuser

diff --git a/edge-modules/SimulatedTemperatureSensor/docker/linux/arm64v8/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/linux/arm64v8/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm64v8
+ARG base_tag=1.0.0-preview014-linux-arm64v8
 FROM azureiotedge/azureiotedge-module-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/SimulatedTemperatureSensor/docker/linux/arm64v8/base/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/linux/arm64v8/base/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=3.0-bionic-arm64v8
+ARG base_tag=3.0.0-preview5-bionic-arm64v8
 FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 # Add an unprivileged user account for running the module

diff --git a/edge-modules/SimulatedTemperatureSensor/docker/windows/amd64/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/windows/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-nanoserver-1809
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-nanoserver-1809
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/SimulatedTemperatureSensor/docker/windows/arm32v7/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/windows/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-windows-arm32v7
+ARG base_tag=1.0.2-windows-arm32v7
 ARG base_registry
 FROM ${base_registry}/azureiotedge/azureiotedge-module-base:${base_tag}
 

diff --git a/edge-modules/SimulatedTemperatureSensor/docker/windows/arm32v7/base/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/windows/arm32v7/base/Dockerfile
@@ -1,7 +1,7 @@
 # Base image for arm32v7 dotnet-runtime container
-FROM mcr.microsoft.com/windows/nanoserver:1809_arm
+FROM mcr.microsoft.com/windows/nanoserver:1809-arm32v7
 
-ENV DOTNET_VERSION 2.1.6
+ENV DOTNET_VERSION 2.1.10
 ENV DOTNET_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-${DOTNET_VERSION}-win-arm.zip
 
 RUN curl -SL %DOTNET_DOWNLOAD_URL% --output dotnet.zip \

diff --git a/edge-modules/TemperatureFilter/docker/linux/amd64/Dockerfile b/edge-modules/TemperatureFilter/docker/linux/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-alpine3.7
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-alpine3.7
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/TemperatureFilter/docker/linux/arm32v7/Dockerfile b/edge-modules/TemperatureFilter/docker/linux/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm32v7
+ARG base_tag=1.0.0-preview013-linux-arm32v7
 FROM azureiotedge/azureiotedge-module-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/TemperatureFilter/docker/linux/arm64v8/Dockerfile b/edge-modules/TemperatureFilter/docker/linux/arm64v8/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-preview012-linux-arm64v8
+ARG base_tag=1.0.0-preview014-linux-arm64v8
 FROM azureiotedge/azureiotedge-module-base:${base_tag}
 
 ARG EXE_DIR=.

diff --git a/edge-modules/TemperatureFilter/docker/windows/amd64/Dockerfile b/edge-modules/TemperatureFilter/docker/windows/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-nanoserver-1809
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-nanoserver-1809
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/TemperatureFilter/docker/windows/arm32v7/Dockerfile b/edge-modules/TemperatureFilter/docker/windows/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-ARG base_tag=1.0.0-windows-arm32v7
+ARG base_tag=1.0.2-windows-arm32v7
 ARG base_registry
 FROM ${base_registry}/azureiotedge/azureiotedge-module-base:${base_tag}
 

diff --git a/edge-modules/load-gen/docker/linux/amd64/Dockerfile b/edge-modules/load-gen/docker/linux/amd64/Dockerfile
@@ -1,5 +1,5 @@
-ARG base_tag=2.1.6-runtime-alpine3.7
-FROM microsoft/dotnet:${base_tag}
+ARG base_tag=2.1.10-alpine3.7
+FROM mcr.microsoft.com/dotnet/core/runtime:${base_tag}
 
 ARG EXE_DIR=.