Use installed MSVC

app_manifest_dev.py

@@ -1821,4 +1821,46 @@ def get_manifest(is_windows):
         ],
     })
 
+    # --------------------------------------------------------------------------
+
+    version           = "1.20.1"
+    download_url      = ""
+    download_checksum = ""
+    exe_path          = ""
+    checksum          = ""
+
+    if is_windows:
+        exe_path          = "bin/go.exe"
+        download_url      = f"https://go.dev/dl/go{version}.windows-amd64.zip"
+        download_checksum = "3b493969196a6de8d9762d09f5bc5ae7a3e5814b0cfbf9cc26838c2bc1314f9c"
+        checksum          = "89fc8e2c47f2a2a9138e60159781ce377167cf61e30d8136fbad0d77ac9303ed"
+        symlink           = [f"go-{version}.exe"]
+    else:
+        exe_path          = f"bin/go"
+        download_url      = f"https://go.dev/dl/go{version}.linux-amd64.tar.gz"
+        download_checksum = "000a5b1fca4f75895f78befeb2eecf10bfff3c428597f3f1e69133b63b911b02"
+        checksum          = ""
+        symlink           = [f"go-{version}"]
+
+    result.append({
+        "label": "Go",
+        "manifests": [
+            {
+                "download_url": download_url,
+                "download_checksum": download_checksum,
+                "version": version,
+                "unzip_method": 'default',
+                "executables": [
+                    {
+                        "path": exe_path,
+                        "symlink": symlink,
+                        "add_to_devenv_path": True,
+                        "checksum": checksum,
+                    }
+                ],
+                "add_to_devenv_script": [],
+            }
+        ],
+    })
+
     return result

devenver.py

@@ -679,7 +679,7 @@ def run(user_app_list,
             "add_to_devenv_script": [],
         })
 
-    version           = "2201"
+    version           = "2301"
     download_url      = ""
     download_checksum = ""
     checksum          = ""
@@ -687,14 +687,14 @@ def run(user_app_list,
 
     if is_windows or os.name == "nt":
         download_url      = f"https://www.7-zip.org/a/7z{version}-x64.exe"
-        download_checksum = "b055fee85472921575071464a97a79540e489c1c3a14b9bdfbdbab60e17f36e4"
-        checksum          = "254cf6411d38903b2440819f7e0a847f0cfee7f8096cfad9e90fea62f42b0c23"
+        download_checksum = "26cb6e9f56333682122fafe79dbcdfd51e9f47cc7217dccd29ac6fc33b5598cd"
+        checksum          = "8cebb25e240db3b6986fcaed6bc0b900fa09dad763a56fb71273529266c5c525"
         exe_path          = "7z.exe"
 
     else:
         download_url      = f"https://www.7-zip.org/a/7z{version}-linux-x64.tar.xz"
-        download_checksum = "2c266f6794adec310c4631232c1d039f46988d51082fe5e80349c52ee7ed60bb"
-        checksum          = "0c771994a00ee96a0fc85902f66fbfd162c3090091e523bb828cdf4cd09a2e73"
+        download_checksum = "a"
+        checksum          = "a"
         exe_path          = "7zz"
 
     internal_app_list[-1]["manifests"].append({ # Download proper 7zip, extract this exe with the bootstrap 7zip

install.py

@@ -271,8 +271,7 @@ if wezterm.target_triple == "x86_64-pc-windows-msvc" then
 
   clink_exe     = string.format("%s\\\\..\\\\..\\\\{clink_exe_path_for_wezterm}", wezterm.executable_dir)
   devenv_bat    = string.format("%s\\\\..\\\\..\\\\{dev_env_script_name}.bat", wezterm.executable_dir)
-  msvc_bat      = string.format("%s\\\\..\\\\..\\\\msvc\\\\msvc-{msvc_version}.bat", wezterm.executable_dir)
-  win10_sdk_bat = string.format("%s\\\\..\\\\..\\\\msvc\\\\win-sdk-{win10_sdk_version}.bat", wezterm.executable_dir)
+  msvc_bat      = "C:\\\\Program Files\\\\Microsoft Visual Studio\\\\2022\\\\Community\\\\VC\\\\Auxiliary\\\\Build\\\\vcvarsall.bat"
   clink_profile = string.format("%s\\\\..\\\\..\\\\{clink_profile_path_for_wezterm}", wezterm.executable_dir)
 
   -- Taken from: https://wezfurlong.org/wezterm/shell-integration.html
@@ -283,8 +282,7 @@ if wezterm.target_triple == "x86_64-pc-windows-msvc" then
   default_prog = {{"cmd.exe", "/s", "/k",
                   clink_exe, "inject", "--profile", clink_profile, "-q",
                   "&&", "call", devenv_bat,
-                  "&&", "call", msvc_bat,
-                  "&&", "call", win10_sdk_bat}}
+                  "&&", "call", msvc_bat, "x64"}}
 end
 
 return {{