From 1ba09042f6f05194c5a58bfd3a6527bd48bea73b Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Thu, 18 Jan 2024 14:23:14 -0800
Subject: [PATCH] vs_installer

---
 .github/workflows/build.yml | 30 ++++++++++++++++++++----------
 .metadata/generate.proj     |  2 +-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f594fc5..fdf852b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,22 +28,30 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '8.x'
+        dotnet-version: |
+          8.x
 
     - name: Setup Visual Studio
       run: |
-        $vsInstallationPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath
-        & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vs_installer.exe" modify --installPath "$vsInstallationPath" --add `
-        Microsoft.NetCore.Component.Runtime.8.0 `
-        Microsoft.NetCore.Component.SDK `
-        Microsoft.VisualStudio.Component.VC.Tools.ARM64 `
-        Microsoft.VisualStudio.Component.VC.Tools.x86.x64 `
-        Microsoft.VisualStudio.Component.Windows11SDK.22000
+        Start-Process -Wait "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vs_installer.exe" -ArgumentList {`
+          modify `
+          --quiet `
+          --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" `
+          --add `
+          Microsoft.NetCore.Component.Runtime.8.0 `
+          Microsoft.NetCore.Component.SDK `
+          Microsoft.VisualStudio.Component.VC.Tools.ARM64 `
+          Microsoft.VisualStudio.Component.VC.Tools.x86.x64 `
+          Microsoft.VisualStudio.Component.Windows11SDK.22000 `
+        }
 
     - name: Build metadata
-      run: dotnet build .metadata
+      shell: cmd
+      run: |
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        dotnet build .metadata
 
     - name: Update toolchain
       run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
@@ -67,6 +75,7 @@ jobs:
   cargo_clippy:
     name: Check cargo clippy
     runs-on: windows-latest
+    needs: test
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -77,6 +86,7 @@ jobs:
   cargo_doc:
     name: Check cargo docs
     runs-on: windows-latest
+    needs: test
     steps:
     - name: Checkout
       uses: actions/checkout@v2
diff --git a/.metadata/generate.proj b/.metadata/generate.proj
index de1aa71..3ab1748 100644
--- a/.metadata/generate.proj
+++ b/.metadata/generate.proj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.Windows.WinmdGenerator/0.56.13-preview">
+<Project Sdk="Microsoft.Windows.WinmdGenerator/0.57.42-preview">
     <PropertyGroup Label="Globals">
         <OutputWinmd>../.windows/winmd/Microsoft.Dia.winmd</OutputWinmd>
         <WinmdVersion>255.255.255.255</WinmdVersion>