Fix build workflow

Use VS Tools 2026 to build

diff --git a/.github/workflows/build-winuae-binary.yml b/.github/workflows/build-winuae-binary.yml
index 4cdcc61c5eaa480e48cbb02dcc131d59d683c7fb..abe56d7e4514dca11462723fffc32175ef502e60 100644 (file)
--- a/.github/workflows/build-winuae-binary.yml
+++ b/.github/workflows/build-winuae-binary.yml
@@ -17,126 +17,94 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Diagnostics (VS instances)
-        shell: powershell
-        run: |
-          if (Test-Path "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe") {
-            & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -all -prerelease -products * -format json
-          } elseif (Get-Command vswhere.exe -ErrorAction SilentlyContinue) {
-            vswhere.exe -all -prerelease -products * -format json
-          } else {
-            Write-Host "vswhere.exe not found"
-          }
-
-      - name: Add MSBuild to PATH
-        uses: microsoft/setup-msbuild@v2
-
-      - name: Diagnostics (MSBuild)
-        shell: powershell
-        run: |
-          Get-Command msbuild -ErrorAction SilentlyContinue | Format-List *
-          msbuild -version
-
-      # Running roughly step 4 of README.md
-      - name: Download WinUAE includes and libs
-        shell: powershell
-        run: Invoke-WebRequest -Uri "https://download.abime.net/winuae/files/b/winuaeinclibs.zip" -OutFile "winuaeinclibs.zip"
-
-      - name: Unpack WinUAE includes and libs to C:\\dev
-        uses: ihiroky/extract-action@v1
-        with:
-          file_path: winuaeinclibs.zip
-          extract_dir: C:\\dev
-
-      # Running roughly step 6 of README.md
-      - name: Download AROS ROM cpp
-        shell: powershell
-        run: Invoke-WebRequest -Uri "https://download.abime.net/winuae/files/b/aros.rom.cpp.zip" -OutFile "aros.rom.cpp.zip"
-
-      - name: Unpack AROS ROM cpp
-        uses: ihiroky/extract-action@v1
-        with:
-          file_path: aros.rom.cpp.zip
-          extract_dir: .
-
-      # Running roughly step 7 of README.md
-      - name: Add NASM to PATH
-        uses: ilammy/setup-nasm@v1.5.1
-
-      # Running roughly step 12 of README.md
-      - name: Build Win32 FullRelease
-        working-directory: ${{env.GITHUB_WORKSPACE}}
-        # Add additional options to the MSBuild command line here (like platform or verbosity level).
-        # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
-        run: msbuild /m /p:Platform=Win32 /p:Configuration=FullRelease ${{env.SOLUTION_FILE_PATH}}
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: WinUAE 32-bit
-          path: D:\\Amiga
+    - uses: actions/checkout@v4
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Install Visual Studio Build Tools
+      shell: pwsh
+      run: |
+        Write-Host "Installing VS 2026 Build Tools..."
+        choco install visualstudio2026buildtools `
+          --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.ATL --add Microsoft.VisualStudio.Component.VC.ATLMFC --includeRecommended --quiet" `
+          -y --ignore-package-exit-codes=3010
+        Write-Host "VS 2026 Build Tools installation completed"
+
+    # Running roughly step 4 of README.md
+    - name: Download WinUAE includes and libs
+      shell: powershell
+      run: Invoke-WebRequest -Uri "https://download.abime.net/winuae/files/b/winuaeinclibs.zip" -OutFile "winuaeinclibs.zip"
+
+    - name: Unpack WinUAE includes and libs to C:\dev
+      uses: ihiroky/extract-action@v1
+      with:
+        file_path: winuaeinclibs.zip
+        extract_dir: C:\dev
+
+    # Running roughly step 7 of README.md
+    - name: Add NASM to PATH
+      uses: ilammy/setup-nasm@v1.5.1
+
+    # Running roughly step 12 of README.md
+    - name: Build Win32 FullRelease
+      shell: cmd
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      # Add additional options to the MSBuild command line here (like platform or verbosity level).
+      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+      run: |
+        call "C:\Program Files (x86)\Microsoft Visual Studio\18\BuildTools\Common7\Tools\VsDevCmd.bat"
+        msbuild /m /p:Platform=Win32 /p:Configuration=FullRelease ${{env.SOLUTION_FILE_PATH}}
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: WinUAE 32-bit
+        path: D:\Amiga
 
   Build-WinUAE-64bit-binary:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Diagnostics (VS instances)
-        shell: powershell
-        run: |
-          if (Test-Path "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe") {
-            & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -all -prerelease -products * -format json
-          } elseif (Get-Command vswhere.exe -ErrorAction SilentlyContinue) {
-            vswhere.exe -all -prerelease -products * -format json
-          } else {
-            Write-Host "vswhere.exe not found"
-          }
-
-      - name: Add MSBuild to PATH
-        uses: microsoft/setup-msbuild@v2
-
-      - name: Diagnostics (MSBuild)
-        shell: powershell
-        run: |
-          Get-Command msbuild -ErrorAction SilentlyContinue | Format-List *
-          msbuild -version
-
-      # Running roughly step 4 of README.md
-      - name: Download WinUAE includes and libs
-        shell: powershell
-        run: Invoke-WebRequest -Uri "https://download.abime.net/winuae/files/b/winuaeinclibs.zip" -OutFile "winuaeinclibs.zip"
-
-      - name: Unpack WinUAE includes and libs to C:\\dev
-        uses: ihiroky/extract-action@v1
-        with:
-          file_path: winuaeinclibs.zip
-          extract_dir: C:\\dev
-
-      # Running roughly step 6 of README.md
-      - name: Download AROS ROM cpp
-        shell: powershell
-        run: Invoke-WebRequest -Uri "https://download.abime.net/winuae/files/b/aros.rom.cpp.zip" -OutFile "aros.rom.cpp.zip"
-
-      - name: Unpack AROS ROM cpp
-        uses: ihiroky/extract-action@v1
-        with:
-          file_path: aros.rom.cpp.zip
-          extract_dir: .
-
-      # Running roughly step 7 of README.md
-      - name: Add NASM to PATH
-        uses: ilammy/setup-nasm@v1.5.1
-
-      # Running roughly step 12 of README.md
-      - name: Build x64 FullRelease
-        working-directory: ${{env.GITHUB_WORKSPACE}}
-        # Add additional options to the MSBuild command line here (like platform or verbosity level).
-        # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
-        run: msbuild /m /p:Platform=x64 /p:Configuration=FullRelease ${{env.SOLUTION_FILE_PATH}}
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: WinUAE 64-bit
-          path: D:\\Amiga
+    - uses: actions/checkout@v4
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Install Visual Studio Build Tools
+      shell: pwsh
+      run: |
+        Write-Host "Installing VS 2026 Build Tools..."
+        choco install visualstudio2026buildtools `
+          --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.ATL --add Microsoft.VisualStudio.Component.VC.ATLMFC --includeRecommended --quiet" `
+          -y --ignore-package-exit-codes=3010
+        Write-Host "VS 2026 Build Tools installation completed"
+
+    # Running roughly step 4 of README.md
+    - name: Download WinUAE includes and libs
+      shell: powershell
+      run: Invoke-WebRequest -Uri "https://download.abime.net/winuae/files/b/winuaeinclibs.zip" -OutFile "winuaeinclibs.zip"
+
+    - name: Unpack WinUAE includes and libs to C:\dev
+      uses: ihiroky/extract-action@v1
+      with:
+        file_path: winuaeinclibs.zip
+        extract_dir: C:\dev
+
+    # Running roughly step 7 of README.md
+    - name: Add NASM to PATH
+      uses: ilammy/setup-nasm@v1.5.1
+
+    # Running roughly step 12 of README.md
+    - name: Build x64 FullRelease
+      shell: cmd
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      # Add additional options to the MSBuild command line here (like platform or verbosity level).
+      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+      run: |
+        call "C:\Program Files (x86)\Microsoft Visual Studio\18\BuildTools\Common7\Tools\VsDevCmd.bat"
+        msbuild /m /p:Platform=x64 /p:Configuration=FullRelease ${{env.SOLUTION_FILE_PATH}}
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: WinUAE 64-bit
+        path: D:\Amiga