From e53b03b223444317ae7b630bf367c462380973cb Mon Sep 17 00:00:00 2001
From: Taiizor <41683699+Taiizor@users.noreply.github.com>
Date: Sat, 16 Nov 2024 00:14:49 +0300
Subject: [PATCH] Update dotnet-desktop.yml

---
 .github/workflows/dotnet-desktop.yml | 33 +++++++---------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index 6500bbe..12d7e22 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -20,7 +20,7 @@ jobs:
         solution: [
             src/Skylark.sln,
             src/Skylark.DNS.sln,
-            src/Skylark.Wing.sln,
+            # src/Skylark.Wing.sln,
             src/Skylark.Uptime.sln,
             src/Skylark.Standard.sln,
             src/Skylark.Clipboard.sln,
@@ -57,43 +57,26 @@ jobs:
       with:
         fetch-depth: 0
 
-    # Install Visual Studio Build Tools with MSBuild
-    - name: Install Visual Studio Build Tools
-      run: |
-        choco install visualstudio2019buildtools --ignore-checksums -y
-        choco install visualstudio2019-workload-vctools --ignore-checksums -y
-
-    # Install .NET Core SDK
+    # Install the .NET Core workload
     - name: Install .NET Core
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 9.0.x
         dotnet-quality: preview
 
-    # Set up MSBuild from Visual Studio
+    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe
-      run: |
-        echo "Adding MSBuild to path"
-        echo "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin" >> $GITHUB_PATH
+      uses: microsoft/setup-msbuild@v1.3.1
 
-    # Execute unit tests
+    # Execute all unit tests in the solution
     - name: Execute Unit Tests
       run: dotnet test ${{ matrix.solution }} -c ${{ matrix.configuration }} /nowarn:CS0067,CS0108,CS0109,CS0114,CS0169,CS0414,CS0649,CA1416,NU5104,NETSDK1138,SYSLIB0003
       env:
         NUGET_CONFIG_PATH: ./NuGet.Config
 
-    # Restore the Skylark project
-    - name: Restore Skylark
-      run: |
-        & "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe" "${{ matrix.solution }}" /t:Restore /p:Configuration=$env:Configuration
-      env:
-        NUGET_CONFIG_PATH: ./NuGet.Config
-        Configuration: ${{ matrix.configuration }}
-
-    # Build the Skylark project
-    - name: Build Skylark
-      run: |
-        & "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe" "${{ matrix.solution }}" /t:Build /p:Configuration=$env:Configuration
+    # Restore the application to populate the obj folder with RuntimeIdentifiers
+    - name: Restore the Skylark
+      run: msbuild ${{ matrix.solution }} /t:Restore /p:Configuration=$env:Configuration
       env:
         NUGET_CONFIG_PATH: ./NuGet.Config
         Configuration: ${{ matrix.configuration }}
\ No newline at end of file