diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5f74f564f8..84582fc2c1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,6 +1,3 @@
-variables:
-    MSBuildEnableWorkloadResolver: 'false'
-
 jobs:
 - job: Linux
   pool:
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/nukebuild/_build.csproj b/nukebuild/_build.csproj
index e08ffd0413..3cc9c44e4a 100644
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@@ -36,10 +36,9 @@
     <None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
     <Compile Remove="Numerge/**/*.*" />
     <Compile Include="Numerge/Numerge/**/*.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\src\tools\MicroComGenerator\MicroComGenerator.csproj" />
+    <Compile Include="..\src\tools\MicroComGenerator\**\*.cs" />
+    <Compile Remove="..\src\tools\MicroComGenerator\bin\*.cs" />
+    <Compile Remove="..\src\tools\MicroComGenerator\obj\*.cs" />
   </ItemGroup>
 
 </Project>
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" />