Update to dotnet 6

rido-min · rido-min · commit 4df619f695ee · 2022-11-28T16:33:12.000-08:00
diff --git a/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.amd64 b/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.amd64
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
 WORKDIR /app
 
 COPY *.csproj ./
@@ -7,7 +7,7 @@ RUN dotnet restore
 COPY . ./
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim
+FROM mcr.microsoft.com/dotnet/runtime:6.0
 WORKDIR /app
 COPY --from=build-env /app/out ./
 
diff --git a/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.amd64.debug b/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.amd64.debug
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/runtime:6.0 AS base
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends unzip procps && \
@@ -8,7 +8,7 @@ RUN useradd -ms /bin/bash moduleuser
 USER moduleuser
 RUN curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l ~/vsdbg
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
 WORKDIR /app
 
 COPY *.csproj ./
diff --git a/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.arm32v7 b/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.arm32v7
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster-arm32v7 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim-arm32v7 AS build-env
 WORKDIR /app
 
 COPY *.csproj ./
@@ -7,7 +7,7 @@ RUN dotnet restore
 COPY . ./
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim-arm32v7
+FROM mcr.microsoft.com/dotnet/runtime:6.0-bullseye-slim-arm32v7
 WORKDIR /app
 COPY --from=build-env /app/out ./
 
diff --git a/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.arm32v7.debug b/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.arm32v7.debug
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim-arm32v7 AS base
+FROM mcr.microsoft.com/dotnet/runtime:6.0-bullseye-slim-arm32v7 AS base
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends unzip procps && \
@@ -8,7 +8,7 @@ RUN useradd -ms /bin/bash moduleuser
 USER moduleuser
 RUN curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l ~/vsdbg
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster-arm32v7 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim-arm32v7 AS build-env
 WORKDIR /app
 
 COPY *.csproj ./
diff --git a/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.arm64v8 b/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.arm64v8
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster-arm64v8 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim-arm64v8 AS build-env
 WORKDIR /app
 
 COPY *.csproj ./
@@ -7,7 +7,7 @@ RUN dotnet restore
 COPY . ./
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim-arm64v8
+FROM mcr.microsoft.com/dotnet/runtime:6.0-bullseye-slim-arm64v8
 WORKDIR /app
 COPY --from=build-env /app/out ./
 
diff --git a/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.arm64v8.debug b/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.arm64v8.debug
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim-arm64v8 AS base
+FROM mcr.microsoft.com/dotnet/runtime:6.0-bullseye-slim-arm64v8 AS base
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends unzip procps && \
@@ -8,7 +8,7 @@ RUN useradd -ms /bin/bash moduleuser
 USER moduleuser
 RUN curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l ~/vsdbg
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster-arm64v8 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim-arm64v8 AS build-env
 WORKDIR /app
 
 COPY *.csproj ./
diff --git a/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.windows-amd64 b/content/dotnet-template-azure-iot-edge-module/CSharp/Dockerfile.windows-amd64
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-nanoserver-1809 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0-nanoserver-ltsc2022 AS build-env
 WORKDIR /app
 
 COPY *.csproj ./
@@ -7,7 +7,7 @@ RUN dotnet restore
 COPY . ./
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1-nanoserver-1809
+FROM mcr.microsoft.com/dotnet/runtime:6.0-nanoserver-ltsc2022
 WORKDIR /app
 COPY --from=build-env /app/out ./
 ENTRYPOINT ["dotnet", "SampleModule.dll"]
diff --git a/content/dotnet-template-azure-iot-edge-module/CSharp/Program.cs b/content/dotnet-template-azure-iot-edge-module/CSharp/Program.cs
@@ -1,21 +1,18 @@
 namespace SampleModule
 {
+    using Microsoft.Azure.Devices.Client;
+    using Microsoft.Azure.Devices.Client.Transport.Mqtt;
     using System;
-    using System.IO;
-    using System.Runtime.InteropServices;
     using System.Runtime.Loader;
-    using System.Security.Cryptography.X509Certificates;
     using System.Text;
     using System.Threading;
     using System.Threading.Tasks;
-    using Microsoft.Azure.Devices.Client;
-    using Microsoft.Azure.Devices.Client.Transport.Mqtt;
 
     class Program
     {
         static int counter;
 
-        static void Main(string[] args)
+        static void Main()
         {
             Init().Wait();
 
@@ -42,7 +39,7 @@ public static Task WhenCancelled(CancellationToken cancellationToken)
         /// </summary>
         static async Task Init()
         {
-            MqttTransportSettings mqttSetting = new MqttTransportSettings(TransportType.Mqtt_Tcp_Only);
+            MqttTransportSettings mqttSetting = new (TransportType.Mqtt_Tcp_Only);
             ITransportSettings[] settings = { mqttSetting };
 
             // Open a connection to the Edge runtime
@@ -63,8 +60,7 @@ static async Task<MessageResponse> PipeMessage(Message message, object userConte
         {
             int counterValue = Interlocked.Increment(ref counter);
 
-            var moduleClient = userContext as ModuleClient;
-            if (moduleClient == null)
+            if (userContext is not ModuleClient moduleClient)
             {
                 throw new InvalidOperationException("UserContext doesn't contain " + "expected values");
             }
@@ -75,16 +71,14 @@ static async Task<MessageResponse> PipeMessage(Message message, object userConte
 
             if (!string.IsNullOrEmpty(messageString))
             {
-                using (var pipeMessage = new Message(messageBytes))
+                using var pipeMessage = new Message(messageBytes);
+                foreach (var prop in message.Properties)
                 {
-                    foreach (var prop in message.Properties)
-                    {
-                        pipeMessage.Properties.Add(prop.Key, prop.Value);
-                    }
-                    await moduleClient.SendEventAsync("output1", pipeMessage);
-                
-                    Console.WriteLine("Received message sent");
+                    pipeMessage.Properties.Add(prop.Key, prop.Value);
                 }
+                await moduleClient.SendEventAsync("output1", pipeMessage);
+
+                Console.WriteLine("Received message sent");
             }
             return MessageResponse.Completed;
         }
diff --git a/content/dotnet-template-azure-iot-edge-module/CSharp/SampleModule.csproj b/content/dotnet-template-azure-iot-edge-module/CSharp/SampleModule.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.1|AnyCPU'">
@@ -10,17 +10,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectCapability Include="AzureIoTEdgeModule"/>
+    <ProjectCapability Include="AzureIoTEdgeModule" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.*" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.*" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,18 @@`
`1`	`1`	`namespace SampleModule`
`2`	`2`	`{`
	`3`	`+ using Microsoft.Azure.Devices.Client;`
	`4`	`+ using Microsoft.Azure.Devices.Client.Transport.Mqtt;`
`3`	`5`	`using System;`
`4`		`- using System.IO;`
`5`		`- using System.Runtime.InteropServices;`
`6`	`6`	`using System.Runtime.Loader;`
`7`		`- using System.Security.Cryptography.X509Certificates;`
`8`	`7`	`using System.Text;`
`9`	`8`	`using System.Threading;`
`10`	`9`	`using System.Threading.Tasks;`
`11`		`- using Microsoft.Azure.Devices.Client;`
`12`		`- using Microsoft.Azure.Devices.Client.Transport.Mqtt;`
`13`	`10`
`14`	`11`	`class Program`
`15`	`12`	`{`
`16`	`13`	`static int counter;`
`17`	`14`
`18`		`- static void Main(string[] args)`
	`15`	`+ static void Main()`
`19`	`16`	`{`
`20`	`17`	`Init().Wait();`
`21`	`18`
`@@ -42,7 +39,7 @@ public static Task WhenCancelled(CancellationToken cancellationToken)`
`42`	`39`	`/// </summary>`
`43`	`40`	`static async Task Init()`
`44`	`41`	`{`
`45`		`- MqttTransportSettings mqttSetting = new MqttTransportSettings(TransportType.Mqtt_Tcp_Only);`
	`42`	`+ MqttTransportSettings mqttSetting = new (TransportType.Mqtt_Tcp_Only);`
`46`	`43`	`ITransportSettings[] settings = { mqttSetting };`
`47`	`44`
`48`	`45`	`// Open a connection to the Edge runtime`
`@@ -63,8 +60,7 @@ static async Task<MessageResponse> PipeMessage(Message message, object userConte`
`63`	`60`	`{`
`64`	`61`	`int counterValue = Interlocked.Increment(ref counter);`
`65`	`62`
`66`		`- var moduleClient = userContext as ModuleClient;`
`67`		`- if (moduleClient == null)`
	`63`	`+ if (userContext is not ModuleClient moduleClient)`
`68`	`64`	`{`
`69`	`65`	`throw new InvalidOperationException("UserContext doesn't contain " + "expected values");`
`70`	`66`	`}`
`@@ -75,16 +71,14 @@ static async Task<MessageResponse> PipeMessage(Message message, object userConte`
`75`	`71`
`76`	`72`	`if (!string.IsNullOrEmpty(messageString))`
`77`	`73`	`{`
`78`		`- using (var pipeMessage = new Message(messageBytes))`
	`74`	`+ using var pipeMessage = new Message(messageBytes);`
	`75`	`+ foreach (var prop in message.Properties)`
`79`	`76`	`{`
`80`		`- foreach (var prop in message.Properties)`
`81`		`- {`
`82`		`- pipeMessage.Properties.Add(prop.Key, prop.Value);`
`83`		`- }`
`84`		`- await moduleClient.SendEventAsync("output1", pipeMessage);`
`85`		`-`
`86`		`- Console.WriteLine("Received message sent");`
	`77`	`+ pipeMessage.Properties.Add(prop.Key, prop.Value);`
`87`	`78`	`}`
	`79`	`+ await moduleClient.SendEventAsync("output1", pipeMessage);`
	`80`	`+`
	`81`	`+ Console.WriteLine("Received message sent");`
`88`	`82`	`}`
`89`	`83`	`return MessageResponse.Completed;`
`90`	`84`	`}`