PT-1956: Support build/pack for .net6 (#28)

* feat: Support build/pack for .net6 * Update main.yml Co-authored-by: Alexandr Morogov <[email protected]>
VirtoCommerce · Nov 26, 2021 · 41f6176 · 41f6176
1 parent bd07549
commit 41f6176
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,12 +27,23 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }}
       NUGET_KEY: ${{ secrets.NUGET_KEY }}
       BLOB_SAS: ${{ secrets.BLOB_TOKEN }}
+      MSBuildEnableWorkloadResolver: false
 
     steps:
 
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
+
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '3.1.x'
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.x'
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
 
       - name: Install VirtoCommerce.GlobalTool
         uses: VirtoCommerce/vc-github-actions/setup-vcbuild@master

diff --git a/Build.cs b/Build.cs
@@ -11,6 +11,7 @@
 using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Serialization;
+using Microsoft.Build.Locator;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Nuke.Common;
@@ -54,6 +55,8 @@ internal partial class Build : NukeBuild
 
         public static int Main(string[] args)
         {
+            MSBuildLocator.RegisterDefaults();
+
             if (args[0]?.ToLowerInvariant() == "help")
             {
                 if (args.Length == 2)

diff --git a/_build.csproj b/_build.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <PackageId>VirtoCommerce.GlobalTool</PackageId>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace></RootNamespace>
     <PackAsTool>true</PackAsTool>
@@ -24,6 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
     <PackageReference Include="Markdig" Version="0.24.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.14" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />