Mesa (main): ci/vs2019: Upgrade Windows 10 SDK version to 20348

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: d39553da10e9b9745fa2cbe3bcbc72f45fc8383c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d39553da10e9b9745fa2cbe3bcbc72f45fc8383c

Author: Yonggang Luo <luoyonggang at gmail.com>
Date:   Fri Jun 10 14:04:33 2022 +0800

ci/vs2019: Upgrade Windows 10 SDK version to 20348

This comes with stdalign.h for more C11 conformance

Signed-off-by: Yonggang Luo <luoyonggang at gmail.com>
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17044>

---

 .gitlab-ci/image-tags.yml                 | 6 +++---
 .gitlab-ci/windows/mesa_deps_vs2019.ps1   | 2 +-
 src/microsoft/ci/spirv2dxil_reference.txt | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index e24ab072930..f8bcf0036da 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -15,10 +15,10 @@ variables:
    KERNEL_ROOTFS_TAG: "2022-06-09-piglit-update"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
-   WINDOWS_X64_VS_TAG: "2022-06-10-vs"
+   WINDOWS_X64_VS_TAG: "2022-06-15-vs-winsdk"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
-   WINDOWS_X64_BUILD_TAG: "2022-06-10-vs"
+   WINDOWS_X64_BUILD_TAG: "2022-06-15-vs-winsdk"
 
    WINDOWS_X64_TEST_PATH: "windows/x64_test"
-   WINDOWS_X64_TEST_TAG: "2022-06-10-vs"
+   WINDOWS_X64_TEST_TAG: "2022-06-15-vs-winsdk"
diff --git a/.gitlab-ci/windows/mesa_deps_vs2019.ps1 b/.gitlab-ci/windows/mesa_deps_vs2019.ps1
index 702af792353..425df4c2485 100644
--- a/.gitlab-ci/windows/mesa_deps_vs2019.ps1
+++ b/.gitlab-ci/windows/mesa_deps_vs2019.ps1
@@ -28,7 +28,7 @@ Start-Process -NoNewWindow -Wait -FilePath C:\vs_buildtools.exe `
 "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
 "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
 "--add", "Microsoft.VisualStudio.Component.Graphics.Tools", `
-"--add", "Microsoft.VisualStudio.Component.Windows10SDK.19041"
+"--add", "Microsoft.VisualStudio.Component.Windows10SDK.20348"
 
 if (!$?) {
   Write-Host "Failed to install Visual Studio tools"
diff --git a/src/microsoft/ci/spirv2dxil_reference.txt b/src/microsoft/ci/spirv2dxil_reference.txt
index 0af58d1d404..e8bbc2fb252 100644
--- a/src/microsoft/ci/spirv2dxil_reference.txt
+++ b/src/microsoft/ci/spirv2dxil_reference.txt
@@ -646,10 +646,10 @@ Compilation failed
 Test:SpvParserCFGTest_EmitBody_IfSelection_TrueBranch_LoopBreak.spvasm:main|Fragment: Pass
 Test:SpvParserCFGTest_EmitBody_Kill_InsideIf.spvasm:main|Fragment: Pass
 Test:SpvParserCFGTest_EmitBody_Kill_InsideLoop.spvasm:main|Fragment: Fail
-DXIL: Loop must have break
-
+DXIL: Function: main: error: Loop must have break. Use /Zi for source location.
 Validation failed.
 
+
 Failed to validate DXIL