Merge branch 'dev/202502' into personal/apop5/cherrypickstmmfixaarch64

Author: apop5

.azurepipelines/Ubuntu-GCC5.yml

@@ -15,7 +15,7 @@
 ##
 
 variables:
-- group: architectures-arm-64-x86-64
+- group: architectures-arm64-x86-64
 - group: tool-chain-ubuntu-gcc
 - group: coverage
 

.github/workflows/codeql.yml

@@ -29,10 +29,12 @@ on:
     branches:
       - main
       - release/*
+      - dev/*
   pull_request:
     branches:
       - main
       - release/*
+      - dev/*
     paths-ignore:
       - '!**.c'
       - '!**.h'
@@ -179,7 +181,7 @@ jobs:
           return response
 
         GITHUB_REPO = "sagiegurari/cargo-make"
-        api_url = f"https://api.github.com/repos/{GITHUB_REPO}/releases/tags/0.37.9"
+        api_url = f"https://api.github.com/repos/{GITHUB_REPO}/releases/tags/0.37.24"
 
         response = get_response_with_retries(api_url)
         if response.status_code == 200:
@@ -214,7 +216,7 @@ jobs:
 
     - name: Download cargo-make
       if: steps.cargo_make_cache.outputs.cache-hit != 'true'
-      uses: robinraju/release-downloader@v1.10
+      uses: robinraju/release-downloader@v1.11
       with:
         repository: 'sagiegurari/cargo-make'
         tag: '${{ steps.get_cargo_tool_details.outputs.cargo_make_version }}'

BaseTools/Plugin/WindowsVsToolChain/WindowsVsToolChain.py

@@ -94,7 +94,7 @@ def do_pre_build(self, thebuilder):
                 shell_env = shell_environment.GetEnvironment()
                 # Use the tools lib to determine the correct values for the vars that interest us.
                 vs_vars = locate_tools.QueryVcVariables(
-                    interesting_keys, VC_HOST_ARCH_TRANSLATOR[HostType], vs_version="vs2017")
+                    interesting_keys, VC_HOST_ARCH_TRANSLATOR[HostType], vs_version="vs2017", vc_version=vc_ver)
                 for (k, v) in vs_vars.items():
                     shell_env.set_shell_var(k, v)
 
@@ -167,7 +167,7 @@ def do_pre_build(self, thebuilder):
                 shell_env = shell_environment.GetEnvironment()
                 # Use the tools lib to determine the correct values for the vars that interest us.
                 vs_vars = locate_tools.QueryVcVariables(
-                    interesting_keys, VC_HOST_ARCH_TRANSLATOR[HostType], vs_version="vs2019")
+                    interesting_keys, VC_HOST_ARCH_TRANSLATOR[HostType], vs_version="vs2019", vc_version=vc_ver)
                 for (k, v) in vs_vars.items():
                     shell_env.set_shell_var(k, v)
 
@@ -247,7 +247,7 @@ def do_pre_build(self, thebuilder):
                 shell_env = shell_environment.GetEnvironment()
                 # Use the tools lib to determine the correct values for the vars that interest us.
                 vs_vars = locate_tools.QueryVcVariables(
-                    interesting_keys, VC_HOST_ARCH_TRANSLATOR[HostType], vs_version="VS2022")
+                    interesting_keys, VC_HOST_ARCH_TRANSLATOR[HostType], vs_version="VS2022", vc_version=vc_ver)
                 for (k, v) in vs_vars.items():
                     shell_env.set_shell_var(k, v)
 
@@ -373,6 +373,10 @@ def _get_vc_version(self, path, varname):
                 self.Logger.critical(
                     "Failed to find VC tools.  Might need to check for VS install")
                 return vc_ver
-            vc_ver = os.listdir(p2)[-1].strip()  # get last in list
+            
+            dirs = os.listdir(p2)
+            if len(dirs) > 1:
+                logging.warning(f"Multiple VC versions found: [{', '.join(dirs)}]. Using {dirs[-1]}")
+            vc_ver = dirs[-1].strip()  # get last in list
             self.Logger.debug("Found VC Tool version is %s" % vc_ver)
         return vc_ver

pip-requirements.txt

@@ -12,7 +12,7 @@
 # https://www.python.org/dev/peps/pep-0440/#version-specifiers
 ##
 
-edk2-pytool-library~=0.22.5 # MU_CHANGE
+edk2-pytool-library~=0.23.1 # MU_CHANGE
 edk2-pytool-extensions~=0.28.3 # MU_CHANGE
 antlr4-python3-runtime==4.13.2
 lcov-cobertura==2.1.1