From b4d10d5ed9e38ec3522dad2b6b97b96398794aac Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 9 Nov 2021 16:46:08 +0000
Subject: [PATCH] dotnet 6 compatibility.

---
 azure-pipelines.yml                                  | 12 ++++++------
 build/MicroCom.targets                               |  2 +-
 global.json                                          |  3 ---
 src/tools/MicroComGenerator/MicroComGenerator.csproj |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bc8d065137..9939302cef 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,9 +9,9 @@ jobs:
       version: 3.1.414
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 5.0.402'
+    displayName: 'Use .NET Core SDK 6.0.101'
     inputs:
-      version: 5.0.402
+      version: 6.0.101
 
   - task: CmdLine@2
     displayName: 'Run Build'
@@ -40,9 +40,9 @@ jobs:
       version: 3.1.414
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 5.0.402'
+    displayName: 'Use .NET Core SDK 6.0.101'
     inputs:
-      version: 5.0.402
+      version: 6.0.101
       
   - task: CmdLine@2
     displayName: 'Install Mono 5.18'
@@ -110,9 +110,9 @@ jobs:
       version: 3.1.414
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 5.0.402'
+    displayName: 'Use .NET Core SDK 6.0.101'
     inputs:
-      version: 5.0.402
+      version: 6.0.101
 
   - task: CmdLine@2
     displayName: 'Install Nuke'
diff --git a/build/MicroCom.targets b/build/MicroCom.targets
index 49d2cdce72..1ed388f689 100644
--- a/build/MicroCom.targets
+++ b/build/MicroCom.targets
@@ -15,7 +15,7 @@
           Inputs="@(AvnComIdl);$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/**/*.cs"
           Outputs="%(AvnComIdl.OutputFile)">
     <Message Importance="high" Text="Generating file %(AvnComIdl.OutputFile) from @(AvnComIdl)" />
-    <Exec Command="dotnet &quot;$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/bin/$(Configuration)/netcoreapp3.1/MicroComGenerator.dll&quot; -i @(AvnComIdl) --cs %(AvnComIdl.OutputFile)" 
+    <Exec Command="dotnet &quot;$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/bin/$(Configuration)/net6.0/MicroComGenerator.dll&quot; -i @(AvnComIdl) --cs %(AvnComIdl.OutputFile)" 
           LogStandardErrorAsError="true" />
     <ItemGroup>
       <!-- Remove and re-add generated file, this is needed for the clean build -->
diff --git a/global.json b/global.json
index 9f83c1ea1e..ad41e7fea1 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,4 @@
 {
-	"sdk": {
-		"version": "5.0.402"
-	},
     "msbuild-sdks": {
         "Microsoft.Build.Traversal": "1.0.43",
         "MSBuild.Sdk.Extras": "2.0.54",
diff --git a/src/tools/MicroComGenerator/MicroComGenerator.csproj b/src/tools/MicroComGenerator/MicroComGenerator.csproj
index 5ae431b4b9..f2ed8b0185 100644
--- a/src/tools/MicroComGenerator/MicroComGenerator.csproj
+++ b/src/tools/MicroComGenerator/MicroComGenerator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />