diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS.yml index 8c21327fc2..0b51cd0d20 100644 --- a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS.yml +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS.yml @@ -90,7 +90,7 @@ jobs: steps: - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml parameters: - tool_chain_tag: VS2022 + tool_chain_tag: VS2026 build_pkg: $(package) build_target: $(Build.Target) build_arch: $(Build.Arch) diff --git a/EmulatorPkg/PlatformCI/PlatformBuild.py b/EmulatorPkg/PlatformCI/PlatformBuild.py index 4afe956cfd..42e3290544 100644 --- a/EmulatorPkg/PlatformCI/PlatformBuild.py +++ b/EmulatorPkg/PlatformCI/PlatformBuild.py @@ -186,11 +186,11 @@ class PlatformBuilder(UefiBuilder, BuildSettingsManager): def SetPlatformEnv(self): logging.debug("PlatformBuilder SetPlatformEnv") self.env.SetValue("PRODUCT_NAME", "EmulatorPkg", "Platform Hardcoded") - self.env.SetValue("TOOL_CHAIN_TAG", "VS2022", "Default Toolchain") + self.env.SetValue("TOOL_CHAIN_TAG", "VS2026", "Default Toolchain") # Add support for using the correct Platform Headers, tools, and Libs based on emulator architecture - # requested to be built when building VS2022 or VS2019 - if self.env.GetValue("TOOL_CHAIN_TAG") == "VS2022" or self.env.GetValue("TOOL_CHAIN_TAG") == "VS2019": + # requested to be built when building VS2026, VS2022 or VS2019 + if self.env.GetValue("TOOL_CHAIN_TAG") in ("VS2019", "VS2022", "VS2026"): key = self.env.GetValue("TOOL_CHAIN_TAG") + "_HOST" if self.env.GetValue("TARGET_ARCH") == "IA32": shell_environment.ShellEnvironment().set_shell_var(key, "x86") diff --git a/EmulatorPkg/PlatformCI/ReadMe.md b/EmulatorPkg/PlatformCI/ReadMe.md index 54a7330734..71dddd9769 100644 --- a/EmulatorPkg/PlatformCI/ReadMe.md +++ b/EmulatorPkg/PlatformCI/ReadMe.md @@ -6,7 +6,7 @@ to use the same Pytools based build infrastructure locally. ## Supported Configuration Details This solution for building and running EmulatorPkg has only been validated with Windows 10 -with VS2022 and Ubuntu 18.04 with GCC toolchain. Four different firmware builds are +with VS2026 and Ubuntu 18.04 with GCC toolchain. Four different firmware builds are supported and are described below. | Configuration name | Architectures | DSC File |Additional Flags |