Update Build

reactivemarbles · Nov 17, 2024 · 6be5fbc · 6be5fbc
1 parent 1666155
commit 6be5fbc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/.github/workflows/BuildDeploy.yml b/.github/workflows/BuildDeploy.yml
@@ -30,6 +30,8 @@ jobs:
     runs-on: windows-latest
     environment:
       name: release
+    outputs:
+      nbgv: ${{ steps.nbgv.outputs.SemVer2 }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -40,11 +42,19 @@ jobs:
         with:
           distribution: 'microsoft'
           java-version: '11'
+
+      - name: Setup .NET 6/8/9
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            6.0.x
+            8.0.x
+            9.0.x
       
       - name: 'Install DotNet workloads'
         shell: bash
         run: |
-          dotnet workload install android ios tvos macos maui maccatalyst wasm-tools
+          dotnet workload install android ios tvos macos maui maccatalyst wasm-tools wasm-tools-net8
 
       - name: NBGV
         id: nbgv

diff --git a/.github/workflows/BuildOnly.yml b/.github/workflows/BuildOnly.yml
@@ -25,6 +25,8 @@ jobs:
   windows-latest:
     name: windows-latest
     runs-on: windows-latest
+    outputs:
+      nbgv: ${{ steps.nbgv.outputs.SemVer2 }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -35,11 +37,19 @@ jobs:
         with:
           distribution: 'microsoft'
           java-version: '11'
+
+      - name: Setup .NET 6/8/9
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            6.0.x
+            8.0.x
+            9.0.x
       
       - name: 'Install DotNet workloads'
         shell: bash
         run: |
-          dotnet workload install android ios tvos macos maui maccatalyst wasm-tools
+          dotnet workload install android ios tvos macos maui maccatalyst wasm-tools wasm-tools-net8
 
       - name: NBGV
         id: nbgv

diff --git a/build/Build.cs b/build/Build.cs
@@ -48,18 +48,15 @@ partial class Build : NukeBuild
 
     Target Clean => _ => _
         .Before(Restore)
-        .Executes(async () =>
+        .Executes(() =>
         {
             if (IsLocalBuild)
             {
                 return;
             }
 
             PackagesDirectory.CreateOrCleanDirectory();
-            await this.InstallDotNetSdk("8.x.x", "9.x.x");
-            var workloadSettings = new DotNetWorkloadInstallSettings();
-            workloadSettings.AddWorkloadId("wasm-tools-net8");
-            DotNetWorkloadInstall(workloadSettings);
+            ////await this.InstallDotNetSdk("8.x.x", "9.x.x");
         });
 
     Target Restore => _ => _