From 2b49113b0646f5363d6adcbdd97307a6212eec13 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 16 Nov 2023 11:11:01 -0800
Subject: [PATCH 1/2] Add MSVC 14.37. (#171)

* Add MSVC 14.37.

* Fix missing values in MSVC maps

* Fixup msvc version
---
 matrix.yml                              | 2 +-
 windows/image/installers/build-env.psm1 | 1 +
 windows/image/installers/install-vs.ps1 | 1 +
 windows/vs-version-matrix.ps1           | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/matrix.yml b/matrix.yml
index 65cdff98..9a8b035c 100644
--- a/matrix.yml
+++ b/matrix.yml
@@ -104,9 +104,9 @@ include:
   - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.27" }]} # MSVC 2019
   - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.28" }]} # MSVC 2019
   - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.29" }]} # MSVC 2019
-  - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.34" }]} # MSVC 2022
   - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.35" }]} # MSVC 2022
   - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.36" }]} # MSVC 2022
+  - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.37" }]} # MSVC 2022
 
 # RAPIDS devcontainers
 
diff --git a/windows/image/installers/build-env.psm1 b/windows/image/installers/build-env.psm1
index 70cad084..dad560e0 100644
--- a/windows/image/installers/build-env.psm1
+++ b/windows/image/installers/build-env.psm1
@@ -32,6 +32,7 @@ $MSBuildPathMap = @{
     "14.34"="$MSBuildPath\17\VC\Auxiliary\Build"
     "14.35"="$MSBuildPath\17\VC\Auxiliary\Build"
     "14.36"="$MSBuildPath\17\VC\Auxiliary\Build"
+    "14.37"="$MSBuildPath\17\VC\Auxiliary\Build"
     "latest"="$MSBuildPath\$ENV:INSTALLED_MSVC_VERSION\VC\Auxiliary\Build"
 }
 
diff --git a/windows/image/installers/install-vs.ps1 b/windows/image/installers/install-vs.ps1
index 9af28849..8a7cb262 100644
--- a/windows/image/installers/install-vs.ps1
+++ b/windows/image/installers/install-vs.ps1
@@ -23,6 +23,7 @@ $vsComponentsMap = @{
     "14.34"  = "Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64"
     "14.35"  = "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64"
     "14.36"  = "Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64"
+    "14.37"  = "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64"
     "latest" = "Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
 }
 
diff --git a/windows/vs-version-matrix.ps1 b/windows/vs-version-matrix.ps1
index 02156bc3..b8bc1997 100644
--- a/windows/vs-version-matrix.ps1
+++ b/windows/vs-version-matrix.ps1
@@ -1,7 +1,7 @@
 $global:vsVerToCompilers = @{
     "2017"=("14.14", "14.15", "14.16");
     "2019"=("14.27", "14.28", "14.29");
-    "2022"=("14.34", "14.35", "14.36");
+    "2022"=("14.35", "14.36", "14.37");
 }
 
 $global:vsCompilersToYear = @{
@@ -14,6 +14,7 @@ $global:vsCompilersToYear = @{
     "14.34"="2022"
     "14.35"="2022"
     "14.36"="2022"
+    "14.37"="2022"
     "latest"="2022"
 }
 

From 30f32874520271788146b8d4def48a1c4134732b Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 16 Nov 2023 11:11:12 -0800
Subject: [PATCH 2/2] Add psutil to the windows devcontainers. (#172)

---
 windows/image/installers/install-lit.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/windows/image/installers/install-lit.ps1 b/windows/image/installers/install-lit.ps1
index e73d5140..c78cad1b 100644
--- a/windows/image/installers/install-lit.ps1
+++ b/windows/image/installers/install-lit.ps1
@@ -6,6 +6,7 @@ $ENV:PATH = "C:\Python\Scripts;$ENV:PATH"
 
 python -m pip install --upgrade pip
 python -m pip install wheel
+python -m pip install psutil
 python -m pip install lit
 
 Remove-Item .\python_installer.exe