Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

40 files changed, 1339 insertions, 733 deletions

diff --git a/build/RunCbindgen.py b/build/RunCbindgen.py
index e166556f68..fbbe9d0584 100644
--- a/build/RunCbindgen.py
+++ b/build/RunCbindgen.py
@@ -7,7 +7,6 @@ import subprocess
 
 import buildconfig
 import mozpack.path as mozpath
-import six
 import toml
 
 
@@ -29,11 +28,11 @@ def _run_process(args):
     env["CARGO"] = str(buildconfig.substs["CARGO"])
     env["RUSTC"] = str(buildconfig.substs["RUSTC"])
 
-    p = subprocess.Popen(args, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    p = subprocess.Popen(
+        args, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding="utf-8"
+    )
 
     stdout, stderr = p.communicate()
-    stdout = six.ensure_text(stdout)
-    stderr = six.ensure_text(stderr)
     if p.returncode != 0:
         print(stdout)
         print(stderr)
@@ -63,7 +62,8 @@ def generate_metadata(output, cargo_config):
     if returncode != 0:
         return returncode
 
-    output.write(stdout)
+    if stdout:
+        output.write(stdout)
 
     # This is not quite accurate, but cbindgen only cares about a subset of the
     # data which, when changed, causes these files to change.
@@ -88,7 +88,8 @@ def generate(output, metadata_path, cbindgen_crate_path, *in_tree_dependencies):
     if returncode != 0:
         return returncode
 
-    output.write(stdout)
+    if stdout:
+        output.write(stdout)
 
     deps = set()
     deps.add(CARGO_LOCK)
diff --git a/build/autoconf/codeset.m4 b/build/autoconf/codeset.m4
deleted file mode 100644
index 3a25c42961..0000000000
--- a/build/autoconf/codeset.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_LANGINFO_CODESET],
-[
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-      HAVE_LANGINFO_CODESET=1
-  fi
-  AC_SUBST(HAVE_LANGINFO_CODESET)
-])
diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
index 08e05483f5..03521a333e 100755
--- a/build/build-clang/build-clang.py
+++ b/build/build-clang/build-clang.py
@@ -251,10 +251,7 @@ def build_one_stage(
 
         cmake_args.append("-DLLVM_ENABLE_PROJECTS=%s" % ";".join(projects))
 
-        # There is no libxml2 on Windows except if we build one ourselves.
-        # libxml2 is only necessary for llvm-mt, but Windows can just use the
-        # native MT tool.
-        if not is_windows(target) and is_final_stage:
+        if is_final_stage:
             cmake_args += ["-DLLVM_ENABLE_LIBXML2=FORCE_ON"]
         if is_linux(target) and is_final_stage:
             sysroot = os.path.join(os.environ.get("MOZ_FETCHES_DIR", ""), "sysroot")
@@ -277,6 +274,13 @@ def build_one_stage(
                     f"-DLLVM_WINSYSROOT={os.environ['VSINSTALLDIR']}",
                     "-DLLVM_DISABLE_ASSEMBLY_FILES=ON",
                 ]
+            if is_final_stage:
+                fetches = os.environ["MOZ_FETCHES_DIR"]
+                cmake_args += [
+                    "-DLIBXML2_DEFINITIONS=-DLIBXML_STATIC",
+                    f"-DLIBXML2_INCLUDE_DIR={fetches}/libxml2/include/libxml2",
+                    f"-DLIBXML2_LIBRARIES={fetches}/libxml2/lib/libxml2s.lib",
+                ]
         else:
             # libllvm as a shared library is not supported on Windows
             cmake_args += ["-DLLVM_LINK_LLVM_DYLIB=ON"]
diff --git a/build/build-clang/clang-17.json b/build/build-clang/clang-17.json
index 960c7c6754..1e941aac77 100644
--- a/build/build-clang/clang-17.json
+++ b/build/build-clang/clang-17.json
@@ -11,6 +11,7 @@
         "revert-llvmorg-16-init-11301-g163bb6d64e5f_clang_17.patch",
         "revert-llvmorg-15-init-13446-g7524fe962e47.patch",
         "revert-llvmorg-15-init-11205-gcead4eceb01b_clang_16.patch",
+        "llvmorg-18-init-8471-g160e8eb44961.patch",
         "D146664.patch",
         "win64-ret-null-on-commitment-limit_clang_14.patch",
         "compiler-rt-rss-limit-heap-profile.patch"
diff --git a/build/build-clang/llvmorg-18-init-8471-g160e8eb44961.patch b/build/build-clang/llvmorg-18-init-8471-g160e8eb44961.patch
new file mode 100644
index 0000000000..fcd170919c
--- /dev/null
+++ b/build/build-clang/llvmorg-18-init-8471-g160e8eb44961.patch
@@ -0,0 +1,31 @@
+From 160e8eb4496104a1d0ed77649af7e8bb679252f9 Mon Sep 17 00:00:00 2001
+From: nicole mazzuca <nicole@strega-nil.co>
+Date: Fri, 13 Oct 2023 08:47:23 -0700
+Subject: [PATCH] [ASan] Recognize lea r10, [rip + XX] (#68910)
+
+This instruction is present in memcpy in the latest vcruntime
+
+This PR has been opened for @AndrewDeanMS (a teammate inside Microsoft)
+who made the PR to our internal branch.
+
+Co-authored-by: Andrew Dean <Andrew.Dean@microsoft.com>
+---
+ compiler-rt/lib/interception/interception_win.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compiler-rt/lib/interception/interception_win.cpp b/compiler-rt/lib/interception/interception_win.cpp
+index d57afa3fda7b..1b681ada37b1 100644
+--- a/compiler-rt/lib/interception/interception_win.cpp
++++ b/compiler-rt/lib/interception/interception_win.cpp
+@@ -624,7 +624,7 @@ static size_t GetInstructionSize(uptr address, size_t* rel_offset = nullptr) {
+                       //   mov rax, QWORD PTR [rip + XXXXXXXX]
+     case 0x25ff48:    // 48 ff 25 XX XX XX XX :
+                       //   rex.W jmp QWORD PTR [rip + XXXXXXXX]
+-
++    case 0x158D4C:    // 4c 8d 15 XX XX XX XX : lea r10, [rip + XX]
+       // Instructions having offset relative to 'rip' need offset adjustment.
+       if (rel_offset)
+         *rel_offset = 3;
+-- 
+2.44.0.1.g9765aa7075
+
diff --git a/build/docs/snap.rst b/build/docs/snap.rst
index 6ff52da4e8..3958b32166 100644
--- a/build/docs/snap.rst
+++ b/build/docs/snap.rst
@@ -130,3 +130,12 @@ So pushing to try is basically just:
 Because of the build process, a full opt build will take around 1h45-2h while a
 debug build will be around 60 minutes, the difference coming from the use of
 PGO on opt builds.
+
+If you need to reuse a package from the Snap Store or from the latest
+mozilla-central or a specific successful build, you can use ``USE_SNAP_FROM_STORE_OR_MC`` en
+variable ; setting it to ``store`` will download from the Snap Store (warning:
+no debug builds on the Snap Store, so whatever ``debug`` variants we have will
+be an ``opt`` build in fact), and setting to a TaskCluster index value will
+download from the index. Set it to ``latest`` if you want latest, or explore
+the TaskCluster index for others. Any ``try`` will be pulled from latest
+``nightly`` while others will be fetched from their respective branches.
diff --git a/build/gyp_includes/common.gypi b/build/gyp_includes/common.gypi
index 457059e446..8acb326278 100644
--- a/build/gyp_includes/common.gypi
+++ b/build/gyp_includes/common.gypi
@@ -979,7 +979,7 @@
         # The Mac SDK is set for iOS builds and passed through to Mac
         # sub-builds. This allows the Mac sub-build SDK in an iOS build to be
         # overridden from the command line the same way it is for a Mac build.
-        'mac_sdk%': '<!(<(PYTHON) <(DEPTH)/build/mac/find_sdk.py 10.6)',
+        'mac_sdk%': '',
 
         # iOS SDK and deployment target support.  The iOS 5.0 SDK is actually
         # what is required, but the value is left blank so when it is set in
diff --git a/build/mach_initialize.py b/build/mach_initialize.py
index 3914314a2b..c0a4e515a8 100644
--- a/build/mach_initialize.py
+++ b/build/mach_initialize.py
@@ -315,9 +315,25 @@ def initialize(topsrcdir, args=()):
     )
     from argparse import Namespace
 
+    from mach.main import (
+        SUGGESTED_COMMANDS_MESSAGE,
+        UNKNOWN_COMMAND_ERROR,
+        UnknownCommandError,
+    )
+
     namespace_in = Namespace()
     setattr(namespace_in, "mach_command_aliases", aliases)
-    namespace = parser.parse_args(args, namespace_in)
+
+    try:
+        namespace = parser.parse_args(args, namespace_in)
+    except UnknownCommandError as e:
+        suggestion_message = (
+            SUGGESTED_COMMANDS_MESSAGE % (e.verb, ", ".join(e.suggested_commands))
+            if e.suggested_commands
+            else ""
+        )
+        print(UNKNOWN_COMMAND_ERROR % (e.verb, e.command, suggestion_message))
+        sys.exit(1)
 
     command_name = getattr(namespace, "command_name", None)
     site_name = getattr(namespace, "site_name", "common")
diff --git a/build/macosx/xcrun b/build/macosx/xcrun
new file mode 100755
index 0000000000..52edb12d7b
--- /dev/null
+++ b/build/macosx/xcrun
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+case "$*" in
+"--show-sdk-path --sdk iphoneos"|"--show-sdk-path -sdk iphoneos"|"--show-sdk-path --sdk iphonesimulator"|"--show-sdk-path -sdk iphonesimulator")
+    ;;
+*)
+    echo We only expect this to be executed by third_party/rust/cc/src/lib.rs or rustc when targetting iOS >&2
+    exit 1
+esac
+echo $IPHONEOS_SDK_DIR
diff --git a/build/moz.configure/android-ndk.configure b/build/moz.configure/android-ndk.configure
index c19023a1ea..dd09142e4b 100644
--- a/build/moz.configure/android-ndk.configure
+++ b/build/moz.configure/android-ndk.configure
@@ -184,7 +184,7 @@ def android_lldb_server(target, host, ndk, lldb):
     if lldb:
         return lldb[0]
     else:
-        clang_format = "toolchains/llvm/prebuilt/%s-%s/lib64/clang"
+        clang_format = "toolchains/llvm/prebuilt/%s-%s/lib/clang"
         llvm_lib = "lib/linux"
 
         host_kernel = "windows" if host.kernel == "WINNT" else host.kernel.lower()
@@ -196,12 +196,21 @@ def android_lldb_server(target, host, ndk, lldb):
             x for x in listdir(clang_path) if isdir(os.path.join(clang_path, x))
         ]
         log.debug("Got %r" % clang_subdirs)
-        if len(clang_subdirs) != 1:
+        if len(clang_subdirs) == 0:
             die(
                 "Could not resolve lldb-server in %s. Please specify --with-android-lldb-server=/path/to/android/lldb-server"
                 % quote(clang_path)
             )
-        log.debug("Found version %s" % quote(clang_subdirs[0]))
+        sorted_versions = sorted(clang_subdirs, key=Version)
+        highest_version = sorted_versions[-1]
+        log.warning("Using highest version available: %s" % quote(highest_version))
+        log.warning(
+            " Available versions: "
+            + ", ".join(str(version) for version in sorted_versions)
+        )
+        log.warning(
+            "(To use an older version, please specify --with-android-lldb-server=/path/to/desired/android/lldb-server)"
+        )
 
         if target.cpu == "x86":
             target_cpu = "i386"
@@ -209,7 +218,7 @@ def android_lldb_server(target, host, ndk, lldb):
             target_cpu = target.cpu
 
         full_path = os.path.join(
-            clang_path, clang_subdirs[0], llvm_lib, target_cpu, "lldb-server"
+            clang_path, highest_version, llvm_lib, target_cpu, "lldb-server"
         )
         log.debug("Trying %s" % quote(full_path))
 
diff --git a/build/moz.configure/bootstrap.configure b/build/moz.configure/bootstrap.configure
index daaff7cdaa..d8deddbb9e 100644
--- a/build/moz.configure/bootstrap.configure
+++ b/build/moz.configure/bootstrap.configure
@@ -36,10 +36,12 @@ option(
 
 
 @depends_if("--enable-bootstrap")
-def enable_bootstrap(bootstrap):
+def want_bootstrap(bootstrap):
     include = set()
     exclude = set()
     for item in bootstrap:
+        if item == "no-update":
+            continue
         if item.startswith("-"):
             exclude.add(item.lstrip("-"))
         else:
@@ -55,34 +57,6 @@ def enable_bootstrap(bootstrap):
     return match
 
 
-@depends(developer_options, "--enable-bootstrap", moz_fetches_dir)
-def bootstrap_search_path_order(developer_options, bootstrap, moz_fetches_dir):
-    if moz_fetches_dir:
-        log.debug("Prioritizing MOZ_FETCHES_DIR in toolchain path.")
-        return "prepend"
-
-    if bootstrap:
-        log.debug(
-            "Prioritizing mozbuild state dir in toolchain paths because "
-            "bootstrap mode is enabled."
-        )
-        return "maybe-prepend"
-
-    if developer_options:
-        log.debug(
-            "Prioritizing mozbuild state dir in toolchain paths because "
-            "you are not building in release mode."
-        )
-        return "prepend"
-
-    log.debug(
-        "Prioritizing system over mozbuild state dir in "
-        "toolchain paths because you are building in "
-        "release mode."
-    )
-    return "append"
-
-
 toolchains_base_dir = moz_fetches_dir | mozbuild_state_path
 
 
@@ -145,7 +119,8 @@ def bootstrap_path(path, **kwargs):
         )
 
     @depends(
-        enable_bootstrap,
+        "--enable-bootstrap",
+        want_bootstrap,
         toolchains_base_dir,
         moz_fetches_dir,
         bootstrap_toolchain_tasks,
@@ -163,7 +138,8 @@ def bootstrap_path(path, **kwargs):
     @imports(_from="__builtin__", _import="open")
     @imports(_from="__builtin__", _import="Exception")
     def bootstrap_path(
-        bootstrap,
+        enable_bootstrap,
+        want_bootstrap,
         toolchains_base_dir,
         moz_fetches_dir,
         tasks,
@@ -294,20 +270,26 @@ def bootstrap_path(path, **kwargs):
             return True
 
         path = os.path.join(toolchains_base_dir, path_prefix, *path_parts)
-        if bootstrap and bootstrap(path_parts[0]):
+        if enable_bootstrap and want_bootstrap(path_parts[0]):
+            exists = os.path.exists(path)
             try:
-                if not try_bootstrap(os.path.exists(path)):
+                # With --enable-bootstrap=no-update, we don't `try_bootstrap`, except
+                # when the toolchain can't be found.
+                if (
+                    "no-update" not in enable_bootstrap or not exists
+                ) and not try_bootstrap(exists):
                     # If there aren't toolchain artifacts to use for this build,
                     # don't return a path.
                     return None
             except Exception as e:
                 log.error("%s", e)
                 die("If you can't fix the above, retry with --disable-bootstrap.")
-        # We re-test whether the path exists because it may have been created by
-        # try_bootstrap. Automation will not have gone through the bootstrap
-        # process, but we want to return the path if it exists.
-        if os.path.exists(path):
-            return path
+        if enable_bootstrap or enable_bootstrap.origin == "default":
+            # We re-test whether the path exists because it may have been created by
+            # try_bootstrap. Automation will not have gone through the bootstrap
+            # process, but we want to return the path if it exists.
+            if os.path.exists(path):
+                return path
 
     return bootstrap_path
 
@@ -315,27 +297,15 @@ def bootstrap_path(path, **kwargs):
 @template
 def bootstrap_search_path(path, paths=original_path, **kwargs):
     @depends(
-        enable_bootstrap,
-        dependable(path),
         bootstrap_path(path, **kwargs),
-        bootstrap_search_path_order,
         paths,
         original_path,
     )
-    def bootstrap_search_path(
-        bootstrap, path, bootstrap_path, order, paths, original_path
-    ):
+    def bootstrap_search_path(path, paths, original_path):
         if paths is None:
             paths = original_path
-        if not bootstrap_path:
+        if not path:
             return paths
-        if order == "maybe-prepend":
-            if bootstrap(path.split("/")[0]):
-                order = "prepend"
-            else:
-                order = "append"
-        if order == "prepend":
-            return [bootstrap_path] + paths
-        return paths + [bootstrap_path]
+        return [path] + paths
 
     return bootstrap_search_path
diff --git a/build/moz.configure/compile-checks.configure b/build/moz.configure/compile-checks.configure
index a639a012f1..1dddc684da 100644
--- a/build/moz.configure/compile-checks.configure
+++ b/build/moz.configure/compile-checks.configure
@@ -436,6 +436,24 @@ def check_and_add_linker_flag(flag, compiler=None, when=None, check=True):
     )
 
 
+# Like the compilation checks above, but for linker optimization flags.
+@dependable
+def linker_optimize_flags():
+    return namespace(ldflags=[])
+
+
+@template
+def check_and_add_linker_optimize_flag(flag, compiler=None, when=None, check=True):
+    return check_and_add_flags(
+        flag,
+        linker_optimize_flags,
+        [flag],
+        when=when,
+        check=check,
+        mode="link",
+    )
+
+
 # Add the given flag to the list of linker flags for the build.
 # - `flag` is the flag (e.g. -fno-sized-deallocation)
 # - `when` (optional) is a @depends function or option name conditioning
diff --git a/build/moz.configure/flags.configure b/build/moz.configure/flags.configure
index 8354b9af34..d07d31f713 100644
--- a/build/moz.configure/flags.configure
+++ b/build/moz.configure/flags.configure
@@ -145,42 +145,43 @@ def file_prefix_map_flags(path_remapping, path_remappings, compiler):
 set_config("MOZ_FILE_PREFIX_MAP_FLAGS", file_prefix_map_flags)
 
 
-@depends(c_compiler)
-def is_gcc(c_compiler):
-    return c_compiler.type == "gcc"
-
-
-@depends(c_compiler)
-def is_gnu_cc(c_compiler):
-    return c_compiler.type != "clang-cl"
-
-
-@depends(developer_options, when=is_gnu_cc)
+@depends(developer_options, when=building_with_gnu_cc)
 def check_build_id_uuid(developer_options):
     return developer_options
 
 
-@depends(developer_options, when=is_gnu_cc)
+@depends(developer_options, when=building_with_gnu_cc)
 def check_build_id_sha1(developer_options):
     return not developer_options
 
 
-check_and_add_flag("-pipe", when=is_gcc)
+check_and_add_flag("-pipe", when=building_with_gcc)
 
 check_and_add_linker_flag("-Wl,--build-id=uuid", when=check_build_id_uuid)
 check_and_add_linker_flag("-Wl,--build-id=sha1", when=check_build_id_sha1)
 
-check_and_add_asm_flag("-Wa,--noexecstack", when=is_gnu_cc)
-check_and_add_linker_flag("-Wl,-z,noexecstack", when=is_gnu_cc)
-check_and_add_linker_flag("-Wl,-z,text", when=is_gnu_cc)
-check_and_add_linker_flag("-Wl,-z,relro", when=is_gnu_cc)
-check_and_add_linker_flag("-Wl,-z,now", when=is_gnu_cc)
-check_and_add_linker_flag("-Wl,-z,nocopyreloc", when=is_gnu_cc)
+check_and_add_asm_flag("-Wa,--noexecstack", when=building_with_gnu_cc)
+check_and_add_linker_flag("-Wl,-z,noexecstack", when=building_with_gnu_cc)
+check_and_add_linker_flag("-Wl,-z,text", when=building_with_gnu_cc)
+check_and_add_linker_flag("-Wl,-z,relro", when=building_with_gnu_cc)
+check_and_add_linker_flag("-Wl,-z,now", when=building_with_gnu_cc)
+check_and_add_linker_flag("-Wl,-z,nocopyreloc", when=building_with_gnu_cc)
 
+check_and_add_linker_optimize_flag("-Wl,-dead_strip", when=target_is_darwin & ~dtrace)
 
-@depends("--enable-address-sanitizer", is_gnu_cc)
-def check_Bsymbolic(enable_asan, is_gnu_cc):
-    return enable_asan and is_gnu_cc
+have_linker_support_ignore_unresolved = try_link(
+    flags=["-Wl,--ignore-unresolved-symbol,environ"],
+    check_msg="for --ignore-unresolved-symbol option to the linker",
+    when=building_with_gnu_cc & gcc_use_gnu_ld,
+)
+add_old_configure_assignment(
+    "HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED", have_linker_support_ignore_unresolved
+)
+
+
+@depends("--enable-address-sanitizer", building_with_gnu_cc)
+def check_Bsymbolic(enable_asan, building_with_gnu_cc):
+    return enable_asan and building_with_gnu_cc
 
 
 # ASan assumes no symbols are being interposed, and when that happens,
@@ -195,4 +196,7 @@ check_and_add_linker_flag("-Wl,-Bsymbolic", when=check_Bsymbolic)
 add_old_configure_assignment("_COMPILATION_ASFLAGS", asm_flags.asflags)
 add_old_configure_assignment("_COMPILATION_HOST_ASFLAGS", asm_flags.host_asflags)
 add_old_configure_assignment("_COMPILATION_LDFLAGS", linker_flags.ldflags)
+add_old_configure_assignment(
+    "_COMPILATION_OPTIMIZE_LDFLAGS", linker_optimize_flags.ldflags
+)
 add_old_configure_assignment("_COMPILATION_HOST_LDFLAGS", linker_flags.host_ldflags)
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 11e22ee536..87120573a0 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -525,6 +525,16 @@ def split_triplet(triplet, allow_wasi=False):
     elif os.startswith("darwin"):
         canonical_kernel = "Darwin"
         canonical_os = "OSX"
+    elif os.startswith("ios"):
+        canonical_kernel = "Darwin"
+        canonical_os = "iOS"
+        # old-configure does plenty of tests against $target and $target_os
+        # and expects darwin for iOS, so make it happy.
+        sub_configure_alias = sub_configure_alias[: -len(os)] + "darwin"
+        # rust knows ios-sim, clang knows ios-simulator. We only take the
+        # former as --target, but we need to make clang happy.
+        if os == "ios-sim":
+            os = "ios-simulator"
     elif os.startswith("dragonfly"):
         canonical_os = canonical_kernel = "DragonFly"
     elif os.startswith("freebsd"):
@@ -603,7 +613,7 @@ def split_triplet(triplet, allow_wasi=False):
     # prefixes. We need to be more specific about the LLVM target on Mac
     # so cross-language LTO will work correctly.
 
-    if os.startswith("darwin"):
+    if os.startswith(("darwin", "ios")):
         toolchain = "%s-apple-%s" % (cpu, os)
     else:
         toolchain = "%s-%s" % (cpu, os)
@@ -647,12 +657,13 @@ def help_host_target(help, host, target):
 
 def config_sub(shell, triplet):
     config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub")
-    # Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so
+    # Config.sub doesn't like the *-windows-msvc/*-windows-gnu/*-ios-sim triplets, so
     # munge those before and after calling config.sub.
     suffix = None
     munging = {
         "-windows-msvc": "-mingw32",
         "-windows-gnu": "-mingw32",
+        "-ios-sim": "-ios",
     }
     for check_suffix, replacement in munging.items():
         if triplet.endswith(check_suffix):
@@ -734,6 +745,8 @@ def real_target(value, host, shell, project, application):
                 else ("arm", "androideabi")
             )
             return split_triplet(f"{target_cpu}-unknown-linux-{target_system}")
+        if project == "mobile/ios":
+            return split_triplet("aarch64-apple-ios")
         return host
     # If --target was only given a cpu arch, expand it with the
     # non-cpu part of the host. For mobile/android, expand it with
@@ -744,6 +757,8 @@ def real_target(value, host, shell, project, application):
             rest = "unknown-linux-android"
             if target.startswith("arm"):
                 rest += "eabi"
+        elif project == "mobile/ios":
+            rest = "apple-ios"
         else:
             cpu, rest = host.alias.split("-", 1)
         target = "-".join((target, rest))
@@ -832,6 +847,7 @@ add_old_configure_assignment("TARGET_CPU", target.cpu)
 set_config("TARGET_RAW_CPU", target.raw_cpu)
 set_config("TARGET_OS", target.os)
 set_config("TARGET_RAW_OS", target.raw_os)
+set_config("TARGET_KERNEL", target.kernel)
 set_config("TARGET_ENDIANNESS", target.endianness)
 
 
@@ -903,6 +919,15 @@ set_define("XP_MACOSX", target_is_osx)
 
 
 @depends(target)
+def target_is_ios(target):
+    if target.kernel == "Darwin" and target.os == "iOS":
+        return True
+
+
+set_define("XP_IOS", target_is_ios)
+
+
+@depends(target)
 def target_has_linux_kernel(target):
     if target.kernel == "Linux":
         return True
diff --git a/build/moz.configure/libraries.configure b/build/moz.configure/libraries.configure
new file mode 100644
index 0000000000..cac37e0ae5
--- /dev/null
+++ b/build/moz.configure/libraries.configure
@@ -0,0 +1,55 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+@template
+def check_clock_monotonic_support(lib=None, when=None):
+    check_msg = "for clock_gettime(CLOCK_MONOTONIC)"
+    flags = []
+
+    if lib is not None:
+        check_msg += f" in {lib}"
+        flags.append(f"-l{lib}")
+
+    check_when = building_with_gnu_cc
+    if when is not None:
+        check_when &= when
+
+    return try_link(
+        includes=["time.h"],
+        body="struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);",
+        check_msg=check_msg,
+        flags=flags,
+        when=check_when,
+    )
+
+
+have_raw_clock_monotonic_support = check_clock_monotonic_support()
+have_rt_clock_monotonic_support = check_clock_monotonic_support(
+    lib="rt", when=~have_raw_clock_monotonic_support
+)
+
+set_define(
+    "HAVE_CLOCK_MONOTONIC",
+    have_raw_clock_monotonic_support | have_rt_clock_monotonic_support,
+)
+set_config(
+    "HAVE_CLOCK_MONOTONIC",
+    have_raw_clock_monotonic_support | have_rt_clock_monotonic_support,
+)
+
+set_config("REALTIME_LIBS", ["-lrt"], when=have_rt_clock_monotonic_support)
+
+
+have_res_ninit = try_link(
+    includes=["sys/types.h", "netinet/in.h", "arpa/nameser.h", "resolv.h"],
+    body="int foo = res_ninit(&_res);",
+    check_msg="for res_ninit()",
+    flags=depends(when=building_linux)(["-D_BSD_SOURCE=1"]),
+    when=building_with_gnu_cc & ~target_is_netbsd & ~target_is_openbsd,
+)
+
+set_define("HAVE_RES_NINIT", have_res_ninit)
diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure
index ab6a527fe4..5048b367e2 100644
--- a/build/moz.configure/lto-pgo.configure
+++ b/build/moz.configure/lto-pgo.configure
@@ -148,7 +148,10 @@ def pgo_flags(
         use_ldflags = []
         if orderfile:
             if compiler.type == "clang-cl":
-                use_ldflags += ["-ORDER:@" + orderfile]
+                use_ldflags += [
+                    "-ORDER:@" + orderfile,
+                    "/ignore:4037",  # Disable warn missing order symbol
+                ]
             elif linker.KIND == "ld64" or (linker.KIND == "lld" and target.os == "OSX"):
                 use_ldflags += ["-Wl,-order_file", orderfile]
             elif linker.KIND == "lld":
@@ -316,7 +319,6 @@ def lto(
 
     if (
         target.kernel == "Darwin"
-        and target.os == "OSX"
         and "cross" in values
         and select_linker.KIND == "ld64"
         and not ld64_known_good
@@ -392,7 +394,7 @@ def lto(
     # (For hot functions, PGO will put a multiplier on this limit.)
     if target.os == "WINNT":
         ldflags.append("-mllvm:-import-instr-limit=10")
-    elif target.os == "OSX":
+    elif target.kernel == "Darwin":
         ldflags.append("-Wl,-mllvm,-import-instr-limit=10")
     elif c_compiler.type == "clang":
         ldflags.append("-Wl,-plugin-opt=-import-instr-limit=10")
@@ -406,7 +408,7 @@ def lto(
                 ldflags.append("-opt:ltonewpassmanager")
             if c_compiler.version >= "12.0.0":
                 ldflags.append("-mllvm:-import-hot-multiplier=30")
-        elif target.os == "OSX":
+        elif target.kernel == "Darwin":
             ldflags.append("-Wl,-mllvm,-import-hot-multiplier=30")
         else:
             if c_compiler.version < "13.0.0":
diff --git a/build/moz.configure/memory.configure b/build/moz.configure/memory.configure
index 4368ad8c86..477c9c58a4 100644
--- a/build/moz.configure/memory.configure
+++ b/build/moz.configure/memory.configure
@@ -25,6 +25,14 @@ set_define("MOZ_MEMORY", True, when="--enable-jemalloc")
 add_old_configure_assignment("MOZ_MEMORY", True, when="--enable-jemalloc")
 
 
+@depends("--enable-jemalloc", moz_debug, win32_redist_dir)
+def check_redist(jemalloc, debug, win32_redist_dir):
+    if not jemalloc and not win32_redist_dir and not debug:
+        log.warning(
+            "When not building jemalloc, you need to build with --with-redist or set WIN32_REDIST_DIR."
+        )
+
+
 @depends(milestone, build_project)
 def replace_malloc_default(milestone, build_project):
     if build_project == "memory":
@@ -63,16 +71,27 @@ set_config("MOZ_REPLACE_MALLOC_STATIC", replace_malloc_static)
 # crash reporter.
 @depends(
     build_project,
+    milestone,
     target,
     when="--enable-jemalloc",
 )
-def phc_default(build_project, target):
+def phc_default(build_project, milestone, target):
     if build_project == "js":
         return False
 
+    # PHC has a performance bottleneck on aarch64 (Bug 1874022) it's okay
+    # for nightly but not for release yet.  To support unified builds on
+    # MacOS the x86_64 and aarch64 builds must match, so we disable PHC for
+    # x86_64 on MacOS late beta and release.
+    cpu_support = ("x86_64",)
+    if milestone.is_early_beta_or_earlier:
+        cpu_support = ("x86_64", "aarch64")
+    elif target.os == "OSX":
+        cpu_support = ()
+
     # Both Linux32 and Win32 have frequent crashes when stack tracing (for
     # unclear reasons), so PHC is enabled only on 64-bit only in both cases.
-    return (target.cpu in ("x86_64", "aarch64")) and (
+    return (target.cpu in cpu_support) and (
         (target.os == "GNU" and target.kernel == "Linux")
         or (target.kernel == "WINNT")
         or (target.os == "OSX")
diff --git a/build/moz.configure/nss.configure b/build/moz.configure/nss.configure
index 9e4802774a..2765a6502d 100644
--- a/build/moz.configure/nss.configure
+++ b/build/moz.configure/nss.configure
@@ -9,7 +9,7 @@ system_lib_option("--with-system-nss", help="Use system NSS")
 imply_option("--with-system-nspr", True, when="--with-system-nss")
 
 nss_pkg = pkg_check_modules(
-    "NSS", "nss >= 3.98", when="--with-system-nss", config=False
+    "NSS", "nss >= 3.99", when="--with-system-nss", config=False
 )
 
 set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")
diff --git a/build/moz.configure/pkg.configure b/build/moz.configure/pkg.configure
index 6beed205f1..44ef101ab0 100644
--- a/build/moz.configure/pkg.configure
+++ b/build/moz.configure/pkg.configure
@@ -16,7 +16,7 @@ pkg_config = check_prog(
     bootstrap=depends(when=target_sysroot.bootstrapped)(lambda: "pkgconf"),
     allow_missing=True,
     when=compile_environment
-    & depends(target.os)(lambda os: os not in ("WINNT", "OSX", "Android")),
+    & depends(target.os)(lambda os: os not in ("WINNT", "OSX", "iOS", "Android")),
 )
 
 
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index a8ab8bd698..5ab79daf24 100644
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -71,6 +71,24 @@ with only_when(target_is_osx):
         return value[0]
 
 
+@imports("plistlib")
+@imports(_from="__builtin__", _import="open")
+@imports(_from="__builtin__", _import="Exception")
+def get_sdk_version(sdk):
+    with open(os.path.join(sdk, "SDKSettings.plist"), "rb") as plist:
+        obj = plistlib.load(plist)
+    if not obj:
+        raise Exception(
+            "Error parsing SDKSettings.plist in the SDK directory: %s" % sdk
+        )
+    if "Version" not in obj:
+        raise Exception(
+            "Error finding Version information in SDKSettings.plist from the SDK: %s"
+            % sdk
+        )
+    return Version(obj["Version"])
+
+
 with only_when(host_is_osx | target_is_osx):
     # MacOS SDK
     # =========
@@ -81,31 +99,14 @@ with only_when(host_is_osx | target_is_osx):
         help="Location of platform SDK to use",
     )
 
-    @imports("plistlib")
-    @imports(_from="__builtin__", _import="open")
-    @imports(_from="__builtin__", _import="Exception")
-    def get_sdk_version(sdk):
-        with open(os.path.join(sdk, "SDKSettings.plist"), "rb") as plist:
-            obj = plistlib.load(plist)
-        if not obj:
-            raise Exception(
-                "Error parsing SDKSettings.plist in the SDK directory: %s" % sdk
-            )
-        if "Version" not in obj:
-            raise Exception(
-                "Error finding Version information in SDKSettings.plist from the SDK: %s"
-                % sdk
-            )
-        return Version(obj["Version"])
-
-    def sdk_min_version():
+    def mac_sdk_min_version():
         return "14.2"
 
     @depends(
         "--with-macos-sdk",
         host,
         bootstrap_path(
-            "MacOSX{}.sdk".format(sdk_min_version()),
+            "MacOSX{}.sdk".format(mac_sdk_min_version()),
             when=depends("--with-macos-sdk")(lambda x: not x),
             allow_failure=True,
         ),
@@ -155,10 +156,10 @@ with only_when(host_is_osx | target_is_osx):
                 "tools are selected during the Xcode/Developer Tools installation."
                 % sdk
             )
-        if version < Version(sdk_min_version()):
+        if version < Version(mac_sdk_min_version()):
             die(
                 'SDK version "%s" is too old. Please upgrade to at least %s. Try '
-                "updating your system Xcode." % (version, sdk_min_version())
+                "updating your system Xcode." % (version, mac_sdk_min_version())
             )
         return sdk
 
@@ -195,6 +196,105 @@ with only_when(target_is_osx):
     set_config("MACOS_PRIVATE_FRAMEWORKS_DIR", macos_private_frameworks)
 
 
+with only_when(target_is_ios):
+    # iOS deployment target version
+    # ==============================================================
+    # This needs to happen before any compilation test is done.
+
+    option(
+        "--enable-ios-target",
+        env="IPHONEOS_DEPLOYMENT_TARGET",
+        nargs=1,
+        default="17.4",
+        help="Set the minimum iOS version needed at runtime",
+    )
+
+    @depends_if("--enable-ios-target")
+    def ios_target(value):
+        return value[0]
+
+
+with only_when(target_is_ios):
+    # MacOS SDK
+    # =========
+    option(
+        "--with-ios-sdk",
+        env="IPHONEOS_SDK_DIR",
+        nargs=1,
+        help="Location of platform SDK to use",
+    )
+
+    def ios_sdk_min_version():
+        return "17.4"
+
+    @depends(target)
+    def ios_sdk_name(target):
+        return "iPhone{}{}.sdk".format(
+            "Simulator" if target.raw_os == "ios-sim" else "OS",
+            ios_sdk_min_version(),
+        )
+
+    @depends(
+        "--with-ios-sdk",
+        host,
+        target,
+        bootstrap_path(ios_sdk_name, when=depends("--with-ios-sdk")(lambda x: not x)),
+    )
+    @imports(_from="__builtin__", _import="Exception")
+    @imports(_from="os.path", _import="isdir")
+    @imports(_from="os", _import="listdir")
+    def ios_sdk(sdk, host, target, bootstrapped):
+        if bootstrapped:
+            sdk = [bootstrapped]
+        if sdk:
+            sdk = sdk[0]
+            try:
+                version = get_sdk_version(sdk)
+            except Exception as e:
+                die(e)
+        elif host.os == "OSX":
+            sdk_name = "iphonesimulator" if target.raw_os == "ios-sim" else "iphoneos"
+            sdk = check_cmd_output(
+                "xcrun", "--show-sdk-path", "--sdk", sdk_name, onerror=lambda: ""
+            ).rstrip()
+            if not sdk:
+                die(
+                    "Could not find the iOS SDK. Please use --with-ios-sdk to give "
+                    "the path to a iOS SDK."
+                )
+            # Scan the parent directory xcrun returns for the most recent SDK.
+            sdk_dir = os.path.dirname(sdk)
+            versions = []
+            for d in listdir(sdk_dir):
+                if d.lower().startswith(sdk_name):
+                    try:
+                        sdk = os.path.join(sdk_dir, d)
+                        versions.append((get_sdk_version(sdk), sdk))
+                    except Exception:
+                        pass
+            version, sdk = max(versions)
+        else:
+            die(
+                "Need an iOS SDK when targeting iOS. Please use --with-ios-sdk "
+                "to give the path to a iOS SDK."
+            )
+
+        if not isdir(sdk):
+            die(
+                "SDK not found in %s. When using --with-ios-sdk, you must specify a "
+                "valid SDK. SDKs are installed when the optional cross-development "
+                "tools are selected during the Xcode installation." % sdk
+            )
+        if version < Version(ios_sdk_min_version()):
+            die(
+                'SDK version "%s" is too old. Please upgrade to at least %s. Try '
+                "updating your system Xcode." % (version, ios_sdk_min_version())
+            )
+        return sdk
+
+    set_config("IPHONEOS_SDK_DIR", ios_sdk)
+
+
 # GC rooting and hazard analysis.
 # ==============================================================
 option(env="MOZ_HAZARD", help="Build for the GC rooting hazard analysis")
@@ -467,7 +567,11 @@ def check_compiler(configure_cache, compiler, language, target, android_version)
             if "--target=arm64-apple-darwin" not in compiler:
                 flags.append("--target=arm64-apple-darwin")
             has_target = True
-
+        elif target.os == "iOS":
+            target_flag = "--target=%s" % toolchain
+            if target_flag not in compiler:
+                flags.append(target_flag)
+            has_target = True
         elif (
             not info.kernel
             or info.kernel != target.kernel
@@ -673,14 +777,6 @@ def vc_compiler_version(vc_compiler_path):
 
 
 @depends_if(vc_compiler_version)
-def is_vs2019_or_more(vc_compiler_version):
-    return vc_compiler_version >= Version("19.20")
-
-
-add_old_configure_assignment("IS_VS2019_OR_MORE", is_vs2019_or_more)
-
-
-@depends_if(vc_compiler_version)
 def msvs_version(vc_compiler_version):
     # clang-cl emulates the same version scheme as cl. And MSVS_VERSION needs to
     # be set for GYP on Windows.
@@ -688,8 +784,7 @@ def msvs_version(vc_compiler_version):
         return "2022"
     if vc_compiler_version >= Version("19.20"):
         return "2019"
-    if vc_compiler_version >= Version("19.10"):
-        return "2017"
+    configure_error("Only Visual Studio 2019 or newer are supported")
 
     return ""
 
@@ -702,12 +797,11 @@ clang_search_path = bootstrap_search_path("clang/bin")
 
 @depends(
     bootstrap_search_path("rustc/bin", when="MOZ_AUTOMATION"),
-    bootstrap_search_path_order,
     original_path,
 )
 @imports("os")
 @imports(_from="os", _import="environ")
-def rust_search_path(rust_path, search_order, original_path):
+def rust_search_path(rust_path, original_path):
     result = list(rust_path or original_path)
     # Also add the rustup install directory for cargo/rustc.
     cargo_home = environ.get("CARGO_HOME", "")
@@ -716,10 +810,7 @@ def rust_search_path(rust_path, search_order, original_path):
     else:
         cargo_home = os.path.expanduser(os.path.join("~", ".cargo"))
     rustup_path = os.path.join(cargo_home, "bin")
-    if search_order == "prepend":
-        result.insert(0, rustup_path)
-    else:
-        result.append(rustup_path)
+    result.insert(0, rustup_path)
     return result
 
 
@@ -1078,18 +1169,21 @@ def sysroot(host_or_target, target_sysroot=None):
         sysroot_input,
         host_or_target,
         macos_sdk,
+        ios_sdk,
         bootstrap_path(
             depends(host_or_target)(lambda t: "sysroot-{}".format(t.toolchain)),
             when=bootstrap_sysroot,
         ),
     )
     @imports("os")
-    def sysroot(sysroot_input, host_or_target, macos_sdk, path):
+    def sysroot(sysroot_input, host_or_target, macos_sdk, ios_sdk, path):
         version = None
         if sysroot_input:
             path = sysroot_input[0]
-        elif host_or_target.kernel == "Darwin" and macos_sdk:
+        elif host_or_target.os == "OSX" and macos_sdk:
             path = macos_sdk
+        elif host_or_target.os == "iOS" and ios_sdk:
+            path = ios_sdk
         if path:
             # Find the version of libstdc++ headears in the sysroot
             include = os.path.join(path, "usr/include/c++")
@@ -1242,6 +1336,7 @@ def compiler(
         host_or_target,
         sysroot,
         macos_target,
+        ios_target,
         android_version,
         vc_compiler_version,
         multiarch_dir,
@@ -1259,6 +1354,7 @@ def compiler(
         host_or_target,
         sysroot,
         macos_target,
+        ios_target,
         android_version,
         vc_compiler_version,
         multiarch_dir,
@@ -1289,6 +1385,8 @@ def compiler(
 
         if host_or_target.os == "OSX" and macos_target:
             flags.append("-mmacosx-version-min=%s" % macos_target)
+        if host_or_target.os == "iOS" and ios_target:
+            flags.append("-mios-version-min=%s" % ios_target)
 
         # When not given an explicit compatibility version, clang-cl tries
         # to get one from MSVC, which might not even be the one used by the
@@ -1624,6 +1722,7 @@ host_windows_abi = windows_abi(host, host_c_compiler)
 
 # Generic compiler-based conditions.
 building_with_gcc = depends(c_compiler)(lambda info: info.type == "gcc")
+building_with_gnu_cc = depends(c_compiler)(lambda info: info.type != "clang-cl")
 
 
 @depends(cxx_compiler, ccache_prefix)
@@ -2212,6 +2311,38 @@ set_config("WRAP_SYSTEM_INCLUDES", wrap_system_includes)
 set_config("VISIBILITY_FLAGS", visibility_flags)
 
 
+# try harder, when checking for __thread support, see bug 521750 comment #33 and below
+# We pass linker_optimize_flags to the linker because if dead_strip is
+# enabled, the linker in xcode 4.1 will crash. Without this it would crash when
+# linking XUL.
+
+
+@depends(target, c_compiler)
+def check_thread(target, c_compiler):
+    if target.cpu in ("mips32", "mips64"):
+        # mips builds fail with TLS variables because of a binutils bug.
+        # See bug 528687
+        return False
+    if target.os == "Android":
+        # The custom dynamic linker doesn't support TLS variables
+        return False
+    if target.kernel == "OpenBSD":
+        # OpenBSD doesn't have TLS support, and the test succeeds with clang++
+        return False
+    return c_compiler.type != "clang-cl"
+
+
+set_define(
+    "HAVE_THREAD_TLS_KEYWORD",
+    try_link(
+        body="static __thread bool tlsIsMainThread = false; return tlsIsMainThread;",
+        flags=linker_optimize_flags.ldflags,
+        check_msg="for __thread keyword for TLS variables",
+        when=check_thread,
+    ),
+)
+
+
 @template
 def depend_cflags(host_or_target_c_compiler):
     @depends(host_or_target_c_compiler)
@@ -3257,6 +3388,16 @@ def path_remappings(target, build_env, sysroot_path, windows_sdk_dir, vc_path):
     return path_remappings
 
 
+@depends(target)
+def is_intel_target(target):
+    return target.cpu in ("x86", "x86_64")
+
+
+@depends(target)
+def is_aarch64_target(target):
+    return target.cpu == "aarch64"
+
+
 set_config("MMX_FLAGS", ["-mmmx"])
 set_config("SSE_FLAGS", ["-msse"])
 set_config("SSE2_FLAGS", ["-msse2"])
@@ -3267,7 +3408,9 @@ set_config("AVX2_FLAGS", ["-mavx2"])
 set_config(
     "AVXVNNI_FLAGS",
     ["-mavxvnni"],
-    try_compile(check_msg="for -mavxvnni support", flags=["-mavxvnni"]),
+    try_compile(
+        check_msg="for -mavxvnni support", flags=["-mavxvnni"], when=is_intel_target
+    ),
 )
 set_config(
     "AVX512BW_FLAGS",
@@ -3275,6 +3418,7 @@ set_config(
     try_compile(
         check_msg="for -mavx512bw support",
         flags=["-mavx512bw", "-mavx512f", "-mavx512dq", "-mavx512cd"],
+        when=is_intel_target,
     ),
 )
 
@@ -3286,5 +3430,30 @@ set_config(
     try_compile(
         check_msg="for -mavx512vnni support",
         flags=["-mavx512vnni", "-mavx512bw", "-mavx512f", "-mavx512dq", "-mavx512cd"],
+        when=is_intel_target,
+    ),
+)
+
+
+set_config(
+    "NEON_I8MM_FLAGS",
+    ["-march=armv8.2-a+i8mm"],
+    try_compile(
+        check_msg="for i8mm target feature",
+        flags=["-march=armv8.2-a+i8mm"],
+        when=is_aarch64_target,
     ),
 )
+
+# dtrace support
+##
+option("--enable-dtrace", help="Build with dtrace support")
+
+dtrace = check_header(
+    "sys/sdt.h",
+    when="--enable-dtrace",
+    onerror=lambda: die("dtrace enabled but sys/sdt.h not found"),
+)
+
+set_config("HAVE_DTRACE", True, when=dtrace)
+set_define("INCLUDE_MOZILLA_DTRACE", True, when=dtrace)
diff --git a/build/moz.configure/update-programs.configure b/build/moz.configure/update-programs.configure
index 3be098308d..9db6ac18e5 100644
--- a/build/moz.configure/update-programs.configure
+++ b/build/moz.configure/update-programs.configure
@@ -7,9 +7,9 @@
 
 # Updater
 # ==============================================================
-@depends(build_project)
-def updater_default(build_project):
-    return build_project != "mobile/android"
+@depends(build_project, target)
+def updater_default(build_project, target):
+    return build_project != "mobile/android" and target.os != "iOS"
 
 
 option(
diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure
index f23aa2a499..66b3a2bbfc 100644
--- a/build/moz.configure/windows.configure
+++ b/build/moz.configure/windows.configure
@@ -383,7 +383,7 @@ def lib_path_for(host_or_target):
                 compiler.compiler,
                 "/clang:--print-runtime-dir",
                 *compiler.flags,
-                onerror=lambda: None
+                onerror=lambda: None,
             ).strip()
             if runtime_dir and os.path.exists(runtime_dir):
                 # Put the clang runtime directory first, in case there is
@@ -479,3 +479,49 @@ host_link = check_prog(
 )
 
 add_old_configure_assignment("LINKER", link)
+
+option(
+    "--with-redist",
+    env="WIN32_REDIST_DIR",
+    nargs="?",
+    help="{Package|Don't package} redistributable MSVCRT",
+)
+
+
+@depends("--with-redist", "MOZ_AUTOMATION", c_compiler, vc_path, target)
+@imports("os")
+def win32_redist_dir(redist, automation, c_compiler, vc_path, target):
+    if len(redist):
+        if os.path.isdir(redist[0]):
+            return redist[0]
+        configure_error(f"Invalid Win32 Redist directory: {redist[0]}")
+    if redist or (
+        automation and redist.origin == "default" and c_compiler.type == "clang-cl"
+    ):
+        if not vc_path:
+            configure_error("Cannot ship redistributable MSVCRT without MSVC")
+        # It would be too simple if the Redist dir had the same version number as
+        # the MSVC one.
+        base_redist_path = os.path.join(
+            os.path.dirname(os.path.dirname(os.path.dirname(vc_path))), "Redist", "MSVC"
+        )
+        redist_target = {
+            "x86": "x86",
+            "x86_64": "x64",
+            "aarch64": "arm64",
+        }.get(target.cpu)
+        if redist_target and os.path.isdir(base_redist_path):
+            versions = [Version(v) for v in os.listdir(base_redist_path)]
+            redist_path = os.path.join(
+                base_redist_path,
+                str(max(v for v in versions if v.major)),
+                redist_target,
+            )
+            if os.path.isdir(redist_path):
+                crt_path = max(p for p in os.listdir(redist_path) if p.endswith("CRT"))
+                if crt_path:
+                    return os.path.join(redist_path, crt_path)
+        configure_error("Could not find redistributable MSVCRT files")
+
+
+set_config("WIN32_REDIST_DIR", win32_redist_dir)
diff --git a/build/mozconfig.clang-cl b/build/mozconfig.clang-cl
index 4ea7a59a09..68a4e90915 100644
--- a/build/mozconfig.clang-cl
+++ b/build/mozconfig.clang-cl
@@ -1,10 +1,3 @@
-if test -d "$MOZ_FETCHES_DIR/clang/bin"; then
-    CLANG_DIR=`cd "$MOZ_FETCHES_DIR/clang/bin" ; pwd`
-    export PATH="${CLANG_DIR}:${PATH}"
-fi
-
-export CC=clang-cl
-export CXX=clang-cl
 export ENABLE_CLANG_PLUGIN=1
 
 if [ -n "$UPLOAD_PATH" ]; then
diff --git a/build/mozconfig.lld-link b/build/mozconfig.lld-link
deleted file mode 100644
index 89f91930e7..0000000000
--- a/build/mozconfig.lld-link
+++ /dev/null
@@ -1,6 +0,0 @@
-if test -d "$MOZ_FETCHES_DIR/clang/bin"; then
-    CLANG_DIR=`cd "$MOZ_FETCHES_DIR/clang/bin" ; pwd`
-    export PATH="${CLANG_DIR}:${PATH}"
-fi
-
-export LINKER=lld-link
diff --git a/build/non-unified-compat b/build/non-unified-compat
index 7f9bb3e0b3..2db4a5a02c 100644
--- a/build/non-unified-compat
+++ b/build/non-unified-compat
@@ -23,7 +23,6 @@ dom/base/
 dom/battery/
 dom/bindings/
 dom/broadcastchannel/
-dom/browser-element/
 dom/cache/
 dom/canvas/
 dom/clients/
diff --git a/build/pgo/genpgocert.py b/build/pgo/genpgocert.py
index 8edaa47ba9..e844946466 100644
--- a/build/pgo/genpgocert.py
+++ b/build/pgo/genpgocert.py
@@ -20,9 +20,9 @@ from mozfile import NamedTemporaryFile, TemporaryDirectory
 from mozprofile.permissions import ServerLocations
 
 dbFiles = [
-    re.compile("^cert[0-9]+\.db$"),
-    re.compile("^key[0-9]+\.db$"),
-    re.compile("^secmod\.db$"),
+    re.compile(r"^cert[0-9]+\.db$"),
+    re.compile(r"^key[0-9]+\.db$"),
+    re.compile(r"^secmod\.db$"),
 ]
 
 
@@ -77,7 +77,7 @@ def writeCertspecForServerLocations(fd):
         i for i in iter(locations) if i.scheme == "https" and "nocert" not in i.options
     ]:
         customCertOption = False
-        customCertRE = re.compile("^cert=(?:\w+)")
+        customCertRE = re.compile(r"^cert=(?:\w+)")
         for _ in [i for i in loc.options if customCertRE.match(i)]:
             customCertOption = True
             break
diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
index 6eab7889b0..aae5e7997d 100755
--- a/build/pgo/profileserver.py
+++ b/build/pgo/profileserver.py
@@ -17,7 +17,6 @@ from mozhttpd import MozHttpd
 from mozprofile import FirefoxProfile, Preferences
 from mozprofile.permissions import ServerLocations
 from mozrunner import CLI, FirefoxRunner
-from six import string_types
 
 PORT = 8888
 
@@ -120,7 +119,7 @@ if __name__ == "__main__":
         interpolation = {"server": "%s:%d" % httpd.httpd.server_address}
         sp3_interpolation = {"server": "%s:%d" % sp3_httpd.httpd.server_address}
         for k, v in prefs.items():
-            if isinstance(v, string_types):
+            if isinstance(v, str):
                 v = v.format(**interpolation)
             prefs[k] = Preferences.cast(v)
 
diff --git a/build/rust/mozbuild/generate_buildconfig.py b/build/rust/mozbuild/generate_buildconfig.py
index 2252276319..09c32c37fd 100644
--- a/build/rust/mozbuild/generate_buildconfig.py
+++ b/build/rust/mozbuild/generate_buildconfig.py
@@ -34,6 +34,14 @@ def escape_rust_string(value):
     return '"%s"' % result
 
 
+def generate_string(buildvar, output):
+    buildconfig_var = buildconfig.substs.get(buildvar)
+    if buildconfig_var is not None:
+        output.write(
+            f"pub const {buildvar}: &str = {escape_rust_string(buildconfig_var)};\n"
+        )
+
+
 def generate(output):
     # Write out a macro which can be used within `include!`-like methods to
     # reference the topobjdir.
@@ -85,6 +93,10 @@ def generate(output):
             )
         )
 
+    # Write out some useful strings from the buildconfig.
+    generate_string("MOZ_MACBUNDLE_ID", output)
+    generate_string("MOZ_APP_NAME", output)
+
     # Finally, write out some useful booleans from the buildconfig.
     output.write(generate_bool("MOZ_FOLD_LIBS"))
     output.write(generate_bool("NIGHTLY_BUILD"))
diff --git a/build/upload_generated_sources.py b/build/upload_generated_sources.py
index 3e4b4acd59..d635ac7c2d 100644
--- a/build/upload_generated_sources.py
+++ b/build/upload_generated_sources.py
@@ -12,6 +12,7 @@ import sys
 import tarfile
 import time
 from contextlib import contextmanager
+from queue import Queue
 from threading import Event, Thread
 
 import requests
@@ -20,7 +21,6 @@ from mozbuild.generated_sources import (
     get_s3_region_and_bucket,
 )
 from requests.packages.urllib3.util.retry import Retry
-from six.moves.queue import Queue
 
 # Arbitrary, should probably measure this.
 NUM_WORKER_THREADS = 10
diff --git a/build/valgrind/mach_commands.py b/build/valgrind/mach_commands.py
index 047e489e00..e48d5af311 100644
--- a/build/valgrind/mach_commands.py
+++ b/build/valgrind/mach_commands.py
@@ -45,7 +45,6 @@ def valgrind_test(command_context, suppressions):
     from mozprofile.permissions import ServerLocations
     from mozrunner import FirefoxRunner
     from mozrunner.utils import findInPath
-    from six import string_types
     from valgrind.output_handler import OutputHandler
 
     build_dir = os.path.join(command_context.topsrcdir, "build")
@@ -75,7 +74,7 @@ def valgrind_test(command_context, suppressions):
             "server": "%s:%d" % httpd.httpd.server_address,
         }
         for k, v in prefs.items():
-            if isinstance(v, string_types):
+            if isinstance(v, str):
                 v = v.format(**interpolation)
             prefs[k] = Preferences.cast(v)
 
diff --git a/build/vs/vs2019.yaml b/build/vs/vs2019.yaml
index 5d12a66b81..7b045d0a63 100644
--- a/build/vs/vs2019.yaml
+++ b/build/vs/vs2019.yaml
@@ -53,19 +53,19 @@
 - id: Microsoft.VC.14.29.16.11.Props.ARM64
   payloads:
   - fileName: Microsoft.VC.14.29.16.11.Props.ARM64.vsix
-    sha256: 6c44879670d416a7298c860d61a3cfe2de5285164424e7036eb7d19f3a25ab93
-    size: 2266
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/6c44879670d416a7298c860d61a3cfe2de5285164424e7036eb7d19f3a25ab93/Microsoft.VC.14.29.16.11.Props.ARM64.vsix
+    sha256: 8ca384855a483c99cfbc24977f825b8a46c7397e46fc80bdfe7928fb9df7b2b1
+    size: 2264
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/8ca384855a483c99cfbc24977f825b8a46c7397e46fc80bdfe7928fb9df7b2b1/Microsoft.VC.14.29.16.11.Props.ARM64.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VC.14.29.16.11.Props
   payloads:
   - fileName: Microsoft.VC.14.29.16.11.Props.vsix
-    sha256: 96323474b850886b125f1cfe70eb6cbe256480d86f7ec38b34e39064cd395869
+    sha256: a31ba08d61dce9be1146c598023a539994e084fff9ce79c91059f24261c8ff52
     size: 3934
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/96323474b850886b125f1cfe70eb6cbe256480d86f7ec38b34e39064cd395869/Microsoft.VC.14.29.16.11.Props.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/a31ba08d61dce9be1146c598023a539994e084fff9ce79c91059f24261c8ff52/Microsoft.VC.14.29.16.11.Props.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VisualCpp.CRT.ARM64.Store
   payloads:
   - fileName: Microsoft.VisualCpp.CRT.ARM64.Store.vsix
@@ -109,11 +109,11 @@
 - id: Microsoft.VC.14.29.16.11.Servicing
   payloads:
   - fileName: Microsoft.VC.14.29.16.11.Servicing.vsix
-    sha256: 62ff045d0b9846003524f52f5cb769f0a763fd135c799b0ac3fd499c3747a58e
-    size: 2204
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/62ff045d0b9846003524f52f5cb769f0a763fd135c799b0ac3fd499c3747a58e/Microsoft.VC.14.29.16.11.Servicing.vsix
+    sha256: 897a6ae9568729d3aa452c57947abd1a3f440bbd0479dc056cdf022db52db358
+    size: 2203
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/897a6ae9568729d3aa452c57947abd1a3f440bbd0479dc056cdf022db52db358/Microsoft.VC.14.29.16.11.Servicing.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VisualCpp.CRT.Redist.ARM64
   payloads:
   - fileName: Microsoft.VisualCpp.CRT.Redist.ARM64.vsix
@@ -253,99 +253,99 @@
 - id: Microsoft.VisualCpp.Tools.HostX64.TargetARM64
   payloads:
   - fileName: Microsoft.VisualCpp.Tools.HostX64.TargetARM64.vsix
-    sha256: f84c526cf9641f3d5d6a39a8e398c2397ff1ac1c86a5a7775f1b700f8618c440
-    size: 2297
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/f84c526cf9641f3d5d6a39a8e398c2397ff1ac1c86a5a7775f1b700f8618c440/Microsoft.VisualCpp.Tools.HostX64.TargetARM64.vsix
+    sha256: d5a5b6e547c533418a9feafb47819f59fc109e27a72500269e5a2c35580bca01
+    size: 2295
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/d5a5b6e547c533418a9feafb47819f59fc109e27a72500269e5a2c35580bca01/Microsoft.VisualCpp.Tools.HostX64.TargetARM64.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VC.14.29.16.11.Tools.HostX64.TargetARM64.base
   payloads:
   - fileName: Microsoft.VC.14.29.16.11.Tools.HostX64.TargetARM64.base.vsix
-    sha256: ed76de1d4b4c48b088b6ce802e6690b7d7ea633078237e26db68fb68839b6c48
-    size: 17416238
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/ed76de1d4b4c48b088b6ce802e6690b7d7ea633078237e26db68fb68839b6c48/Microsoft.VC.14.29.16.11.Tools.HostX64.TargetARM64.base.vsix
+    sha256: 93bd6656ea617779338e8fb471ba408e77911fe31cbaa29f4fb0b04461bbeb41
+    size: 17418761
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/93bd6656ea617779338e8fb471ba408e77911fe31cbaa29f4fb0b04461bbeb41/Microsoft.VC.14.29.16.11.Tools.HostX64.TargetARM64.base.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VC.14.29.16.11.Tools.HostX64.TargetARM64.Res.base
   payloads:
   - fileName: Microsoft.VC.14.29.16.11.Tools.HostX64.TargetARM64.Res.base.enu.vsix
-    sha256: 31a0aacb7c0db031b0a6e5a1830a936a38511c7c9ea2e5723e663c5544225444
-    size: 216025
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/31a0aacb7c0db031b0a6e5a1830a936a38511c7c9ea2e5723e663c5544225444/Microsoft.VC.14.29.16.11.Tools.HostX64.TargetARM64.Res.base.enu.vsix
+    sha256: 59b147714e047301ecbb8505326127582bef8c52d1594363c1a432b0d7e78759
+    size: 216228
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/59b147714e047301ecbb8505326127582bef8c52d1594363c1a432b0d7e78759/Microsoft.VC.14.29.16.11.Tools.HostX64.TargetARM64.Res.base.enu.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VC.14.29.16.11.Servicing.Compilers
   payloads:
   - fileName: Microsoft.VC.14.29.16.11.Servicing.Compilers.vsix
-    sha256: ecc26a58b5673ed923fcd09ab585bde1ddf4336c4e3472e9b264bd2050dd710b
-    size: 2003
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/ecc26a58b5673ed923fcd09ab585bde1ddf4336c4e3472e9b264bd2050dd710b/Microsoft.VC.14.29.16.11.Servicing.Compilers.vsix
+    sha256: a062d70e94e6d101a58860babd3d33f564474146d7e169f9be2592df92357d2c
+    size: 2002
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/a062d70e94e6d101a58860babd3d33f564474146d7e169f9be2592df92357d2c/Microsoft.VC.14.29.16.11.Servicing.Compilers.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VisualCpp.Tools.HostX64.TargetX64
   payloads:
   - fileName: Microsoft.VisualCpp.Tools.HostX64.TargetX64.vsix
-    sha256: b0a42f87830e1fc5569f2ba424105e90b30d6c5cff07295d4865694fa4c8af88
+    sha256: d8f9666e360f9e9a1c26b2a46028c000a3bd9e4e1a0a65f84c99b28f85228d19
     size: 2246
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/b0a42f87830e1fc5569f2ba424105e90b30d6c5cff07295d4865694fa4c8af88/Microsoft.VisualCpp.Tools.HostX64.TargetX64.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/d8f9666e360f9e9a1c26b2a46028c000a3bd9e4e1a0a65f84c99b28f85228d19/Microsoft.VisualCpp.Tools.HostX64.TargetX64.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX64.base
   payloads:
   - fileName: Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX64.base.vsix
-    sha256: c67458a1719d10f41750f58861241acd35d31d7732fdd94616ae31a25dab6beb
-    size: 18238717
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/c67458a1719d10f41750f58861241acd35d31d7732fdd94616ae31a25dab6beb/Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX64.base.vsix
+    sha256: 5ec830c8e37747b648904010bbfeb30a5743a7ec3482fb9acfa19b143cc35593
+    size: 18239833
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/5ec830c8e37747b648904010bbfeb30a5743a7ec3482fb9acfa19b143cc35593/Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX64.base.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX64.Res.base
   payloads:
   - fileName: Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX64.Res.base.enu.vsix
-    sha256: 5f9c8fdc7a0d74f791d698d55cda886839999c09790cc5564eb49b455012d836
-    size: 215951
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/5f9c8fdc7a0d74f791d698d55cda886839999c09790cc5564eb49b455012d836/Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX64.Res.base.enu.vsix
+    sha256: 00d398c9a7d3d74b09c101b206569171178824d30348f1ad82887f67f532a7fd
+    size: 216179
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/00d398c9a7d3d74b09c101b206569171178824d30348f1ad82887f67f532a7fd/Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX64.Res.base.enu.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VC.14.29.16.11.Props.x64
   payloads:
   - fileName: Microsoft.VC.14.29.16.11.Props.x64.vsix
-    sha256: b580af879ba68e692690b167eb232fdfd5da2f320c1d2360e669765dafe44492
-    size: 2340
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/b580af879ba68e692690b167eb232fdfd5da2f320c1d2360e669765dafe44492/Microsoft.VC.14.29.16.11.Props.x64.vsix
+    sha256: 0b158506930a69d7b222fde812f90e512a49f71c9abb1078d86369fccee12340
+    size: 2338
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/0b158506930a69d7b222fde812f90e512a49f71c9abb1078d86369fccee12340/Microsoft.VC.14.29.16.11.Props.x64.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VisualCpp.Tools.HostX64.TargetX86
   payloads:
   - fileName: Microsoft.VisualCpp.Tools.HostX64.TargetX86.vsix
-    sha256: 16bc2966d85ea7bdb1f7054dfa6940e5b920b72fa3c6c3964aebe778944bf5ac
+    sha256: 2e075f7909b5b6c0368470e8202c44fa7b7f41a614a58d07b5b5d53ed9e4a8ca
     size: 2283
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/16bc2966d85ea7bdb1f7054dfa6940e5b920b72fa3c6c3964aebe778944bf5ac/Microsoft.VisualCpp.Tools.HostX64.TargetX86.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/2e075f7909b5b6c0368470e8202c44fa7b7f41a614a58d07b5b5d53ed9e4a8ca/Microsoft.VisualCpp.Tools.HostX64.TargetX86.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX86.base
   payloads:
   - fileName: Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX86.base.vsix
-    sha256: 58d29d6be41b28d2c46618cecbded76a4ea8808934cbabe9d2aedf8d90175ba3
-    size: 18170072
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/58d29d6be41b28d2c46618cecbded76a4ea8808934cbabe9d2aedf8d90175ba3/Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX86.base.vsix
+    sha256: d7598651d3b385f0e49a74d681647d73107a5b696ae7eaa36effd53ae74ba612
+    size: 18169577
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/d7598651d3b385f0e49a74d681647d73107a5b696ae7eaa36effd53ae74ba612/Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX86.base.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX86.Res.base
   payloads:
   - fileName: Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX86.Res.base.enu.vsix
-    sha256: c13649dcc13e7d3ace9626be600b267779e1868c9a0b1dbefcd063a3e884ac17
-    size: 215953
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/c13649dcc13e7d3ace9626be600b267779e1868c9a0b1dbefcd063a3e884ac17/Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX86.Res.base.enu.vsix
+    sha256: e74aeb71e56600bfdf1322b9141dd6cd24dfc4e694b0a807b5da4984e224ec1c
+    size: 216191
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/e74aeb71e56600bfdf1322b9141dd6cd24dfc4e694b0a807b5da4984e224ec1c/Microsoft.VC.14.29.16.11.Tools.HostX64.TargetX86.Res.base.enu.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VC.14.29.16.11.Props.x86
   payloads:
   - fileName: Microsoft.VC.14.29.16.11.Props.x86.vsix
-    sha256: 4e3dda156cf57917961979934a35081bd375e07353378e2c241ac33b27eb8c07
+    sha256: c44a661020f031bdd47f599e56fff377c5c789e0ed7321badd994964a637f60f
     size: 2299
-    url: https://download.visualstudio.microsoft.com/download/pr/ed573b12-f211-4911-834c-c3e3a87d7e58/4e3dda156cf57917961979934a35081bd375e07353378e2c241ac33b27eb8c07/Microsoft.VC.14.29.16.11.Props.x86.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/0fa23dc9-1336-4661-9777-652b493ca3eb/c44a661020f031bdd47f599e56fff377c5c789e0ed7321badd994964a637f60f/Microsoft.VC.14.29.16.11.Props.x86.vsix
   type: Vsix
-  version: 14.29.30153
+  version: 14.29.30154
 - id: Microsoft.VisualCpp.ATL.ARM64
   payloads:
   - fileName: Microsoft.VisualCpp.ATL.ARM64.vsix
diff --git a/build/vs/vs2022.yaml b/build/vs/vs2022.yaml
index c2f236dea2..2e973a1403 100644
--- a/build/vs/vs2022.yaml
+++ b/build/vs/vs2022.yaml
@@ -1,7 +1,12 @@
-# Generated with:
+# /!\ This file was edited manually. See bug 1884231.
+#
+# Originally generated with:
 # ./mach python --virtualenv build build/vs/generate_yaml.py \
 #   --major \
 #   17 \
+#   Microsoft.VisualCpp.ASAN.X86 \
+#   Microsoft.VisualCpp.CRT.ARM64.Desktop \
+#   Microsoft.VisualCpp.CRT.ARM64.Store \
 #   Microsoft.VisualCpp.CRT.Headers \
 #   Microsoft.VisualCpp.CRT.Redist.ARM64 \
 #   Microsoft.VisualCpp.CRT.Redist.X64 \
@@ -19,615 +24,723 @@
 #   Microsoft.VisualStudio.Component.VC.MFC.ARM64 \
 #   Win11SDK_10.0.22621 \
 #   -o \
-#   build/vs/vs2022.yaml
-- id: Microsoft.VisualCpp.CRT.Headers
+#   build/vs/vs2022.yaml \
+#   --exclude \
+#   Contracts \
+#   'App Certification Kit Native Components' \
+#   Intellisense
+- id: Microsoft.VisualCpp.ASAN.X86
+  payloads:
+  - fileName: Microsoft.VisualCpp.ASAN.X86.vsix
+    sha256: 7beb517d892c21855dfda40ef2868a6606cce342b741e70958ce53e8f128c6bf
+    size: 1069
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/7beb517d892c21855dfda40ef2868a6606cce342b741e70958ce53e8f128c6bf/Microsoft.VisualCpp.ASAN.X86.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.ASAN.X86.base
   payloads:
-  - fileName: Microsoft.VisualCpp.CRT.Headers.vsix
-    sha256: a98ec6ee3b3beeb46c6df7dcb65308a8554b84daab6d92ad01a292798abb0fbb
-    size: 1068
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/a98ec6ee3b3beeb46c6df7dcb65308a8554b84daab6d92ad01a292798abb0fbb/Microsoft.VisualCpp.CRT.Headers.vsix
+  - fileName: Microsoft.VC.14.39.17.9.ASAN.X86.base.vsix
+    sha256: ebc52f25a80b1ba9d18279750b6bc088951613d75ed8732b9dec4709fc197b6d
+    size: 72017193
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/ebc52f25a80b1ba9d18279750b6bc088951613d75ed8732b9dec4709fc197b6d/Microsoft.VC.14.39.17.9.ASAN.X86.base.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.ASAN.Headers.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.ASAN.Headers.base.vsix
+    sha256: 27c0f36a70a5f3f68230b4d256bb0023f9afb25ac4e37cd09cb40c933e0a1c3b
+    size: 86901
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/27c0f36a70a5f3f68230b4d256bb0023f9afb25ac4e37cd09cb40c933e0a1c3b/Microsoft.VC.14.39.17.9.ASAN.Headers.base.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.ASAN.X64.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.ASAN.X64.base.vsix
+    sha256: ecfabc2a4ac7f038b35de9351bf0b35afd5e1bbda0b7b446bcbbb308e291e7ca
+    size: 77538992
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/ecfabc2a4ac7f038b35de9351bf0b35afd5e1bbda0b7b446bcbbb308e291e7ca/Microsoft.VC.14.39.17.9.ASAN.X64.base.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Tools.HostX86.TargetX64.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.Tools.HostX86.TargetX64.base.vsix
+    sha256: 5d50aa3cebf498e32cd09c00df67fa412208887899bdfcc249eded16a30c4185
+    size: 17497049
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/5d50aa3cebf498e32cd09c00df67fa412208887899bdfcc249eded16a30c4185/Microsoft.VC.14.39.17.9.Tools.HostX86.TargetX64.base.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.CRT.Headers.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Tools.Hostx86.Targetx64.Res.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.CRT.Headers.base.vsix
-    sha256: 6470f78ebeab42ba0dcc258af6381262fd22bcb6c98f7eb475ec4c1abe1def3c
-    size: 3526094
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/6470f78ebeab42ba0dcc258af6381262fd22bcb6c98f7eb475ec4c1abe1def3c/Microsoft.VC.14.38.17.8.CRT.Headers.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.Tools.Hostx86.Targetx64.Res.base.enu.vsix
+    sha256: 02d511083a3f1f081f42c25240f6e8fd8e33c22d56079e290e27018e2953d2b7
+    size: 220530
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/02d511083a3f1f081f42c25240f6e8fd8e33c22d56079e290e27018e2953d2b7/Microsoft.VC.14.39.17.9.Tools.Hostx86.Targetx64.Res.base.enu.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.Servicing.CrtHeaders
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Props.x64
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Servicing.CrtHeaders.vsix
-    sha256: 264a78d86d5f6fea76f095642b6c3524299678f8ff0d66c7164b3fc355250b4b
-    size: 2007
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/264a78d86d5f6fea76f095642b6c3524299678f8ff0d66c7164b3fc355250b4b/Microsoft.VC.14.38.17.8.Servicing.CrtHeaders.vsix
+  - fileName: Microsoft.VC.14.39.17.9.Props.x64.vsix
+    sha256: 4e189b2700d14308606abd42399be5403a4ae72d4bf8d016f335b95332891148
+    size: 2225
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/4e189b2700d14308606abd42399be5403a4ae72d4bf8d016f335b95332891148/Microsoft.VC.14.39.17.9.Props.x64.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Props
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.Props.vsix
+    sha256: dfeae7ee389e43697310d4b0f7dee11068587d1c89d263482fccdf6e29db411e
+    size: 4104
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/dfeae7ee389e43697310d4b0f7dee11068587d1c89d263482fccdf6e29db411e/Microsoft.VC.14.39.17.9.Props.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Servicing.Compilers
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.Servicing.Compilers.vsix
+    sha256: cfd6269f993667cd453bff36587295f52b8cfe8d6b51cbece65badc02e7970f5
+    size: 2002
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/cfd6269f993667cd453bff36587295f52b8cfe8d6b51cbece65badc02e7970f5/Microsoft.VC.14.39.17.9.Servicing.Compilers.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.Servicing
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Servicing
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Servicing.vsix
-    sha256: 1f9050aa0012a3a27432e24cc32d4d8a68be42693ec3809eae385e2d95d2e2ed
+  - fileName: Microsoft.VC.14.39.17.9.Servicing.vsix
+    sha256: c04c0a98cd900effa856df40c79d85a34c308492b33bd5c5e3eed610b2ca4328
     size: 2214
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/1f9050aa0012a3a27432e24cc32d4d8a68be42693ec3809eae385e2d95d2e2ed/Microsoft.VC.14.38.17.8.Servicing.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/c04c0a98cd900effa856df40c79d85a34c308492b33bd5c5e3eed610b2ca4328/Microsoft.VC.14.39.17.9.Servicing.vsix
   type: Vsix
-  version: 14.38.33133
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Tools.HostX64.TargetX64.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.Tools.HostX64.TargetX64.base.vsix
+    sha256: 0bcb231cd6e6c548751fc775caa02865f5afa707326198c1b0a5e1497b26adc5
+    size: 20376397
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/0bcb231cd6e6c548751fc775caa02865f5afa707326198c1b0a5e1497b26adc5/Microsoft.VC.14.39.17.9.Tools.HostX64.TargetX64.base.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Tools.HostX64.TargetX64.Res.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.Tools.HostX64.TargetX64.Res.base.enu.vsix
+    sha256: 455ae54f68b08db5f84b8afa65c636487c535a0a0f0a19fdb74d770d70909a2d
+    size: 220122
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/455ae54f68b08db5f84b8afa65c636487c535a0a0f0a19fdb74d770d70909a2d/Microsoft.VC.14.39.17.9.Tools.HostX64.TargetX64.Res.base.enu.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Tools.HostX86.TargetX86.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.Tools.HostX86.TargetX86.base.vsix
+    sha256: b818779320ad20dc6c30aab50fdf93586cfe0664a4aeabfc95dd173e163541bc
+    size: 19227378
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/b818779320ad20dc6c30aab50fdf93586cfe0664a4aeabfc95dd173e163541bc/Microsoft.VC.14.39.17.9.Tools.HostX86.TargetX86.base.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Tools.HostX86.TargetX86.Res.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.Tools.HostX86.TargetX86.Res.base.enu.vsix
+    sha256: 4d5f2214842601910a99a340e833767cf2ff1a5f3ec9025aa1f858f9033faa26
+    size: 220297
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/4d5f2214842601910a99a340e833767cf2ff1a5f3ec9025aa1f858f9033faa26/Microsoft.VC.14.39.17.9.Tools.HostX86.TargetX86.Res.base.enu.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Props.x86
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.Props.x86.vsix
+    sha256: 84f352ff4d75ddddbe41c1228afc1b660d70c430e8d5a5c4e3d35966efbf7485
+    size: 2225
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/84f352ff4d75ddddbe41c1228afc1b660d70c430e8d5a5c4e3d35966efbf7485/Microsoft.VC.14.39.17.9.Props.x86.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Tools.HostX64.TargetX86.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.Tools.HostX64.TargetX86.base.vsix
+    sha256: e76a66d3867d785a413f80a2baed54053585b432bac933253ec219669c72ad95
+    size: 21363474
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/e76a66d3867d785a413f80a2baed54053585b432bac933253ec219669c72ad95/Microsoft.VC.14.39.17.9.Tools.HostX64.TargetX86.base.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Tools.HostX64.TargetX86.Res.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.Tools.HostX64.TargetX86.Res.base.enu.vsix
+    sha256: 38d287b0656200b95367d2ac817518a18561c3e0b6d8e47e5cd7ff4941eb05ab
+    size: 220144
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/38d287b0656200b95367d2ac817518a18561c3e0b6d8e47e5cd7ff4941eb05ab/Microsoft.VC.14.39.17.9.Tools.HostX64.TargetX86.Res.base.enu.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VisualCpp.CRT.ARM64.Desktop
+  payloads:
+  - fileName: Microsoft.VisualCpp.CRT.ARM64.Desktop.vsix
+    sha256: e3b42316d0afef197fd00b1a469d361c509058e8d6e8968712dcfc24919d6bcb
+    size: 1075
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/e3b42316d0afef197fd00b1a469d361c509058e8d6e8968712dcfc24919d6bcb/Microsoft.VisualCpp.CRT.ARM64.Desktop.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.CRT.ARM64.Desktop.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.CRT.ARM64.Desktop.base.vsix
+    sha256: fe0892a670d1463692fa9e4d55cfee099c702b8dd7cb228dcbd32f0c0e6d58fc
+    size: 48881992
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/fe0892a670d1463692fa9e4d55cfee099c702b8dd7cb228dcbd32f0c0e6d58fc/Microsoft.VC.14.39.17.9.CRT.ARM64.Desktop.base.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.CRT.ARM64.Desktop.debug.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.CRT.ARM64.Desktop.debug.base.vsix
+    sha256: f0c9ff96a6313f38a59dcea4b894df3b766d0f21af7e18927e6a44cac3b90a81
+    size: 51782064
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/f0c9ff96a6313f38a59dcea4b894df3b766d0f21af7e18927e6a44cac3b90a81/Microsoft.VC.14.39.17.9.CRT.ARM64.Desktop.debug.base.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VisualCpp.CRT.ARM64.Store
+  payloads:
+  - fileName: Microsoft.VisualCpp.CRT.ARM64.Store.vsix
+    sha256: 587132ada1635c26f9ef099522b4ca526cded1e3a771e1f7ee604b605de5396d
+    size: 1072
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/587132ada1635c26f9ef099522b4ca526cded1e3a771e1f7ee604b605de5396d/Microsoft.VisualCpp.CRT.ARM64.Store.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.CRT.ARM64.Store.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.CRT.ARM64.Store.base.vsix
+    sha256: 40f1b6248ac3239429083da49d16e94b1c28158ca3fb385e05809f76772120a1
+    size: 60587491
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/40f1b6248ac3239429083da49d16e94b1c28158ca3fb385e05809f76772120a1/Microsoft.VC.14.39.17.9.CRT.ARM64.Store.base.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VisualCpp.CRT.Headers
+  payloads:
+  - fileName: Microsoft.VisualCpp.CRT.Headers.vsix
+    sha256: ed306860b55643bfb092fccd05b4e38ebfd94596922a586bafadb9e0e8c6cc3f
+    size: 1068
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/ed306860b55643bfb092fccd05b4e38ebfd94596922a586bafadb9e0e8c6cc3f/Microsoft.VisualCpp.CRT.Headers.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.CRT.Headers.base
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.CRT.Headers.base.vsix
+    sha256: b5658c4697b7f1c54d22ed0ab2624af90a7d031b42ddb8cc0da4f140d6d311d7
+    size: 3542746
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/b5658c4697b7f1c54d22ed0ab2624af90a7d031b42ddb8cc0da4f140d6d311d7/Microsoft.VC.14.39.17.9.CRT.Headers.base.vsix
+  type: Vsix
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Servicing.CrtHeaders
+  payloads:
+  - fileName: Microsoft.VC.14.39.17.9.Servicing.CrtHeaders.vsix
+    sha256: f2d574f61edfbae8970d9a0b7bb6243dcf9c566cd5680a2226642cdec8a5462c
+    size: 2006
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/f2d574f61edfbae8970d9a0b7bb6243dcf9c566cd5680a2226642cdec8a5462c/Microsoft.VC.14.39.17.9.Servicing.CrtHeaders.vsix
+  type: Vsix
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.CRT.Redist.ARM64
   payloads:
   - fileName: Microsoft.VisualCpp.CRT.Redist.ARM64.vsix
-    sha256: 1b0d024b02ea1b8f3b44235172c66f6b947dfbd401794bc247e31683f3d7a287
-    size: 22598676
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/1b0d024b02ea1b8f3b44235172c66f6b947dfbd401794bc247e31683f3d7a287/Microsoft.VisualCpp.CRT.Redist.ARM64.vsix
+    sha256: 7163ec779b60ab31d60a76fa2e084d059fecacc75fd54f64e36e640a8e7fad8b
+    size: 22600236
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/7163ec779b60ab31d60a76fa2e084d059fecacc75fd54f64e36e640a8e7fad8b/Microsoft.VisualCpp.CRT.Redist.ARM64.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Microsoft.VC.14.38.17.8.CRT.Redist.ARM64.base
   payloads:
   - fileName: Microsoft.VC.14.38.17.8.CRT.Redist.ARM64.base.vsix
-    sha256: e8b663fa3e2bf8b0e3015a21fc3c18ba8499ebee6d9112581dcf6eebd28a8dbd
-    size: 5185911
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/e8b663fa3e2bf8b0e3015a21fc3c18ba8499ebee6d9112581dcf6eebd28a8dbd/Microsoft.VC.14.38.17.8.CRT.Redist.ARM64.base.vsix
+    sha256: 671846b2277d83193d4647eeecbfdbef6705d689cb6ff5c477357f6e8c703127
+    size: 5186314
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/671846b2277d83193d4647eeecbfdbef6705d689cb6ff5c477357f6e8c703127/Microsoft.VC.14.38.17.8.CRT.Redist.ARM64.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Microsoft.VisualCpp.CRT.Redist.Resources
   payloads:
   - fileName: Microsoft.VisualCpp.CRT.Redist.Resources.enu.vsix
-    sha256: 9213845e19946c9c6f64df0a289601556e4efbba27142aee5d0e2cd368a3f158
+    sha256: 49f152e8a314b83f958496a81f5e9ab0359e77b4bf58109c39ed2420bfe2d86e
     size: 1058
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/9213845e19946c9c6f64df0a289601556e4efbba27142aee5d0e2cd368a3f158/Microsoft.VisualCpp.CRT.Redist.Resources.enu.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/49f152e8a314b83f958496a81f5e9ab0359e77b4bf58109c39ed2420bfe2d86e/Microsoft.VisualCpp.CRT.Redist.Resources.enu.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Microsoft.VisualCpp.CRT.Redist.X64
   payloads:
   - fileName: Microsoft.VisualCpp.CRT.Redist.X64.vsix
-    sha256: e966520ff9a4b39d93eaf4e2276741815aa4311e2a2a41b8362c54c7332996fe
-    size: 50365917
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/e966520ff9a4b39d93eaf4e2276741815aa4311e2a2a41b8362c54c7332996fe/Microsoft.VisualCpp.CRT.Redist.X64.vsix
+    sha256: 432185a74eea5d201516bee6857a913f2c8965d347c0d7adb17c3910d5e6db1d
+    size: 50348842
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/432185a74eea5d201516bee6857a913f2c8965d347c0d7adb17c3910d5e6db1d/Microsoft.VisualCpp.CRT.Redist.X64.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Microsoft.VC.14.38.17.8.CRT.Redist.X64.base
   payloads:
   - fileName: Microsoft.VC.14.38.17.8.CRT.Redist.X64.base.vsix
-    sha256: b898cf07a19e16214e7ec5d28b2699aea8a095456c5de6221d91c95cb2be5740
-    size: 3410952
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/b898cf07a19e16214e7ec5d28b2699aea8a095456c5de6221d91c95cb2be5740/Microsoft.VC.14.38.17.8.CRT.Redist.X64.base.vsix
+    sha256: 2ba793a826a8471e0c13259d1464b6bb57638a2c6248c89a94af2b93beebe5b6
+    size: 3411260
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/2ba793a826a8471e0c13259d1464b6bb57638a2c6248c89a94af2b93beebe5b6/Microsoft.VC.14.38.17.8.CRT.Redist.X64.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Microsoft.VisualCpp.CRT.Redist.X86
   payloads:
   - fileName: Microsoft.VisualCpp.CRT.Redist.X86.vsix
-    sha256: 2dced84dabaef0beb2a3eaa676821714684370e78f0a24b12d1b147ae5a458e2
-    size: 27203469
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/2dced84dabaef0beb2a3eaa676821714684370e78f0a24b12d1b147ae5a458e2/Microsoft.VisualCpp.CRT.Redist.X86.vsix
+    sha256: 3d6c81cd18512cc94866013aeaff5b8f9062740ccdf8ec128ee051ecdc604eb1
+    size: 27217097
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/3d6c81cd18512cc94866013aeaff5b8f9062740ccdf8ec128ee051ecdc604eb1/Microsoft.VisualCpp.CRT.Redist.X86.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Microsoft.VC.14.38.17.8.CRT.Redist.X86.base
   payloads:
   - fileName: Microsoft.VC.14.38.17.8.CRT.Redist.X86.base.vsix
-    sha256: db141c6596ec224a0049592b68f619dd5827b2320ffc501f3079f0a12f861abc
-    size: 3049295
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/db141c6596ec224a0049592b68f619dd5827b2320ffc501f3079f0a12f861abc/Microsoft.VC.14.38.17.8.CRT.Redist.X86.base.vsix
+    sha256: a8eca5773403167bb09d026c394dc79a8c6190b638a76348c60056bf185963ad
+    size: 3054750
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/a8eca5773403167bb09d026c394dc79a8c6190b638a76348c60056bf185963ad/Microsoft.VC.14.38.17.8.CRT.Redist.X86.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Microsoft.VisualCpp.CRT.x64.Desktop
   payloads:
   - fileName: Microsoft.VisualCpp.CRT.x64.Desktop.vsix
-    sha256: 72a745f7de593a9e1c49b720528f37b8893121569f2f098a84b71044a8f8d776
+    sha256: 2a2f6ed850776fbb06aafe696fbccbec11c356066988e727591c5fc36b07e5d4
     size: 1072
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/72a745f7de593a9e1c49b720528f37b8893121569f2f098a84b71044a8f8d776/Microsoft.VisualCpp.CRT.x64.Desktop.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/2a2f6ed850776fbb06aafe696fbccbec11c356066988e727591c5fc36b07e5d4/Microsoft.VisualCpp.CRT.x64.Desktop.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.CRT.x64.Desktop.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.CRT.x64.Desktop.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.CRT.x64.Desktop.base.vsix
-    sha256: aaa82d6cec89e0271a75cf8e07d957ce6fe75a4ac7f58284b8209213ae629cea
-    size: 47056589
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/aaa82d6cec89e0271a75cf8e07d957ce6fe75a4ac7f58284b8209213ae629cea/Microsoft.VC.14.38.17.8.CRT.x64.Desktop.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.CRT.x64.Desktop.base.vsix
+    sha256: da95b0d5ad788bc7b7f86c6825c0a598427ed23ffa7f13cb0d198427d14e2e94
+    size: 49685805
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/da95b0d5ad788bc7b7f86c6825c0a598427ed23ffa7f13cb0d198427d14e2e94/Microsoft.VC.14.39.17.9.CRT.x64.Desktop.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.CRT.x64.Store
   payloads:
   - fileName: Microsoft.VisualCpp.CRT.x64.Store.vsix
-    sha256: 0a84f5744705dbb456131d11e04b3735e1c75dac9160575f96556941b98c420a
+    sha256: c88d14ba36c1f6be0cad3764501d5b865a335958d37b859a9a1782061d75dcb7
     size: 1070
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/0a84f5744705dbb456131d11e04b3735e1c75dac9160575f96556941b98c420a/Microsoft.VisualCpp.CRT.x64.Store.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/c88d14ba36c1f6be0cad3764501d5b865a335958d37b859a9a1782061d75dcb7/Microsoft.VisualCpp.CRT.x64.Store.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.CRT.x64.Store.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.CRT.x64.Store.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.CRT.x64.Store.base.vsix
-    sha256: dcc5afa6389540801e9ccdfdde6982c5173f14802e354f87afc743c54441ee1e
-    size: 25354259
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/dcc5afa6389540801e9ccdfdde6982c5173f14802e354f87afc743c54441ee1e/Microsoft.VC.14.38.17.8.CRT.x64.Store.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.CRT.x64.Store.base.vsix
+    sha256: 9212acc40350519679077d723a4480e4df634879f42411c2cffb4a5e4b784413
+    size: 25382337
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/9212acc40350519679077d723a4480e4df634879f42411c2cffb4a5e4b784413/Microsoft.VC.14.39.17.9.CRT.x64.Store.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.CRT.x86.Desktop
   payloads:
   - fileName: Microsoft.VisualCpp.CRT.x86.Desktop.vsix
-    sha256: ec3260046eb52c759ad5319a3e7ff397eebc20728496bd6e94a18790393cc891
+    sha256: c9237ab2d648367503f9e7ce0c283f7e98ea2f5613039a79b62fa140e2ecdada
     size: 1072
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/ec3260046eb52c759ad5319a3e7ff397eebc20728496bd6e94a18790393cc891/Microsoft.VisualCpp.CRT.x86.Desktop.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/c9237ab2d648367503f9e7ce0c283f7e98ea2f5613039a79b62fa140e2ecdada/Microsoft.VisualCpp.CRT.x86.Desktop.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.CRT.x86.Desktop.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.CRT.x86.Desktop.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.CRT.x86.Desktop.base.vsix
-    sha256: 98e1bc95ba7956a8ca92eb625b88637651f35bd4fa3d88660ae4b12cd225bf1f
-    size: 72606892
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/98e1bc95ba7956a8ca92eb625b88637651f35bd4fa3d88660ae4b12cd225bf1f/Microsoft.VC.14.38.17.8.CRT.x86.Desktop.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.CRT.x86.Desktop.base.vsix
+    sha256: 9be4f21f49fb518fbcb72b13d0084c04e69f7ea7c447590a7209b5b13d2af3c1
+    size: 72462609
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/9be4f21f49fb518fbcb72b13d0084c04e69f7ea7c447590a7209b5b13d2af3c1/Microsoft.VC.14.39.17.9.CRT.x86.Desktop.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.CRT.x86.Store
   payloads:
   - fileName: Microsoft.VisualCpp.CRT.x86.Store.vsix
-    sha256: 57be84ac82ad5a29b134562057282c8847e61b910a76de50485996fc123d4d53
-    size: 1070
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/57be84ac82ad5a29b134562057282c8847e61b910a76de50485996fc123d4d53/Microsoft.VisualCpp.CRT.x86.Store.vsix
+    sha256: 9556d1dcab12e3bff09dee42c137ed7eccb7073d4716e6d8a87fb3c63f76b650
+    size: 1071
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/9556d1dcab12e3bff09dee42c137ed7eccb7073d4716e6d8a87fb3c63f76b650/Microsoft.VisualCpp.CRT.x86.Store.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.CRT.x86.Store.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.CRT.x86.Store.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.CRT.x86.Store.base.vsix
-    sha256: 17559c3fc6dd02b4af5c325fa2d009826b687d4186e03c0700eaa75d3d24888c
-    size: 24946625
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/17559c3fc6dd02b4af5c325fa2d009826b687d4186e03c0700eaa75d3d24888c/Microsoft.VC.14.38.17.8.CRT.x86.Store.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.CRT.x86.Store.base.vsix
+    sha256: 5201d9289ca7261e3d48cc5f93795f143cd8ec691ea06c06bdd86f5f7ae295c0
+    size: 25002433
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/5201d9289ca7261e3d48cc5f93795f143cd8ec691ea06c06bdd86f5f7ae295c0/Microsoft.VC.14.39.17.9.CRT.x86.Store.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.DIA.SDK
   payloads:
   - fileName: Microsoft.VisualCpp.DIA.SDK.vsix
-    sha256: 73e3ddf59bb5ca99da9013aad518a0f96707913de0758421c155b8b2c074d039
-    size: 6849524
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/73e3ddf59bb5ca99da9013aad518a0f96707913de0758421c155b8b2c074d039/Microsoft.VisualCpp.DIA.SDK.vsix
+    sha256: a88ced3aa34e99f3553ba2ada16d2d5544c6e676fd100bc90c2437f91891b5f7
+    size: 6900421
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/a88ced3aa34e99f3553ba2ada16d2d5544c6e676fd100bc90c2437f91891b5f7/Microsoft.VisualCpp.DIA.SDK.vsix
   type: Vsix
-  version: 14.38.33133
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.Servicing.DIASDK
   payloads:
   - fileName: Microsoft.VisualCpp.Servicing.DIASDK.vsix
-    sha256: 19aa3825fe3afe665596a5a53799cfdb7d3aededeafcdcb61b670c895dc5e978
+    sha256: 27ec8fd9acb8a9ce136b78efc1cc097ab75d45a99336f555fb172e35c63340db
     size: 2000
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/19aa3825fe3afe665596a5a53799cfdb7d3aededeafcdcb61b670c895dc5e978/Microsoft.VisualCpp.Servicing.DIASDK.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/27ec8fd9acb8a9ce136b78efc1cc097ab75d45a99336f555fb172e35c63340db/Microsoft.VisualCpp.Servicing.DIASDK.vsix
   type: Vsix
-  version: 14.38.33133
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.Tools.HostX64.TargetARM64
   payloads:
   - fileName: Microsoft.VisualCpp.Tools.HostX64.TargetARM64.vsix
-    sha256: 8577d01efebd533062c1761660d6f7a9229deb4c9b69a57a238e156f5e90a753
-    size: 2296
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/8577d01efebd533062c1761660d6f7a9229deb4c9b69a57a238e156f5e90a753/Microsoft.VisualCpp.Tools.HostX64.TargetARM64.vsix
+    sha256: 9389b3fc8402d7432b96e1371036fd69c2c4b162adad6d3be93df9767e317b5e
+    size: 2295
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/9389b3fc8402d7432b96e1371036fd69c2c4b162adad6d3be93df9767e317b5e/Microsoft.VisualCpp.Tools.HostX64.TargetARM64.vsix
   type: Vsix
-  version: 14.38.33133
-- id: Microsoft.VC.14.38.17.8.Tools.HostX64.TargetARM64.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Tools.HostX64.TargetARM64.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Tools.HostX64.TargetARM64.base.vsix
-    sha256: 1f886d0edaa0036006e21e258466e3eabfaa91d816d33357065323caed2f02ad
-    size: 19674827
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/1f886d0edaa0036006e21e258466e3eabfaa91d816d33357065323caed2f02ad/Microsoft.VC.14.38.17.8.Tools.HostX64.TargetARM64.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.Tools.HostX64.TargetARM64.base.vsix
+    sha256: b4e7bd8929bf75c0fa5b20c744121faa30a10b4cab4c82153a96aebc2032c0b5
+    size: 19832370
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/b4e7bd8929bf75c0fa5b20c744121faa30a10b4cab4c82153a96aebc2032c0b5/Microsoft.VC.14.39.17.9.Tools.HostX64.TargetARM64.base.vsix
   type: Vsix
-  version: 14.38.33133
-- id: Microsoft.VC.14.38.17.8.Tools.HostX64.TargetARM64.Res.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Tools.HostX64.TargetARM64.Res.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Tools.HostX64.TargetARM64.Res.base.enu.vsix
-    sha256: b577ea9115bbc0e098f1de3c60046c9175580656c9149d32155315a181f87e86
-    size: 219803
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/b577ea9115bbc0e098f1de3c60046c9175580656c9149d32155315a181f87e86/Microsoft.VC.14.38.17.8.Tools.HostX64.TargetARM64.Res.base.enu.vsix
+  - fileName: Microsoft.VC.14.39.17.9.Tools.HostX64.TargetARM64.Res.base.enu.vsix
+    sha256: eaa44d3722f6cc2d9a41285751d073a398b1a11f2ff55361568789290dc1eb5f
+    size: 220419
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/eaa44d3722f6cc2d9a41285751d073a398b1a11f2ff55361568789290dc1eb5f/Microsoft.VC.14.39.17.9.Tools.HostX64.TargetARM64.Res.base.enu.vsix
   type: Vsix
-  version: 14.38.33133
-- id: Microsoft.VC.14.38.17.8.Props.ARM64
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Props.ARM64
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Props.ARM64.vsix
-    sha256: 4ed2b8968ec3dd0342e037106549128669b7094b5fa4122227c0ab1dace2a3dc
-    size: 2240
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/4ed2b8968ec3dd0342e037106549128669b7094b5fa4122227c0ab1dace2a3dc/Microsoft.VC.14.38.17.8.Props.ARM64.vsix
+  - fileName: Microsoft.VC.14.39.17.9.Props.ARM64.vsix
+    sha256: cfbf152642583b869cb0bb9f1e93eb9928f94c3d48d973ac1f603bace9a23e36
+    size: 2242
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/cfbf152642583b869cb0bb9f1e93eb9928f94c3d48d973ac1f603bace9a23e36/Microsoft.VC.14.39.17.9.Props.ARM64.vsix
   type: Vsix
-  version: 14.38.33133
-- id: Microsoft.VC.14.38.17.8.Props
-  payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Props.vsix
-    sha256: d246e144631fee8366d3b1dee43da0aeea3981aaeaad65654f77af1035e69c24
-    size: 4104
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/d246e144631fee8366d3b1dee43da0aeea3981aaeaad65654f77af1035e69c24/Microsoft.VC.14.38.17.8.Props.vsix
-  type: Vsix
-  version: 14.38.33133
-- id: Microsoft.VC.14.38.17.8.Servicing.Compilers
-  payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Servicing.Compilers.vsix
-    sha256: 9a3673264ceebe311fc9e0785945d4920df311fedca1e718e49a6d6b21420a70
-    size: 2001
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/9a3673264ceebe311fc9e0785945d4920df311fedca1e718e49a6d6b21420a70/Microsoft.VC.14.38.17.8.Servicing.Compilers.vsix
-  type: Vsix
-  version: 14.38.33133
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.Tools.HostX64.TargetX64
   payloads:
   - fileName: Microsoft.VisualCpp.Tools.HostX64.TargetX64.vsix
-    sha256: 62d763f6e18c0dc4f28c11ca3468ee8b26c5a362a9824566c443c3fa4a1fafab
-    size: 2245
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/62d763f6e18c0dc4f28c11ca3468ee8b26c5a362a9824566c443c3fa4a1fafab/Microsoft.VisualCpp.Tools.HostX64.TargetX64.vsix
-  type: Vsix
-  version: 14.38.33133
-- id: Microsoft.VC.14.38.17.8.Tools.HostX64.TargetX64.base
-  payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Tools.HostX64.TargetX64.base.vsix
-    sha256: 43c9b6ad02300e9fed100b187ae129628d1607c3f9f310436c3ab2af91a640ef
-    size: 20142162
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/43c9b6ad02300e9fed100b187ae129628d1607c3f9f310436c3ab2af91a640ef/Microsoft.VC.14.38.17.8.Tools.HostX64.TargetX64.base.vsix
-  type: Vsix
-  version: 14.38.33133
-- id: Microsoft.VC.14.38.17.8.Tools.HostX64.TargetX64.Res.base
-  payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Tools.HostX64.TargetX64.Res.base.enu.vsix
-    sha256: 4545fd9b8558f2f3e471ea7285ccb220bbef84ca271d5094ddc838598195d3cb
-    size: 219618
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/4545fd9b8558f2f3e471ea7285ccb220bbef84ca271d5094ddc838598195d3cb/Microsoft.VC.14.38.17.8.Tools.HostX64.TargetX64.Res.base.enu.vsix
-  type: Vsix
-  version: 14.38.33133
-- id: Microsoft.VC.14.38.17.8.Props.x64
-  payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Props.x64.vsix
-    sha256: 4cea241fa03dcfefab34a3c6dd4db4531060160317541f83edd61c532f9999b8
-    size: 2227
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/4cea241fa03dcfefab34a3c6dd4db4531060160317541f83edd61c532f9999b8/Microsoft.VC.14.38.17.8.Props.x64.vsix
+    sha256: 8f9c015f7a30f124a13de74ab6defd65cdf6bed18073687b95933b8b0fb3c5c2
+    size: 2243
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/8f9c015f7a30f124a13de74ab6defd65cdf6bed18073687b95933b8b0fb3c5c2/Microsoft.VisualCpp.Tools.HostX64.TargetX64.vsix
   type: Vsix
-  version: 14.38.33133
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.Tools.HostX64.TargetX86
   payloads:
   - fileName: Microsoft.VisualCpp.Tools.HostX64.TargetX86.vsix
-    sha256: 69ce817ccf134300c2650b475f22d031dda3ad741c059bebd871afca500c9c22
+    sha256: 9cb398dd9530002ba4ab2d21d32199f7f7a57d1920ad71a5c083ea19edcd176a
     size: 2282
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/69ce817ccf134300c2650b475f22d031dda3ad741c059bebd871afca500c9c22/Microsoft.VisualCpp.Tools.HostX64.TargetX86.vsix
-  type: Vsix
-  version: 14.38.33133
-- id: Microsoft.VC.14.38.17.8.Tools.HostX64.TargetX86.base
-  payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Tools.HostX64.TargetX86.base.vsix
-    sha256: 51677958cf3dcc11a4b0a470d09eaf4ed1660f19c44896a875d176755a730453
-    size: 21297983
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/51677958cf3dcc11a4b0a470d09eaf4ed1660f19c44896a875d176755a730453/Microsoft.VC.14.38.17.8.Tools.HostX64.TargetX86.base.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/9cb398dd9530002ba4ab2d21d32199f7f7a57d1920ad71a5c083ea19edcd176a/Microsoft.VisualCpp.Tools.HostX64.TargetX86.vsix
   type: Vsix
-  version: 14.38.33133
-- id: Microsoft.VC.14.38.17.8.Tools.HostX64.TargetX86.Res.base
-  payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Tools.HostX64.TargetX86.Res.base.enu.vsix
-    sha256: 898f19e75bddfdb9de863f7249fc3c0f333eb9d76fce7f002d23b14da66245ef
-    size: 219626
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/898f19e75bddfdb9de863f7249fc3c0f333eb9d76fce7f002d23b14da66245ef/Microsoft.VC.14.38.17.8.Tools.HostX64.TargetX86.Res.base.enu.vsix
-  type: Vsix
-  version: 14.38.33133
-- id: Microsoft.VC.14.38.17.8.Props.x86
-  payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Props.x86.vsix
-    sha256: aa0e1636337a40eb9037d409bfb2f7dfc0687f21e638a74f645e088ed162e2a0
-    size: 2225
-    url: https://download.visualstudio.microsoft.com/download/pr/3d1e46df-bd80-451a-ab69-06c02f9dc3f1/aa0e1636337a40eb9037d409bfb2f7dfc0687f21e638a74f645e088ed162e2a0/Microsoft.VC.14.38.17.8.Props.x86.vsix
-  type: Vsix
-  version: 14.38.33133
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.ATL.ARM64
   payloads:
   - fileName: Microsoft.VisualCpp.ATL.ARM64.vsix
-    sha256: d3771e825bf4ba1ce22c41fb35abd01785b5c1623e858e571a946dc0612498d4
+    sha256: c24c9ee79c99b7586798764bee958096470bd900f1a5a0e0d071bc7a9b7fd7ea
     size: 1069
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/d3771e825bf4ba1ce22c41fb35abd01785b5c1623e858e571a946dc0612498d4/Microsoft.VisualCpp.ATL.ARM64.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/c24c9ee79c99b7586798764bee958096470bd900f1a5a0e0d071bc7a9b7fd7ea/Microsoft.VisualCpp.ATL.ARM64.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.ATL.ARM64.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.ATL.ARM64.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.ATL.ARM64.base.vsix
-    sha256: 651cd263b87c6ca25dab72036afd442dffb40ccd58cb0de9eafa4cf2e987e45e
-    size: 1336359
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/651cd263b87c6ca25dab72036afd442dffb40ccd58cb0de9eafa4cf2e987e45e/Microsoft.VC.14.38.17.8.ATL.ARM64.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.ATL.ARM64.base.vsix
+    sha256: b3a5e0b86acf0890b7b4f2852a8560277599af78ee5caad8b3471aa68fcb3d08
+    size: 1335189
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/b3a5e0b86acf0890b7b4f2852a8560277599af78ee5caad8b3471aa68fcb3d08/Microsoft.VC.14.39.17.9.ATL.ARM64.base.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.Servicing.ATL
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Servicing.ATL
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Servicing.ATL.vsix
-    sha256: 8b76cc8c88d8637880316436e27b78caa759c50e9ee02e95d32c5857b642c0b8
-    size: 1976
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/8b76cc8c88d8637880316436e27b78caa759c50e9ee02e95d32c5857b642c0b8/Microsoft.VC.14.38.17.8.Servicing.ATL.vsix
+  - fileName: Microsoft.VC.14.39.17.9.Servicing.ATL.vsix
+    sha256: 17f2f9b25087117a44dcbe96f4520f610d8d280e29cc421f06d9dbb3cbc7c73a
+    size: 1978
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/17f2f9b25087117a44dcbe96f4520f610d8d280e29cc421f06d9dbb3cbc7c73a/Microsoft.VC.14.39.17.9.Servicing.ATL.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.Props.ATLMFC
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Props.ATLMFC
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Props.ATLMFC.vsix
-    sha256: 0a98ec593216cafa9499fc051c7b209a93d446e57399976c98faf20073c8450c
-    size: 2179
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/0a98ec593216cafa9499fc051c7b209a93d446e57399976c98faf20073c8450c/Microsoft.VC.14.38.17.8.Props.ATLMFC.vsix
+  - fileName: Microsoft.VC.14.39.17.9.Props.ATLMFC.vsix
+    sha256: 996aa2afe48bad58cfce35712683934cf6d1742812e0ed8cc4a410267fd231f2
+    size: 2178
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/996aa2afe48bad58cfce35712683934cf6d1742812e0ed8cc4a410267fd231f2/Microsoft.VC.14.39.17.9.Props.ATLMFC.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.ATL.Headers
   payloads:
   - fileName: Microsoft.VisualCpp.ATL.Headers.vsix
-    sha256: 17322b92686d6e990682cd548efcc21f5e25838d69b3c03c8b8a5595298af1aa
+    sha256: fe399ab0e9d885557279234e6a55d3d499fc215cdae1042a065deba9376c043d
     size: 1069
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/17322b92686d6e990682cd548efcc21f5e25838d69b3c03c8b8a5595298af1aa/Microsoft.VisualCpp.ATL.Headers.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/fe399ab0e9d885557279234e6a55d3d499fc215cdae1042a065deba9376c043d/Microsoft.VisualCpp.ATL.Headers.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.ATL.Headers.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.ATL.Headers.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.ATL.Headers.base.vsix
-    sha256: 097f034e7f300a9d7a52d969af5fa9e0a391ef429cc872d9a4a991cb81caffb1
-    size: 576341
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/097f034e7f300a9d7a52d969af5fa9e0a391ef429cc872d9a4a991cb81caffb1/Microsoft.VC.14.38.17.8.ATL.Headers.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.ATL.Headers.base.vsix
+    sha256: 2d2b91bbeccd59d526674db98bd9d10e2e9015524b94216c0155ec55635e2932
+    size: 576333
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/2d2b91bbeccd59d526674db98bd9d10e2e9015524b94216c0155ec55635e2932/Microsoft.VC.14.39.17.9.ATL.Headers.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.ATL.Source
   payloads:
   - fileName: Microsoft.VisualCpp.ATL.Source.vsix
-    sha256: 9df77d201d474b8f83ba2dbea37e42b5f7f65ff6b34565ecc04105fcdfc47fe0
-    size: 1069
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/9df77d201d474b8f83ba2dbea37e42b5f7f65ff6b34565ecc04105fcdfc47fe0/Microsoft.VisualCpp.ATL.Source.vsix
+    sha256: 261826c12ba5a8509824edee88cf1b3a978b4de51f26baa35b271d7454a3a19f
+    size: 1068
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/261826c12ba5a8509824edee88cf1b3a978b4de51f26baa35b271d7454a3a19f/Microsoft.VisualCpp.ATL.Source.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.ATL.Source.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.ATL.Source.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.ATL.Source.base.vsix
-    sha256: 7d8e78794edbcaade94210773c5b44eaa0734f0e7c4032099f72e84553cf7e65
-    size: 8618
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/7d8e78794edbcaade94210773c5b44eaa0734f0e7c4032099f72e84553cf7e65/Microsoft.VC.14.38.17.8.ATL.Source.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.ATL.Source.base.vsix
+    sha256: fb715cd3cb3a7c72ebc604f767fa5a0830565af37ee3f992b6d53c444ba88c18
+    size: 8615
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/fb715cd3cb3a7c72ebc604f767fa5a0830565af37ee3f992b6d53c444ba88c18/Microsoft.VC.14.39.17.9.ATL.Source.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.ATL.X64
   payloads:
   - fileName: Microsoft.VisualCpp.ATL.X64.vsix
-    sha256: 6d5191ebb525bd90f0b144ac990d7ab90ec015464ab28d2a6f5fbe9682331a23
+    sha256: 8793e6d096632da712edf449d1aad29ced2c245861939c4dfe89bada26635d67
     size: 1068
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/6d5191ebb525bd90f0b144ac990d7ab90ec015464ab28d2a6f5fbe9682331a23/Microsoft.VisualCpp.ATL.X64.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/8793e6d096632da712edf449d1aad29ced2c245861939c4dfe89bada26635d67/Microsoft.VisualCpp.ATL.X64.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.ATL.X64.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.ATL.X64.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.ATL.X64.base.vsix
-    sha256: f867c77b9897793aee01b7762f4ae2cc18ab84fc0cc8ed4c45f3864ccf7a09e4
-    size: 777291
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/f867c77b9897793aee01b7762f4ae2cc18ab84fc0cc8ed4c45f3864ccf7a09e4/Microsoft.VC.14.38.17.8.ATL.X64.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.ATL.X64.base.vsix
+    sha256: f012368e415dd8bfd9eff88025137bea7f2251f72ef8b211cd4d18f4ed32cf6d
+    size: 777161
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/f012368e415dd8bfd9eff88025137bea7f2251f72ef8b211cd4d18f4ed32cf6d/Microsoft.VC.14.39.17.9.ATL.X64.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.ATL.X86
   payloads:
   - fileName: Microsoft.VisualCpp.ATL.X86.vsix
-    sha256: 1ef6b01a4ce38662e658589b8fd15658dfe94d4bd8d63b9ad5a34596dd0eb553
+    sha256: bd56f23c2b94a99ebba0e40f2b0dab2a05b1c3a4ed3b70337305ee9e78a457c3
     size: 1068
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/1ef6b01a4ce38662e658589b8fd15658dfe94d4bd8d63b9ad5a34596dd0eb553/Microsoft.VisualCpp.ATL.X86.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/bd56f23c2b94a99ebba0e40f2b0dab2a05b1c3a4ed3b70337305ee9e78a457c3/Microsoft.VisualCpp.ATL.X86.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.ATL.X86.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.ATL.X86.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.ATL.X86.base.vsix
-    sha256: 95aa47038defe7bf6804690637bf06a38afbc45c521ad38cd26ee3fd3f34133b
-    size: 819855
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/95aa47038defe7bf6804690637bf06a38afbc45c521ad38cd26ee3fd3f34133b/Microsoft.VC.14.38.17.8.ATL.X86.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.ATL.X86.base.vsix
+    sha256: 4cd53b41d94fedddb3164e8932ee617c6dbca9430e8a9ca3c982ee8389b2cbb6
+    size: 819841
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/4cd53b41d94fedddb3164e8932ee617c6dbca9430e8a9ca3c982ee8389b2cbb6/Microsoft.VC.14.39.17.9.ATL.X86.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.MFC.Headers
   payloads:
   - fileName: Microsoft.VisualCpp.MFC.Headers.vsix
-    sha256: 2b316d901c49e95b8b469cbc0b125c2ece35071e2a48b40eec16c6cf7755b175
+    sha256: 5a00ea904714622c9e35b3336158c5743c83ef6ae0adf2b56415e28ae26aafae
     size: 1068
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/2b316d901c49e95b8b469cbc0b125c2ece35071e2a48b40eec16c6cf7755b175/Microsoft.VisualCpp.MFC.Headers.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/5a00ea904714622c9e35b3336158c5743c83ef6ae0adf2b56415e28ae26aafae/Microsoft.VisualCpp.MFC.Headers.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.Headers.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.Headers.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.Headers.base.vsix
-    sha256: cfa5e09aab4cd6de86b89ebec78acc965180fcf665652b7678822c198a75dece
-    size: 2367924
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/cfa5e09aab4cd6de86b89ebec78acc965180fcf665652b7678822c198a75dece/Microsoft.VC.14.38.17.8.MFC.Headers.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.Headers.base.vsix
+    sha256: 8f7b30999c1d349345acfdd44619ba5b5995c729718ec949f3c964d46af31859
+    size: 2367907
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/8f7b30999c1d349345acfdd44619ba5b5995c729718ec949f3c964d46af31859/Microsoft.VC.14.39.17.9.MFC.Headers.base.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.Servicing.MFC
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.Servicing.MFC
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.Servicing.MFC.vsix
-    sha256: 765bbbd571abb629543dfda31012143e40cb864203e08276e2a84ad5823ba8d3
-    size: 1976
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/765bbbd571abb629543dfda31012143e40cb864203e08276e2a84ad5823ba8d3/Microsoft.VC.14.38.17.8.Servicing.MFC.vsix
+  - fileName: Microsoft.VC.14.39.17.9.Servicing.MFC.vsix
+    sha256: c53a3039720f374d82c974832c8f881294294d046ec7b6c3be6af7b9ac14205a
+    size: 1978
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/c53a3039720f374d82c974832c8f881294294d046ec7b6c3be6af7b9ac14205a/Microsoft.VC.14.39.17.9.Servicing.MFC.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.MFC.MBCS
   payloads:
   - fileName: Microsoft.VisualCpp.MFC.MBCS.vsix
-    sha256: 6eb192460fdf0c78a06b0bbe8637a2387344a82db3c80a22aaf1f6374e71e2f6
+    sha256: 01e44b743b0e9c0b75f6e87e9620c7e26107775af89b733c2c89945da40548af
     size: 1067
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/6eb192460fdf0c78a06b0bbe8637a2387344a82db3c80a22aaf1f6374e71e2f6/Microsoft.VisualCpp.MFC.MBCS.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/01e44b743b0e9c0b75f6e87e9620c7e26107775af89b733c2c89945da40548af/Microsoft.VisualCpp.MFC.MBCS.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.MBCS.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.MBCS.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.MBCS.base.vsix
-    sha256: 4c5ccce71fb16ab49516231286f3da5be20083d842c69058a8c2800c7c84e341
-    size: 27604114
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/4c5ccce71fb16ab49516231286f3da5be20083d842c69058a8c2800c7c84e341/Microsoft.VC.14.38.17.8.MFC.MBCS.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.MBCS.base.vsix
+    sha256: d7353be04c5763f6bc1032c67bedfcbd48a74aeba956bea2874c8a94ec9ad554
+    size: 27609806
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/d7353be04c5763f6bc1032c67bedfcbd48a74aeba956bea2874c8a94ec9ad554/Microsoft.VC.14.39.17.9.MFC.MBCS.base.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.MBCS.Debug.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.MBCS.Debug.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.MBCS.Debug.base.vsix
-    sha256: 47490ac31a103d84a983daf763e40e9b0f51c8833592d2c24a49a7bbe6e4650d
-    size: 29750834
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/47490ac31a103d84a983daf763e40e9b0f51c8833592d2c24a49a7bbe6e4650d/Microsoft.VC.14.38.17.8.MFC.MBCS.Debug.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.MBCS.Debug.base.vsix
+    sha256: e0c4dda1839a3ccb0bacd703789949554df99a6615eac4ac962475c92f20e053
+    size: 29745462
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/e0c4dda1839a3ccb0bacd703789949554df99a6615eac4ac962475c92f20e053/Microsoft.VC.14.39.17.9.MFC.MBCS.Debug.base.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.MBCS.X64.Debug.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.MBCS.X64.Debug.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.MBCS.X64.Debug.base.vsix
-    sha256: 0ad474786014e89355d10fabfb25129835e9b729093263068c366e431c3269c4
-    size: 33464075
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/0ad474786014e89355d10fabfb25129835e9b729093263068c366e431c3269c4/Microsoft.VC.14.38.17.8.MFC.MBCS.X64.Debug.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.MBCS.X64.Debug.base.vsix
+    sha256: 4a9d16dece40394fa9194a11d8117eea1ce5260fd7fc341c250b5b0de73ce717
+    size: 33463870
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/4a9d16dece40394fa9194a11d8117eea1ce5260fd7fc341c250b5b0de73ce717/Microsoft.VC.14.39.17.9.MFC.MBCS.X64.Debug.base.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.MBCS.X64.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.MBCS.X64.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.MBCS.X64.base.vsix
-    sha256: c28ffa4773805b27c4ee1fb60698ddf79ac26707c11ca13c98c11a8a5131ac24
-    size: 30610725
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/c28ffa4773805b27c4ee1fb60698ddf79ac26707c11ca13c98c11a8a5131ac24/Microsoft.VC.14.38.17.8.MFC.MBCS.X64.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.MBCS.X64.base.vsix
+    sha256: 58be53fa7d34762b93b335ffa39796c82fb062c0745857101d6605c61fb449eb
+    size: 30605201
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/58be53fa7d34762b93b335ffa39796c82fb062c0745857101d6605c61fb449eb/Microsoft.VC.14.39.17.9.MFC.MBCS.X64.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.MFC.MBCS.X64
   payloads:
   - fileName: Microsoft.VisualCpp.MFC.MBCS.X64.vsix
-    sha256: f0a7144f72a223213924cf8fe1bed14eedc7961413b61f90098efee06919a928
-    size: 1072
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/f0a7144f72a223213924cf8fe1bed14eedc7961413b61f90098efee06919a928/Microsoft.VisualCpp.MFC.MBCS.X64.vsix
+    sha256: f3414d0e2de95608f72e309e01fff9a2f9b78e98ae305932d1bf0c81e90d492d
+    size: 1071
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/f3414d0e2de95608f72e309e01fff9a2f9b78e98ae305932d1bf0c81e90d492d/Microsoft.VisualCpp.MFC.MBCS.X64.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.MFC.Redist.X64
   payloads:
   - fileName: Microsoft.VisualCpp.MFC.Redist.X64.vsix
-    sha256: 7b8c780ea74ef0aee4c73739dbff380250c7984852e8ed8cb2c20457d3e406c9
+    sha256: e421941e513d9d6121fc6d76f0cf38ff8813705561085bc6b869ef640371cbd1
     size: 1073
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/7b8c780ea74ef0aee4c73739dbff380250c7984852e8ed8cb2c20457d3e406c9/Microsoft.VisualCpp.MFC.Redist.X64.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/e421941e513d9d6121fc6d76f0cf38ff8813705561085bc6b869ef640371cbd1/Microsoft.VisualCpp.MFC.Redist.X64.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Microsoft.VC.14.38.17.8.MFC.Redist.X64.base
   payloads:
   - fileName: Microsoft.VC.14.38.17.8.MFC.Redist.X64.base.vsix
-    sha256: 73cab73114336524666b538c651b3cf79a4d1da02b77d6bfb2dc184b2d665988
-    size: 13809366
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/73cab73114336524666b538c651b3cf79a4d1da02b77d6bfb2dc184b2d665988/Microsoft.VC.14.38.17.8.MFC.Redist.X64.base.vsix
+    sha256: 35eee9475a1dac791f92a007c967edf2e7483bc252c2bb00b8c7817e1db417d6
+    size: 13800745
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/35eee9475a1dac791f92a007c967edf2e7483bc252c2bb00b8c7817e1db417d6/Microsoft.VC.14.38.17.8.MFC.Redist.X64.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Microsoft.VisualCpp.MFC.Redist.X86
   payloads:
   - fileName: Microsoft.VisualCpp.MFC.Redist.X86.vsix
-    sha256: 10df2818a89d121fb921d81834b8764c99a2ca505da78a06ace06c4c413c82e7
+    sha256: 5ac252c19af4d0e2abd33b9fd5510b3bae49c120985a845af00f8353ee737345
     size: 1073
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/10df2818a89d121fb921d81834b8764c99a2ca505da78a06ace06c4c413c82e7/Microsoft.VisualCpp.MFC.Redist.X86.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/5ac252c19af4d0e2abd33b9fd5510b3bae49c120985a845af00f8353ee737345/Microsoft.VisualCpp.MFC.Redist.X86.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Microsoft.VC.14.38.17.8.MFC.Redist.X86.base
   payloads:
   - fileName: Microsoft.VC.14.38.17.8.MFC.Redist.X86.base.vsix
-    sha256: c7ed3d46fbf65acafa5347edbf0571277395ec6a57c00a2c1182649cf722722c
-    size: 13290535
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/c7ed3d46fbf65acafa5347edbf0571277395ec6a57c00a2c1182649cf722722c/Microsoft.VC.14.38.17.8.MFC.Redist.X86.base.vsix
+    sha256: 0b10aa2079025fa810f84b6a7f189e3c5982db0867e3881bceeda1cee207ebd6
+    size: 13296377
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/0b10aa2079025fa810f84b6a7f189e3c5982db0867e3881bceeda1cee207ebd6/Microsoft.VC.14.38.17.8.MFC.Redist.X86.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Microsoft.VisualCpp.MFC.Source
   payloads:
   - fileName: Microsoft.VisualCpp.MFC.Source.vsix
-    sha256: 918eeb015a6f9d0032ba0a723e4e91c0b937f0df779664abcdfc5a85f6707f7a
+    sha256: 7f0e8c691a684523c7624d22f7cb864a5c20fdb85d55ccd04595bb60067bce39
     size: 1068
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/918eeb015a6f9d0032ba0a723e4e91c0b937f0df779664abcdfc5a85f6707f7a/Microsoft.VisualCpp.MFC.Source.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/7f0e8c691a684523c7624d22f7cb864a5c20fdb85d55ccd04595bb60067bce39/Microsoft.VisualCpp.MFC.Source.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.Source.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.Source.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.Source.base.vsix
-    sha256: ae65c9a5c51d28f40acde3f95e566903ebd199e0a60a04a715c1c1620394fc34
-    size: 2304582
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/ae65c9a5c51d28f40acde3f95e566903ebd199e0a60a04a715c1c1620394fc34/Microsoft.VC.14.38.17.8.MFC.Source.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.Source.base.vsix
+    sha256: d2cb31b3e9432b07ef52d63817908ac90ecb7ba75cbc49f9266f0c28eda89cab
+    size: 2304566
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/d2cb31b3e9432b07ef52d63817908ac90ecb7ba75cbc49f9266f0c28eda89cab/Microsoft.VC.14.39.17.9.MFC.Source.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.MFC.X64
   payloads:
   - fileName: Microsoft.VisualCpp.MFC.X64.vsix
-    sha256: 580e19f8442b3f550f37d6a3ea4355851dbbf034b02c801b1776f32d45b62962
+    sha256: b9967b11bfefb65c9960a5d20d59061b519615122e6a43610efffbfca4615d2c
     size: 1068
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/580e19f8442b3f550f37d6a3ea4355851dbbf034b02c801b1776f32d45b62962/Microsoft.VisualCpp.MFC.X64.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/b9967b11bfefb65c9960a5d20d59061b519615122e6a43610efffbfca4615d2c/Microsoft.VisualCpp.MFC.X64.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.X64.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.X64.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.X64.base.vsix
-    sha256: 40a8f6bcf6146b62b69743ea184c4fa5ad86a4b780b41d8f687d940b47281444
-    size: 33147515
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/40a8f6bcf6146b62b69743ea184c4fa5ad86a4b780b41d8f687d940b47281444/Microsoft.VC.14.38.17.8.MFC.X64.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.X64.base.vsix
+    sha256: 74f49a098f8f2574a6d1c25c9553f40bd0ea7e87b1126e11237c5b4b286795c7
+    size: 33150316
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/74f49a098f8f2574a6d1c25c9553f40bd0ea7e87b1126e11237c5b4b286795c7/Microsoft.VC.14.39.17.9.MFC.X64.base.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.X64.Debug.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.X64.Debug.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.X64.Debug.base.vsix
-    sha256: 30536ca264dc6836a2911b9aed31b614d0739c98dab97ebb36f70f1cce3b985c
-    size: 35632802
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/30536ca264dc6836a2911b9aed31b614d0739c98dab97ebb36f70f1cce3b985c/Microsoft.VC.14.38.17.8.MFC.X64.Debug.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.X64.Debug.base.vsix
+    sha256: 3362cd866b81951b15c94c24cba60355ced55220938b1f8d148394bab244314f
+    size: 35629454
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/3362cd866b81951b15c94c24cba60355ced55220938b1f8d148394bab244314f/Microsoft.VC.14.39.17.9.MFC.X64.Debug.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.MFC.X86
   payloads:
   - fileName: Microsoft.VisualCpp.MFC.X86.vsix
-    sha256: 3f90b7461916e728d2e1b403ac4ca35aa7c96b339b32dbd5d0e34a24a62fa120
+    sha256: 2cd1933a87ca5f44fe212427c4a4b2a4c5b7a5da78a47df052986dc33d290059
     size: 1068
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/3f90b7461916e728d2e1b403ac4ca35aa7c96b339b32dbd5d0e34a24a62fa120/Microsoft.VisualCpp.MFC.X86.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/2cd1933a87ca5f44fe212427c4a4b2a4c5b7a5da78a47df052986dc33d290059/Microsoft.VisualCpp.MFC.X86.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.X86.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.X86.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.X86.base.vsix
-    sha256: a05ed24be7c1fd2c359f83cf40e18946e9407778cc413e2808c7ec9f17423c13
-    size: 30255389
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/a05ed24be7c1fd2c359f83cf40e18946e9407778cc413e2808c7ec9f17423c13/Microsoft.VC.14.38.17.8.MFC.X86.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.X86.base.vsix
+    sha256: 773a36f75180904d4923c25f9d0403c6a9511022a77505533413b8b5f3dc13cd
+    size: 30256582
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/773a36f75180904d4923c25f9d0403c6a9511022a77505533413b8b5f3dc13cd/Microsoft.VC.14.39.17.9.MFC.X86.base.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.X86.Debug.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.X86.Debug.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.X86.Debug.base.vsix
-    sha256: 6b5b241f11261763bcbc822b7c5265c65385cbb5d6c88a0eab3f580087101ef6
-    size: 32185940
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/6b5b241f11261763bcbc822b7c5265c65385cbb5d6c88a0eab3f580087101ef6/Microsoft.VC.14.38.17.8.MFC.X86.Debug.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.X86.Debug.base.vsix
+    sha256: 05f3a6b3d239cabac247af43a4807499dca88f427a1220670ad68970b00c18ba
+    size: 32183823
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/05f3a6b3d239cabac247af43a4807499dca88f427a1220670ad68970b00c18ba/Microsoft.VC.14.39.17.9.MFC.X86.Debug.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.MFC.ARM64
   payloads:
   - fileName: Microsoft.VisualCpp.MFC.ARM64.vsix
-    sha256: c2b6f39c78b82a67e64bc1cf5aaad0711d13b1e5a9b96727f2aa42002e40b933
+    sha256: 692186b2102070b84ad0bd7bd6eed5795ba3a4c483c287c9ed3d2e24192b01e6
     size: 1069
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/c2b6f39c78b82a67e64bc1cf5aaad0711d13b1e5a9b96727f2aa42002e40b933/Microsoft.VisualCpp.MFC.ARM64.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/692186b2102070b84ad0bd7bd6eed5795ba3a4c483c287c9ed3d2e24192b01e6/Microsoft.VisualCpp.MFC.ARM64.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.ARM64.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.ARM64.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.ARM64.base.vsix
-    sha256: 03bfd6d226550c9a279f0605347f53db93ae8818e2c646a54d1d88458881644a
-    size: 72836942
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/03bfd6d226550c9a279f0605347f53db93ae8818e2c646a54d1d88458881644a/Microsoft.VC.14.38.17.8.MFC.ARM64.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.ARM64.base.vsix
+    sha256: d155f3f28380fa2a13341bc2b03fcb165a1dec1b05ac744557be973423c2af32
+    size: 72197025
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/d155f3f28380fa2a13341bc2b03fcb165a1dec1b05ac744557be973423c2af32/Microsoft.VC.14.39.17.9.MFC.ARM64.base.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.ARM64.Debug.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.ARM64.Debug.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.ARM64.Debug.base.vsix
-    sha256: 6365314c3b2ea5e291f450c025ff256351754780782586660f1d41520e089017
-    size: 77680874
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/6365314c3b2ea5e291f450c025ff256351754780782586660f1d41520e089017/Microsoft.VC.14.38.17.8.MFC.ARM64.Debug.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.ARM64.Debug.base.vsix
+    sha256: 1f971e711a7a60e08946524294bfab8a2277fe6c1ad75e4afcd554420c2247ed
+    size: 77679108
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/1f971e711a7a60e08946524294bfab8a2277fe6c1ad75e4afcd554420c2247ed/Microsoft.VC.14.39.17.9.MFC.ARM64.Debug.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.MFC.MBCS.arm64
   payloads:
   - fileName: Microsoft.VisualCpp.MFC.MBCS.arm64.vsix
-    sha256: a25949d36cbbd7a66966417cd2056c1d4938f1c1744c05f90a6dd7af0e21f490
+    sha256: bca71b0fae487f0b415f4f39247fa78b18bfb3e60db761db2d7090e685030af4
     size: 1072
-    url: https://download.visualstudio.microsoft.com/download/pr/a1a6b2f9-265a-407c-bb15-ddd8d5a802f4/a25949d36cbbd7a66966417cd2056c1d4938f1c1744c05f90a6dd7af0e21f490/Microsoft.VisualCpp.MFC.MBCS.arm64.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/bca71b0fae487f0b415f4f39247fa78b18bfb3e60db761db2d7090e685030af4/Microsoft.VisualCpp.MFC.MBCS.arm64.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.MBCS.arm64.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.MBCS.arm64.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.MBCS.arm64.base.vsix
-    sha256: e281a38207a0b1a9430e8761bebffbd8b99b11518dba3a0cd6bc9357f87d6bf2
-    size: 67964584
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/e281a38207a0b1a9430e8761bebffbd8b99b11518dba3a0cd6bc9357f87d6bf2/Microsoft.VC.14.38.17.8.MFC.MBCS.arm64.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.MBCS.arm64.base.vsix
+    sha256: 7f5041d40a7f000f2da498926b50310c0bfaa89b7aca99e2ee896065296abfa3
+    size: 67395739
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/7f5041d40a7f000f2da498926b50310c0bfaa89b7aca99e2ee896065296abfa3/Microsoft.VC.14.39.17.9.MFC.MBCS.arm64.base.vsix
   type: Vsix
-  version: 14.38.33130
-- id: Microsoft.VC.14.38.17.8.MFC.MBCS.arm64.Debug.base
+  version: 14.39.33519
+- id: Microsoft.VC.14.39.17.9.MFC.MBCS.arm64.Debug.base
   payloads:
-  - fileName: Microsoft.VC.14.38.17.8.MFC.MBCS.arm64.Debug.base.vsix
-    sha256: 65db122886a39e6554cf5372f699cbf41f3f8e9167c942cac7bdda59b3cb1267
-    size: 73670936
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/65db122886a39e6554cf5372f699cbf41f3f8e9167c942cac7bdda59b3cb1267/Microsoft.VC.14.38.17.8.MFC.MBCS.arm64.Debug.base.vsix
+  - fileName: Microsoft.VC.14.39.17.9.MFC.MBCS.arm64.Debug.base.vsix
+    sha256: 5376f7d0a67e11c5ee2b634c04cf7b5a41558d518fa7deb2cbc0367a171f7ab6
+    size: 73669171
+    url: https://download.visualstudio.microsoft.com/download/pr/ec3eaa61-e46b-4bc9-8f37-6de6009fd3f6/5376f7d0a67e11c5ee2b634c04cf7b5a41558d518fa7deb2cbc0367a171f7ab6/Microsoft.VC.14.39.17.9.MFC.MBCS.arm64.Debug.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.39.33519
 - id: Microsoft.VisualCpp.MFC.Redist.ARM64
   payloads:
   - fileName: Microsoft.VisualCpp.MFC.Redist.ARM64.vsix
-    sha256: 2c61b6ec42f80ec5dfbc581982de0720b1744362ba3da6d35e958e15ecc896ee
+    sha256: cc13496a2fddd01f0ff21f50a1f733088f6b16a768406581adba222fe6bc22e8
     size: 1075
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/2c61b6ec42f80ec5dfbc581982de0720b1744362ba3da6d35e958e15ecc896ee/Microsoft.VisualCpp.MFC.Redist.ARM64.vsix
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/cc13496a2fddd01f0ff21f50a1f733088f6b16a768406581adba222fe6bc22e8/Microsoft.VisualCpp.MFC.Redist.ARM64.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Microsoft.VC.14.38.17.8.MFC.Redist.ARM64.base
   payloads:
   - fileName: Microsoft.VC.14.38.17.8.MFC.Redist.ARM64.base.vsix
-    sha256: d5871d9597312fcd26e539c0cae98094f3d31069bdf3be9cb88ce7b1fc6fa6d3
-    size: 22833274
-    url: https://download.visualstudio.microsoft.com/download/pr/4276ad73-5c96-443c-be24-4ecb1784abb4/d5871d9597312fcd26e539c0cae98094f3d31069bdf3be9cb88ce7b1fc6fa6d3/Microsoft.VC.14.38.17.8.MFC.Redist.ARM64.base.vsix
+    sha256: 70905fe506221de3aa3d616f939b31ca198cae74b4401790638795c7d0baeb5a
+    size: 22834614
+    url: https://download.visualstudio.microsoft.com/download/pr/4b919316-9f9a-436c-b6f6-8518d090c5bd/70905fe506221de3aa3d616f939b31ca198cae74b4401790638795c7d0baeb5a/Microsoft.VC.14.38.17.8.MFC.Redist.ARM64.base.vsix
   type: Vsix
-  version: 14.38.33130
+  version: 14.38.33135
 - id: Win11SDK_10.0.22621
   payloads:
   - fileName: Installers\03fbc2dfe9d3e7bb2389c7ed18c6ad3e.cab
@@ -1414,14 +1527,6 @@
     sha256: 8A47D1E5AF254767767FBAD4A0D8BD61D89693FAE9C31081EDDADA615AF82173
     size: 1925120
     url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/c15b190bd50f25ddc676dca0515251bc/winappdeploy-x86_en-us.msi
-  - fileName: Installers\Windows App Certification Kit Native Components-x64_en-us.msi
-    sha256: CB416B9ECF1BA695A1D6E4184D9599E27D015682760049211069D473D4AD10B2
-    size: 466944
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/f772939181c88349573dc967b1548a63/windows%20app%20certification%20kit%20native%20components-x64_en-us.msi
-  - fileName: Installers\Windows App Certification Kit Native Components-x86_en-us.msi
-    sha256: 0911A2A8ED3370258AE66DED7C8FAC49F0003DEBB858A530331052377D82F4C6
-    size: 466944
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/221c659559ab977717779453b2cd995e/windows%20app%20certification%20kit%20native%20components-x86_en-us.msi
   - fileName: Installers\Windows App Certification Kit SupportedApiList ARM-arm_en-us.msi
     sha256: 961515D62214C5F1B4F5FE01A3C3541FEE4E73736896BD2A822667F00FFC7207
     size: 376832
@@ -1446,26 +1551,14 @@
     sha256: 92545986067D8A1B4593A69408EED919124D31B01550F5052FD214B2CF29346A
     size: 544768
     url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/9d9484d638e38b09e931eddc3e5d7a80/windows%20app%20certification%20kit%20x86-x86_en-us.msi
-  - fileName: Installers\Windows Desktop Extension SDK Contracts-x86_en-us.msi
-    sha256: 87B6761B3FC975DF750724B5753383D40012959628CB04E55478C5C6C42B63C3
-    size: 425984
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/0685c71486a422fe099a322e6d3f8db7/windows%20desktop%20extension%20sdk%20contracts-x86_en-us.msi
   - fileName: Installers\Windows Desktop Extension SDK-x86_en-us.msi
     sha256: 006B5F3BEAAB0770B58AE8689C35D03ED026A2848964CF762F6D3544C279300C
     size: 405504
     url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/6d2fd0939b09281121bf802f87efadfc/windows%20desktop%20extension%20sdk-x86_en-us.msi
-  - fileName: Installers\Windows IoT Extension SDK Contracts-x86_en-us.msi
-    sha256: 9EE722A1DECA663B8DC2A35BB90B328D15C9589C80826DFEBF9F4A1279E32401
-    size: 401408
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/11edd6bb213f2351e7667c5561c8f55e/windows%20iot%20extension%20sdk%20contracts-x86_en-us.msi
   - fileName: Installers\Windows IoT Extension SDK-x86_en-us.msi
     sha256: 372BA9F8FF8E94D3931D657856549A1D6286732F10AA66CEED7C15F38C0C2178
     size: 401408
     url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/affc08dcd23449dd6dc1364e824068d3/windows%20iot%20extension%20sdk-x86_en-us.msi
-  - fileName: Installers\Windows Mobile Extension SDK Contracts-x86_en-us.msi
-    sha256: 3439D3F4A5B012D67A5421A0495444B927DA714001B23502CE591226E8A81DEE
-    size: 409600
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/82b1fd61f04afca31e1f14cdf2730888/windows%20mobile%20extension%20sdk%20contracts-x86_en-us.msi
   - fileName: Installers\Windows Mobile Extension SDK-x86_en-us.msi
     sha256: 42742D42EDCE01827717FC5C6C4B29B1BD2398A1AF4CE575BE330C8F9B58AABD
     size: 417792
@@ -1538,10 +1631,6 @@
     sha256: 5F6EFB27B94F882D9623DB66F642AB4A998E76BAC3885D5528A2B67A244918A0
     size: 405504
     url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/67bec769969331d59a01da014e02e9a2/windows%20sdk%20facade%20windows%20winmd%20versioned-x86_en-us.msi
-  - fileName: Installers\Windows SDK for Windows Store Apps Contracts-x86_en-us.msi
-    sha256: 71BB4876B2AF91230221F0871D73DCB280760DF2882D35759D0F6C7C265704DD
-    size: 421888
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/6c12a2145bf6f488cd07a852b200d6a2/windows%20sdk%20for%20windows%20store%20apps%20contracts-x86_en-us.msi
   - fileName: Installers\Windows SDK for Windows Store Apps DirectX ARM Remote-arm_en-us.msi
     sha256: 8E8D8CECC48365E363A71A8E2F2A080E70FAC2B5CAF6E3AFEFADA9A2DE63CFEC
     size: 380928
@@ -1602,54 +1691,246 @@
     sha256: 79412A73A3A388B35EF76668EDBB54677095EC8797B658801E0FF8D6C703FE5D
     size: 417792
     url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/f9922b347fd4053bd51f06d59d57f712/windows%20sdk-x86_en-us.msi
-  - fileName: Installers\Windows Team Extension SDK Contracts-x86_en-us.msi
-    sha256: BE759923517C20756E2C02A1CA4D7DA9A2D54D0BA4B556B09B6EE6472768FAE7
-    size: 405504
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/ff323953923d74e1a4e968e91f1b1301/windows%20team%20extension%20sdk%20contracts-x86_en-us.msi
   - fileName: Installers\Windows Team Extension SDK-x86_en-us.msi
     sha256: 5F2E1611458F9C3285C5BEA0E1899B404D1EE216956D364B7F490F3C8A0F06CD
     size: 405504
     url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/a3db1a29c805894b4f739fb5143db381/windows%20team%20extension%20sdk-x86_en-us.msi
-  - fileName: Installers\WinRT Intellisense Desktop - en-us-x86_en-us.msi
-    sha256: 9D2E6E7FA33C132361AE0F696F6A293BFE0427CCA4F78F992E6F706F290285E0
-    size: 450560
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/6e51bed2dd7f2ffc2f5ee6084fa22d26/winrt%20intellisense%20desktop%20-%20en-us-x86_en-us.msi
-  - fileName: Installers\WinRT Intellisense Desktop - Other Languages-x86_en-us.msi
-    sha256: AD5323B30A722DA01E299EC63D56B351B3D18518E3A18559E21ECA693A84F66D
-    size: 557056
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/6eb95317172afed4d8a51bbce42dfc70/winrt%20intellisense%20desktop%20-%20other%20languages-x86_en-us.msi
-  - fileName: Installers\WinRT Intellisense IoT - en-us-x86_en-us.msi
-    sha256: 74E8E28FD4D326667CECBCA44FB3733AECB5F6D127987AE8DBC857D9A8465975
-    size: 401408
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/b00b793779f61414bbb00b9509979bf5/winrt%20intellisense%20iot%20-%20en-us-x86_en-us.msi
-  - fileName: Installers\WinRT Intellisense IoT - Other Languages-x86_en-us.msi
-    sha256: 3FD42B8E9BDD0E101BC2291E6FD033440B86F4D470D0781CDDC43EBCACF06EB9
-    size: 401408
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/14a25708590bcaee79dafdc2d1b52618/winrt%20intellisense%20iot%20-%20other%20languages-x86_en-us.msi
-  - fileName: Installers\WinRT Intellisense Mobile - en-us-x86_en-us.msi
-    sha256: B0B37C34FABDF661FBA17EF7C55F44CD511F7A0F9840EC5F5C7503A79FA7C533
-    size: 409600
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/676362b4bd152ca87942011a5c9c79d3/winrt%20intellisense%20mobile%20-%20en-us-x86_en-us.msi
-  - fileName: Installers\WinRT Intellisense PPI - en-us-x86_en-us.msi
-    sha256: D34C7CE6008EAB5C443A4743E2AA3EA9DAC8B61A00FC1407818F87E5FE91B788
-    size: 401408
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/06d7c0876e4ff340b25338069f0a1c5e/winrt%20intellisense%20ppi%20-%20en-us-x86_en-us.msi
-  - fileName: Installers\WinRT Intellisense PPI - Other Languages-x86_en-us.msi
-    sha256: 3DA078CBCF1BAF2DE94B944EEEA98FE2495EB084C2AD025C715FDB252041E44C
-    size: 401408
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/086cf8a07fabe78870d222815f9e86f5/winrt%20intellisense%20ppi%20-%20other%20languages-x86_en-us.msi
-  - fileName: Installers\WinRT Intellisense UAP - en-us-x86_en-us.msi
-    sha256: 8C1E8BB7395969449CB11ABD12DCC65107569F71B48D75DBA40E12837BA3483E
-    size: 438272
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/d5cd1f69d20002b3d97e9e94b5a4ffca/winrt%20intellisense%20uap%20-%20en-us-x86_en-us.msi
-  - fileName: Installers\WinRT Intellisense UAP - Other Languages-x86_en-us.msi
-    sha256: DD26A598E6C4279214CAF0791B4B1CABED91135C44520B0EFB372A0DD378A32B
-    size: 507904
-    url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/ae2f6b381f4690f936a2b45a2ded569d/winrt%20intellisense%20uap%20-%20other%20languages-x86_en-us.msi
   - fileName: Redistributable\10.1.0.0\UAPSDKAddOn-x86.msi
     sha256: C7E425D05559A1BE94A1CE794A8D33ECF1CD2B05BF8D51E998C4EE098349E853
     size: 221184
     url: https://download.visualstudio.microsoft.com/download/pr/c001d4bb-6b32-4ca0-896e-7e0e82df71eb/45514db3ac1acd367ac9f365bd338940/uapsdkaddon-x86.msi
+  - fileName: Installers\e680f23450a21a27b2077dbdc08ca430.cab
+    sha256: C0D52C77E727442CF613E2B93E210FE71C4B4BB8F78560CAFBC555884F86398F
+    size: 5016970
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/cc1fb626414a2ef378f089bed0da2690/e680f23450a21a27b2077dbdc08ca430.cab
+  - fileName: Installers\0253f7df0974f9d7169b410d812a5385.cab
+    sha256: BB572FE32B8EDBAF55CF0850D080B0A29B4C3E029D5E392BA2E6206ABECF5556
+    size: 8234084
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/113aa8dbc9d69c1dbbf042b816218a7e/0253f7df0974f9d7169b410d812a5385.cab
+  - fileName: Installers\e8bc712abeffd7c9711ee3f55d4aa99b.cab
+    sha256: 990A96F3BEC365176B4A3E083AC9E346FF75E41EDA10E32A6AE3CDBE437C7FF0
+    size: 1059969
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/f970cf8826b3e6a388dffbd3ce5f35db/e8bc712abeffd7c9711ee3f55d4aa99b.cab
+  - fileName: Installers\7178f554c01f912c749b622564106b02.cab
+    sha256: 724E720CE3B3715A8746DF9316C7F4E9294DF6B414BE6A8D0C033D58ADFAB838
+    size: 1141278
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/061af5895766d8eeb0f1e9e8c2560d4b/7178f554c01f912c749b622564106b02.cab
+  - fileName: Installers\72bda6e16f5c7a040361c1304b4b5b36.cab
+    sha256: 4B390B7C8F3D270B0D19923A980F9D177107CBAD9A4EF2070353FD1ECA365CD5
+    size: 7808472
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/3c8ac3d543fb9b1393253fb062e123ba/72bda6e16f5c7a040361c1304b4b5b36.cab
+  - fileName: Installers\75b302463eed0d9b6ef9f29ebb655ef9.cab
+    sha256: 1595A4A5D3D3E9EDE5B3122DA5661AB53A19D2EE931EDCDF33D57BB6C91BF7DC
+    size: 271043
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/fbb66eb5e72b4a57d2da919a4c91e23b/75b302463eed0d9b6ef9f29ebb655ef9.cab
+  - fileName: Installers\114c321d61ae77816824fed67cd25704.cab
+    sha256: 689B3E15F57E11E9ADBF0F69B8631966DEBA24824A43C9564FBE84DEA72A152C
+    size: 369041
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/4ac5ed9736c1249ef7275407538542b0/114c321d61ae77816824fed67cd25704.cab
+  - fileName: Installers\f524b9054edb102e11fe3850fc6796ca.cab
+    sha256: AA3E1A7C2D3F2FA124F896F4381EFE7C393174BBF949C745A0FF639F3342DBCC
+    size: 418407
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/2c013e69a34d0971499242d09541f85b/f524b9054edb102e11fe3850fc6796ca.cab
+  - fileName: Installers\fe80f1b6d4cf60c919f4b3a0cd2f4306.cab
+    sha256: 7F00499B7B279714187EF275A098B088D7D8B14AFF340E258777F800AD7981C7
+    size: 2150562
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/48f82b248a3def413d7205f50deaa37a/fe80f1b6d4cf60c919f4b3a0cd2f4306.cab
+  - fileName: Installers\79e9b68a34bc84ab465fe1b79b84a325.cab
+    sha256: 366817856550D778173B691CBDCF1E9C447846378B246674F74D5B814ADC1D45
+    size: 792978
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/6c23461b864f04993d2ee4aa16435809/79e9b68a34bc84ab465fe1b79b84a325.cab
+  - fileName: Installers\1a822224523be67061edcc97f6c0e36a.cab
+    sha256: A305D9F486DA1363665DED87F070EE8B871F3317F0455D0A18059C140F814831
+    size: 910220
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/f01b938ca48dfa834ce263f939ba7982/1a822224523be67061edcc97f6c0e36a.cab
+  - fileName: Installers\7ba8bd916cfe6a56d86eaab1543d1205.cab
+    sha256: D05F48E54D1E5045190BA6E97F906304B11B635913320BCBC855BBDB49D68D9D
+    size: 3021501
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/28bfe84f629617f7cfb88cb346eb52ac/7ba8bd916cfe6a56d86eaab1543d1205.cab
+  - fileName: Installers\7cb1ba9318f4b586c6a3bdd541e7f3ad.cab
+    sha256: 816F42ED985807AF437F2DF3691A3EF26A721A9BBD3FD2CFBB38E2B909FD32D0
+    size: 16511
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/261bc9ca5e1d5f396ed1a5404ba85003/7cb1ba9318f4b586c6a3bdd541e7f3ad.cab
+  - fileName: Installers\802a07e87c65fbd441584c31e8bb0ea7.cab
+    sha256: CD3678A81D1FB2F34832921A1569218E422B4B51B8A0C54504DC632F98943794
+    size: 56641
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/d46265bce37fbebe84cb4a4d9ec1066c/802a07e87c65fbd441584c31e8bb0ea7.cab
+  - fileName: Installers\2c1331a0f4ecc46dfa39f43a575305e0.cab
+    sha256: B4EAB16C2ADED6E01F6C9BAB216376BF39B77878C117450B54A99CABF2C5BA26
+    size: 1082994
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/da25c7d7ad07745658ac2670e5603ac1/2c1331a0f4ecc46dfa39f43a575305e0.cab
+  - fileName: Installers\2c1817d3f3f33cd01376c5ec441cc636.cab
+    sha256: 22C9A3C719EA8045AB29E8FB3381BF29B055CACD4D366E66B6DA8F17CD2E7567
+    size: 24711
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/8b391c36fe3ac92fd8bed4846cc4120c/2c1817d3f3f33cd01376c5ec441cc636.cab
+  - fileName: Installers\8eb01de6160e8924be8582861808a9b5.cab
+    sha256: 78996ABD53C993425BD04159087507584F6E0A9946031774B96D44C94E612297
+    size: 276698
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/3096f80a9c08295b8921f291aaf4d538/8eb01de6160e8924be8582861808a9b5.cab
+  - fileName: Installers\8f636cea16f07b14f423402afc69cf83.cab
+    sha256: 3554F41F8DDD33DBB29F28E6227DC56413AD56BF6274A738BC6E90F21C2B72A4
+    size: 2307898
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/e652adeb453d0e20e781987125c20bdd/8f636cea16f07b14f423402afc69cf83.cab
+  - fileName: Installers\2f7b48ba67113253720675dbbbe9df33.cab
+    sha256: 8BE6643CA3680506B4428BC07368F8746ABCFC52121F9D08B05B91D7A12AB79E
+    size: 641097
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/4317e98f3f8f004e96d1956bb08757d0/2f7b48ba67113253720675dbbbe9df33.cab
+  - fileName: Installers\34ee98a7c9420178c55f176f75c3fe10.cab
+    sha256: 7789CD603B841F7B7618AAFCF0CF36601042BECC4081D905C0604AC40297A76A
+    size: 2765508
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/51053c5d0e1c12fd7a29a9104ad20ba8/34ee98a7c9420178c55f176f75c3fe10.cab
+  - fileName: Installers\34ef8c7e30b6852e56ba7a56fb7b3faa.cab
+    sha256: 4B379C6E0C452BDD4655711D3A6FFE1F067BD8CED5DC5CBD800ED1C9AACA133A
+    size: 24437
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/5211e82b63a95140eb54d904bbfd2403/34ef8c7e30b6852e56ba7a56fb7b3faa.cab
+  - fileName: Installers\3960f55df7c8073f3997269e5e390abc.cab
+    sha256: 181185A7749D45E225EEE4BBEA9865302B17D97FEEA2A7C4C24367D81F902990
+    size: 16501
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/1d7e837b02a41e674bcc325cc3136917/3960f55df7c8073f3997269e5e390abc.cab
+  - fileName: Installers\3a53dffe0b4548753bc34825894f19bf.cab
+    sha256: F79B8E02A7CC7B572E64ABE40AE6091762CA485F404F0C7C74F7B9CE018C9CEF
+    size: 385398
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/b856aeb7cf7ae3ddd0ca7d4b68d571a7/3a53dffe0b4548753bc34825894f19bf.cab
+  - fileName: Installers\96e8f767221532c6446fd1b8dad53b60.cab
+    sha256: DD38DBFCE78987FD6C74ED5167DFF5E12EDFD388D28565BAC59DBD6F7E062BFA
+    size: 1181790
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/f2bd303353e33bba42ee963f8948cc34/96e8f767221532c6446fd1b8dad53b60.cab
+  - fileName: Installers\3bcfd9f5ea63604c64ec7e0f5455a840.cab
+    sha256: 5FA127FD90BBF5BE84C1D26905ED3A686B3833AB9AA55E27E272B5DE95A60FDD
+    size: 385682
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/70397c6c6242a11a8572ed03ce314e79/3bcfd9f5ea63604c64ec7e0f5455a840.cab
+  - fileName: Installers\3ca392fde3898c3be052ddcddd14bb5f.cab
+    sha256: 8FF6023DF336B7C740FBEA0263962306B01D2ACAA8678C21463D52248FFFF477
+    size: 7512549
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/0f07b90f1b268163069d9e006b6d3ac9/3ca392fde3898c3be052ddcddd14bb5f.cab
+  - fileName: Installers\9f17b927fd84ebb5ee0df0774c0c568f.cab
+    sha256: 49A415F159A65D1EA332EF01572F2F3BF571A0AEF6C90D1F82E193D9A04AB2B6
+    size: 913632
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/0b8bcbbbe3f29a80519e74cabf5448af/9f17b927fd84ebb5ee0df0774c0c568f.cab
+  - fileName: Installers\9fff62eb37dba61a297941c75287dfec.cab
+    sha256: A534158F87B67336861DF7795A062292580751F998E7FAA2C55A855208A340D9
+    size: 31504
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/103adf4a13f768ebaf9bb9b406209a0d/9fff62eb37dba61a297941c75287dfec.cab
+  - fileName: Installers\4040fdfbcd753e650c0e3a5bce3ed7a2.cab
+    sha256: E738B1238F9436E49C1BB095FE1FC7FCDD3D0F247852C0A775A342BE68B33641
+    size: 24142
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/40054e2e934fb88d13fdb7e812f3dc82/4040fdfbcd753e650c0e3a5bce3ed7a2.cab
+  - fileName: Installers\412c1caad96b8fe5e8f7f6735585f297.cab
+    sha256: 45596E91709DC5DE88534CC93D91D9257ACBFC6903B5E307458438A4B8AB445D
+    size: 198604
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/bf09b0e55684149fe2de759fd5cbe0ca/412c1caad96b8fe5e8f7f6735585f297.cab
+  - fileName: Installers\437e52bd67ebe977a8957439db5ecf75.cab
+    sha256: 1FDFBF85FE94209B03539AE29B096B256C03A84EBE33E0BAD3EA7E57036EEB19
+    size: 2795360
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/80ed4e5d15993a771441e179b8fc028f/437e52bd67ebe977a8957439db5ecf75.cab
+  - fileName: Installers\a74408a87a51829b89e5282e73974d74.cab
+    sha256: FD09B8EA1949C1588D6D9D8560DD580E57C22A6D8FAB17127C411263863353A0
+    size: 259462
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/40a2f66ee5c768b0c599b8b0a7c637c1/a74408a87a51829b89e5282e73974d74.cab
+  - fileName: Installers\44ae31259cff28faf5e7015a9b8be5b2.cab
+    sha256: D84BCCE28BFCE08EB011ACAB8037BA6B225845858FD2ECEFE6B7604B819AC810
+    size: 271558
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/68c31c5ff66a60887286b9605fb08c27/44ae31259cff28faf5e7015a9b8be5b2.cab
+  - fileName: Installers\aac61496dd6fee21a0e5627e4dcd8488.cab
+    sha256: 1902513305203DC0F59835FEACC54E024C20BE3A11FD09908F3D8A65C7072C42
+    size: 2603573
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/1f02182199d2948ff8b951773e7af6bc/aac61496dd6fee21a0e5627e4dcd8488.cab
+  - fileName: Installers\ab8c11616091812d6c7137e366ba1d8d.cab
+    sha256: FE1C06220712C8BFC1D11910119171FD6D64963530C7C5912ED00631F33D1A25
+    size: 24403
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/884de99f5722c6199697eb9dbc568588/ab8c11616091812d6c7137e366ba1d8d.cab
+  - fileName: Installers\4ac48dbdddbc8ce04721f519b9cf1698.cab
+    sha256: 18FE7E4EEC42A8CBAF5854A960B718986B3A464A7A670EDE4659C8FFAB5452F9
+    size: 3278103
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/d959a19c1d79eca67029575dee716fa0/4ac48dbdddbc8ce04721f519b9cf1698.cab
+  - fileName: Installers\4c576e9c56c314d28a0e9d10ab87ca67.cab
+    sha256: EFC5A11EE2C723A4118F4861B195C93987DE4FE2C8FC491925AC1DC3A90B6F59
+    size: 2519948
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/1781f5d42dfc3cb9c5754f9c950cba3b/4c576e9c56c314d28a0e9d10ab87ca67.cab
+  - fileName: Installers\4de7a1422374f98369172705b05d4bf9.cab
+    sha256: 360832F015E16D82DE1D56E5760F148147E138F1576AAB7ECA6E3CE1F5D3B17B
+    size: 1144428
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/21dd85656df111cf3be33b1497060d0b/4de7a1422374f98369172705b05d4bf9.cab
+  - fileName: Installers\b98a31e36735eb82b3b238c68f36fbbf.cab
+    sha256: 815C23AEB74AADD14AB4462678C0FC87A0EA75347812D4E8B6BA03B3D12E72C1
+    size: 2529469
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/6d0fa3d6c9a3d7436ae08ad50821afe3/b98a31e36735eb82b3b238c68f36fbbf.cab
+  - fileName: Installers\ba5d20281a858248e59d96d75c014391.cab
+    sha256: 67CB3357390966B144C2EBEDD8CBE5C1D4AD9B7761F38F9838796A37631A4063
+    size: 1118418
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/51b8c857861888bea951044116ecddf6/ba5d20281a858248e59d96d75c014391.cab
+  - fileName: Installers\baa2d817ae180ba7e772f1543c3bbdea.cab
+    sha256: 7F304E91AA4603FF1C31C02DAD435BD247468E2B51DBE1A5D00F858FF11B3123
+    size: 411240
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/15e528ac1731984e640c44535f7573cd/baa2d817ae180ba7e772f1543c3bbdea.cab
+  - fileName: Installers\bd4b6e22633abadb45b75bc86caaa120.cab
+    sha256: 730451A6C14124F49891861E3454AFF39D86EDF25CF5B85F2445502A8E94CF84
+    size: 174143
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/76e916abfa2efe047ab1cbf260d2c85d/bd4b6e22633abadb45b75bc86caaa120.cab
+  - fileName: Installers\54a71dd657698028e27ce58b8c8f477a.cab
+    sha256: 53AB31304998100950481CE3012D39FEB1FA8F6176083F22A0B564E5C6D98830
+    size: 7264706
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/49827fb24c840320172fcd65e637111a/54a71dd657698028e27ce58b8c8f477a.cab
+  - fileName: Installers\caab1106d57ff70cb3cbd8350a77e871.cab
+    sha256: A765DAD70116A2BC09C13100B3CB020F1E9A3FB8FBD88F7F5D9FE05442250004
+    size: 967390
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/fb2e7d921763293efce27813ceb4f025/caab1106d57ff70cb3cbd8350a77e871.cab
+  - fileName: Installers\5642ea5ea549365f8b2a4f885b407d18.cab
+    sha256: 441C1F8370D3C07C084D4E31A5CFFA97E911E37D301B5C6AD76E1FB03D51E770
+    size: 7808669
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/34af0380a9bead11e0903e8f358353f2/5642ea5ea549365f8b2a4f885b407d18.cab
+  - fileName: Installers\5697d8a4098ded6eb49417251c138643.cab
+    sha256: 59B88594DCFC8ADCFBEB1707B56421B4E92872C5A0C7CF83C7FEBCAF6FB72D58
+    size: 793812
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/b0eab1d2c6be996ba2152daa3fbb056a/5697d8a4098ded6eb49417251c138643.cab
+  - fileName: Installers\d55d1e003fbb00a12c63b8f618e452bf.cab
+    sha256: BA68944AB391E4B3DF5156481472935BE97A9D84405CDE4101ED0C38B0D9CCCF
+    size: 466425
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/cee04d0a0bd5691495203c52da1a5944/d55d1e003fbb00a12c63b8f618e452bf.cab
+  - fileName: Installers\dc19fbd16e9708e0bc4d8419e3a7d48d.cab
+    sha256: FB2E6C05F6791EDF200D4A646C28C3F461258EE1E7A90D861AA59C58B10296BB
+    size: 16518
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/422ecbedb1ad1b0707f84e12edfdc931/dc19fbd16e9708e0bc4d8419e3a7d48d.cab
+  - fileName: Installers\dcb0a55d6cacaa05ead299e1d3de3c6d.cab
+    sha256: 08045C47FC36707C58C2C52C89BD7F725DE96F3149B75E10836E1ECAC0F5F207
+    size: 7808644
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/7d04aaf5361fba8c9b67695ab22aa95c/dcb0a55d6cacaa05ead299e1d3de3c6d.cab
+  - fileName: Installers\e10f9740446a96314a1731aa7cb4286a.cab
+    sha256: 607595E212AD9DF4896D210D7C4F0C24AE3BE551B8A2FEDCBE2C88286C164E4B
+    size: 2449982
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/63f1d1fb8e74e7ec47b33508a53b58a8/e10f9740446a96314a1731aa7cb4286a.cab
+  - fileName: Installers\5f7ef4904f75bf6b3b9b0f8975ad1492.cab
+    sha256: E900A69AAD41C7395F6D1D6CD9BEE092F0FC9A5EA70D5F1BF61BC4ADED405E1B
+    size: 845620
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/03b743cdce82a0ebb854b5e6c4d8c81c/5f7ef4904f75bf6b3b9b0f8975ad1492.cab
+  - fileName: Installers\65f45ddc30ad5fc4f9873e7791f83dac.cab
+    sha256: 231F1DE0531D8597173603BCB14914CD48116DCD44832BAE1A8FBEBD7DB99BC0
+    size: 16517
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/f30c08e41a7390d8d7e9e7e462be731b/65f45ddc30ad5fc4f9873e7791f83dac.cab
+  - fileName: Installers\678f64f35c507af8a9af0532b9b211ec.cab
+    sha256: 3FD9CBA337FD1D9CBF174835542E9A1BB90918CF95A38CB904D581AC29E844F4
+    size: 7808469
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/a2351f79afcbc67598681d62bec18114/678f64f35c507af8a9af0532b9b211ec.cab
+  - fileName: Installers\6bc159aa6f35510d049f0639e0ddb277.cab
+    sha256: A01490E47C401AD5B9616694B4507303E3A3102B2A9549AC6DD97669E858B990
+    size: 3079950
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/860d24bada4211d70393dca73ea6c1d4/6bc159aa6f35510d049f0639e0ddb277.cab
+  - fileName: Installers\6d946492af1c4bd35fcc60ab2057db4a.cab
+    sha256: E3AC8E20A9D56208E5B451EDE2704AD85C3CD78624546E95E9DBE8A58EFC64AC
+    size: 2266544
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/13c5812eef5f93d41808e4ae0de889e8/6d946492af1c4bd35fcc60ab2057db4a.cab
+  - fileName: Installers\SDK Debuggers-x86_en-us.msi
+    sha256: 263EA5A2E64E3DB5B5C60F0DDDD4EB9C708B60137C7980FF13E7D590F5DA7141
+    size: 606208
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/e8e98df3eab5cb652127edce12f2a0af/sdk%20debuggers-x86_en-us.msi
+  - fileName: Installers\X86 Debuggers And Tools-x86_en-us.msi
+    sha256: D02E3641850A87E0ED5D2D3C17A489542479542E8110FBCA69E9C3A6F906BBF4
+    size: 28200960
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/5b4c6bed7592095d8aa290154b243ad4/x86%20debuggers%20and%20tools-x86_en-us.msi
+  - fileName: Installers\X64 Debuggers And Tools-x64_en-us.msi
+    sha256: E9EDA93064502A6998DC94C85484B2E46E7C0781041653C28407DF9B6CF4A22D
+    size: 32108544
+    url: https://download.visualstudio.microsoft.com/download/pr/5eeaf3c7-015f-442c-8d63-aea17e5e6aef/683c3ee73ff9a0e0f4299856e007d278/x64%20debuggers%20and%20tools-x64_en-us.msi
   type: Exe
   version: 10.0.22621.5
 
diff --git a/build/win32/mozconfig.vs-latest b/build/win32/mozconfig.vs-latest
deleted file mode 100644
index 1d5b73148d..0000000000
--- a/build/win32/mozconfig.vs-latest
+++ /dev/null
@@ -1,3 +0,0 @@
-. $topsrcdir/build/win32/mozconfig.vs2019
-. "$topsrcdir/build/mozconfig.clang-cl"
-. "$topsrcdir/build/mozconfig.lld-link"
diff --git a/build/win32/mozconfig.vs2019 b/build/win32/mozconfig.vs2019
deleted file mode 100644
index 5dc7574744..0000000000
--- a/build/win32/mozconfig.vs2019
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ -z "${VSPATH}" ]; then
-    VSPATH="$(cd ${MOZ_FETCHES_DIR} && pwd)/vs"
-fi
-
-if [ -d "${VSPATH}" ]; then
-    export WIN32_REDIST_DIR="${VSPATH}/VC/Redist/MSVC/14.29.30133/x86/Microsoft.VC142.CRT"
-    export WINSYSROOT="${VSPATH}"
-fi
-
-ac_add_options --target=i686-pc-windows-msvc
diff --git a/build/win64-aarch64/mozconfig.vs-latest b/build/win64-aarch64/mozconfig.vs-latest
deleted file mode 100644
index 2d7e28ae08..0000000000
--- a/build/win64-aarch64/mozconfig.vs-latest
+++ /dev/null
@@ -1,3 +0,0 @@
-. $topsrcdir/build/win64-aarch64/mozconfig.vs2019
-. "$topsrcdir/build/mozconfig.clang-cl"
-. "$topsrcdir/build/mozconfig.lld-link"
diff --git a/build/win64-aarch64/mozconfig.vs2019 b/build/win64-aarch64/mozconfig.vs2019
deleted file mode 100644
index ac2e7eefe3..0000000000
--- a/build/win64-aarch64/mozconfig.vs2019
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ -z "${VSPATH}" ]; then
-    VSPATH="$(cd ${MOZ_FETCHES_DIR} && pwd)/vs"
-fi
-
-if [ -d "${VSPATH}" ]; then
-    export WIN32_REDIST_DIR="${VSPATH}/VC/Redist/MSVC/14.29.30133/arm64/Microsoft.VC142.CRT"
-    export WINSYSROOT="${VSPATH}"
-fi
diff --git a/build/win64/mozconfig.asan b/build/win64/mozconfig.asan
index 8aa1810b78..a8661a8661 100644
--- a/build/win64/mozconfig.asan
+++ b/build/win64/mozconfig.asan
@@ -20,4 +20,3 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-profiling
 
 . "$topsrcdir/build/mozconfig.clang-cl"
-. "$topsrcdir/build/mozconfig.lld-link"
diff --git a/build/win64/mozconfig.vs-latest b/build/win64/mozconfig.vs-latest
deleted file mode 100644
index 4caed70ae7..0000000000
--- a/build/win64/mozconfig.vs-latest
+++ /dev/null
@@ -1,3 +0,0 @@
-. $topsrcdir/build/win64/mozconfig.vs2019
-. "$topsrcdir/build/mozconfig.clang-cl"
-. "$topsrcdir/build/mozconfig.lld-link"
diff --git a/build/win64/mozconfig.vs2019 b/build/win64/mozconfig.vs2019
deleted file mode 100644
index e0d5da8203..0000000000
--- a/build/win64/mozconfig.vs2019
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ -z "${VSPATH}" ]; then
-    VSPATH="$(cd ${MOZ_FETCHES_DIR} && pwd)/vs"
-fi
-
-if [ -d "${VSPATH}" ]; then
-    export WIN32_REDIST_DIR=${VSPATH}/VC/Redist/MSVC/14.29.30133/x64/Microsoft.VC142.CRT
-    export WINSYSROOT="${VSPATH}"
-fi
diff --git a/build/workspace-hack/Cargo.toml b/build/workspace-hack/Cargo.toml
index 6e3243d211..1869822aed 100644
--- a/build/workspace-hack/Cargo.toml
+++ b/build/workspace-hack/Cargo.toml
@@ -189,4 +189,5 @@ http3server = ["dep:arrayvec", "dep:bindgen", "dep:bitflags", "dep:bytes", "dep:
 ipcclientcerts-static = ["dep:bindgen", "dep:bitflags", "dep:memchr", "dep:nom", "dep:regex"]
 jsrust = ["dep:arrayvec", "dep:cc", "dep:env_logger", "dep:getrandom", "dep:hashbrown", "dep:indexmap", "dep:log", "dep:memchr", "dep:num-traits", "dep:once_cell", "dep:semver", "dep:smallvec", "dep:url"]
 mozwer_s = ["dep:getrandom", "dep:hashbrown", "dep:indexmap", "dep:once_cell", "dep:serde_json", "dep:uuid", "dep:windows-sys"]
+nmhproxy = ["dep:serde_json", "dep:url"]
 osclientcerts-static = ["dep:bindgen", "dep:bitflags", "dep:env_logger", "dep:log", "dep:memchr", "dep:nom", "dep:regex"]