From 6be5fbcf51a7b290800c7a16c33f6284b84a352f Mon Sep 17 00:00:00 2001
From: Chris Pulman <chris.pulman@yahoo.com>
Date: Sun, 17 Nov 2024 01:16:38 +0000
Subject: [PATCH] Update Build

---
 .github/workflows/BuildDeploy.yml | 12 +++++++++++-
 .github/workflows/BuildOnly.yml   | 12 +++++++++++-
 build/Build.cs                    |  7 ++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/BuildDeploy.yml b/.github/workflows/BuildDeploy.yml
index d706b56..0eb3dd4 100644
--- 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
index 1642845..fb71b94 100644
--- 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
index 4389a7a..d915918 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -48,7 +48,7 @@ partial class Build : NukeBuild
 
     Target Clean => _ => _
         .Before(Restore)
-        .Executes(async () =>
+        .Executes(() =>
         {
             if (IsLocalBuild)
             {
@@ -56,10 +56,7 @@ partial class Build : NukeBuild
             }
 
             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 => _ => _