Toolset update: VS 2022 17.3 Preview 1 (#2714)

microsoft · May 12, 2022 · a12e73c · a12e73c
1 parent 488e789
commit a12e73c
Show file tree

Hide file tree

Showing 68 changed files with 51 additions and 356 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,36 +38,32 @@ if("${VCLIBS_TARGET_ARCHITECTURE}" MATCHES "^[xX]86$")
     set(VCLIBS_X86_OR_X64 "x86")
     # Note that we set _WIN32_WINNT to a high level to make declarations available, but still engage downlevel
     # runtime dynamic linking by setting our own _STL_WIN32_WINNT back to Windows XP.
-    add_compile_definitions(_X86_ _VCRT_WIN32_WINNT=0x0501 _STL_WIN32_WINNT=0x0501
-        _WIN32_WINNT=0x0602 NTDDI_VERSION=NTDDI_WIN8)
+    add_compile_definitions(_X86_ _VCRT_WIN32_WINNT=0x0501 _STL_WIN32_WINNT=0x0501)
     add_compile_options(/arch:IA32)
 elseif(VCLIBS_TARGET_ARCHITECTURE MATCHES "^[xX]64$")
     set(VCLIBS_TARGET_ARCHITECTURE "x64")
     set(VCLIBS_I386_OR_AMD64 "amd64")
     set(VCLIBS_X86_OR_X64 "x64")
-    add_compile_definitions(_AMD64_ _VCRT_WIN32_WINNT=0x0501 _STL_WIN32_WINNT=0x0501
-        _WIN32_WINNT=0x0602 NTDDI_VERSION=NTDDI_WIN8)
+    add_compile_definitions(_AMD64_ _VCRT_WIN32_WINNT=0x0501 _STL_WIN32_WINNT=0x0501)
 elseif(VCLIBS_TARGET_ARCHITECTURE MATCHES "^[aA][rR][mM][vV]7$")
     set(VCLIBS_TARGET_ARCHITECTURE "arm")
     set(VCLIBS_I386_OR_AMD64 "arm")
     set(VCLIBS_X86_OR_X64 "arm")
-    add_compile_definitions(_ARM_ _VCRT_WIN32_WINNT=0x0602 _STL_WIN32_WINNT=0x0602
-        _WIN32_WINNT=0x0602 NTDDI_VERSION=NTDDI_WIN8)
+    add_compile_definitions(_ARM_ _VCRT_WIN32_WINNT=0x0602 _STL_WIN32_WINNT=0x0602)
     string(APPEND CMAKE_CXX_STANDARD_LIBRARIES " Synchronization.lib")
 elseif(VCLIBS_TARGET_ARCHITECTURE MATCHES "^[aA][rR][mM]64$")
     set(VCLIBS_TARGET_ARCHITECTURE "arm64")
     set(VCLIBS_I386_OR_AMD64 "arm64")
     set(VCLIBS_X86_OR_X64 "arm64")
-    add_compile_definitions(_ARM64_ _VCRT_WIN32_WINNT=0x0A00 _STL_WIN32_WINNT=0x0A00
-        _WIN32_WINNT=0x0A00 NTDDI_VERSION=NTDDI_WIN10)
+    add_compile_definitions(_ARM64_ _VCRT_WIN32_WINNT=0x0A00 _STL_WIN32_WINNT=0x0A00)
     string(APPEND CMAKE_CXX_STANDARD_LIBRARIES " Synchronization.lib")
 else()
     message(FATAL_ERROR "Could not determine target architecture: VCLIBS_TARGET_ARCHITECTURE: ${VCLIBS_TARGET_ARCHITECTURE}")
 endif()
 
 add_compile_definitions(
     _ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH WIN32_LEAN_AND_MEAN STRICT _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS
-    _CRT_DECLARE_NONSTDC_NAMES=1 )
+    _CRT_DECLARE_NONSTDC_NAMES=1 _WIN32_WINNT=0x0A00 NTDDI_VERSION=NTDDI_WIN10_CO)
 
 add_compile_options(/diagnostics:caret /W4 /WX /w14265 /w15038 /d1FastFail /guard:cf /Z7 /Gy /Zp8 /std:c++latest /permissive- /Zc:threadSafeInit- /Zl)
 

diff --git a/README.md b/README.md
@@ -140,7 +140,8 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
 
 # How To Build With The Visual Studio IDE
 
-1. Install Visual Studio 2022 17.2 Preview 3 or later.
+1. Install Visual Studio 2022 17.3 Preview 1 or later.
+    * Select "Windows 11 SDK (10.0.22000.0)" in the VS Installer.
     * We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
     This will ensure that you're using supported versions of CMake and Ninja.
     * Otherwise, install [CMake][] 3.22 or later, and [Ninja][] 1.10.2 or later.
@@ -155,7 +156,8 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
 
 # How To Build With A Native Tools Command Prompt
 
-1. Install Visual Studio 2022 17.2 Preview 3 or later.
+1. Install Visual Studio 2022 17.3 Preview 1 or later.
+    * Select "Windows 11 SDK (10.0.22000.0)" in the VS Installer.
     * We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
     This will ensure that you're using supported versions of CMake and Ninja.
     * Otherwise, install [CMake][] 3.22 or later, and [Ninja][] 1.10.2 or later.

diff --git a/azure-devops/provision-image.ps1 b/azure-devops/provision-image.ps1
@@ -91,7 +91,7 @@ if ([string]::IsNullOrEmpty($AdminUserPassword)) {
   $PsExecPath = Join-Path $ExtractedPsToolsPath 'PsExec64.exe'
 
   # https://github.com/PowerShell/PowerShell/releases/latest
-  $PowerShellZipUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.zip'
+  $PowerShellZipUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x64.zip'
   Write-Host "Downloading: $PowerShellZipUrl"
   $ExtractedPowerShellPath = DownloadAndExtractZip -Url $PowerShellZipUrl
   $PwshPath = Join-Path $ExtractedPowerShellPath 'pwsh.exe'

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -7,7 +7,7 @@ variables:
   tmpDir: 'D:\Temp'
   buildOutputLocation: 'D:\build'
 
-pool: 'StlBuild-2022-04-12-T1624'
+pool: 'StlBuild-2022-05-10-T1718'
 
 stages:
   - stage: Code_Format

diff --git a/stl/CMakeLists.txt b/stl/CMakeLists.txt
@@ -440,7 +440,6 @@ add_compile_definitions(_CRTBLD _VCRT_ALLOW_INTERNALS _HAS_OLD_IOSTREAMS_MEMBERS
 
 include_directories(BEFORE
     "${CMAKE_CURRENT_LIST_DIR}/inc"
-    "${TOOLSET_ROOT_DIR}/crt/src/concrt"
     "${TOOLSET_ROOT_DIR}/crt/src/vcruntime"
 )
 

diff --git a/stl/src/filesystem.cpp b/stl/src/filesystem.cpp
@@ -126,27 +126,13 @@ namespace {
         return __std_win_error{GetLastError()};
     }
 
-    struct _File_disposition_info_ex {
-        DWORD _Flags;
-    };
-
     [[nodiscard]] _Success_(return == __std_win_error::_Success) __std_win_error
         __stdcall _Set_delete_flag(_In_ __std_fs_file_handle _Handle) {
-        // From newer Windows SDK than currently used to build vctools:
-        // #define FILE_DISPOSITION_FLAG_DELETE                     0x00000001
-        // #define FILE_DISPOSITION_FLAG_POSIX_SEMANTICS            0x00000002
-
-        // typedef struct _FILE_DISPOSITION_INFO_EX {
-        //     DWORD Flags;
-        // } FILE_DISPOSITION_INFO_EX, *PFILE_DISPOSITION_INFO_EX;
 
-        _File_disposition_info_ex _Info_ex{0x3};
-
-        // FileDispositionInfoEx isn't documented in MSDN at the time of this writing, but is present
-        // in minwinbase.h as of at least 10.0.16299.0
-        constexpr auto _FileDispositionInfoExClass = static_cast<FILE_INFO_BY_HANDLE_CLASS>(21);
+        // See minwinbase.h and WinBase.h.
+        FILE_DISPOSITION_INFO_EX _Info_ex{FILE_DISPOSITION_FLAG_DELETE | FILE_DISPOSITION_FLAG_POSIX_SEMANTICS};
         if (SetFileInformationByHandle(
-                reinterpret_cast<HANDLE>(_Handle), _FileDispositionInfoExClass, &_Info_ex, sizeof(_Info_ex))) {
+                reinterpret_cast<HANDLE>(_Handle), FileDispositionInfoEx, &_Info_ex, sizeof(_Info_ex))) {
             return __std_win_error::_Success;
         }
 
@@ -546,16 +532,11 @@ _Success_(return == __std_win_error::_Success) __std_win_error
         return {false, _Translate_not_found_to_success(_Last_error)};
     }
 
-    // For Windows 10 1809 or later we have this flag -> FILE_DISPOSITION_FLAG_IGNORE_READONLY_ATTRIBUTE 0x10
-    // This flag also deletes read-only files.
-    // NOTE: This is currently undocumented in MSDN. Refer to WinBase.h for declarations.
-
-    // The following bits are set here
-    // FILE_DISPOSITION_FLAG_DELETE, FILE_DISPOSITION_FLAG_POSIX_SEMANTICS,
-    // FILE_DISPOSITION_FLAG_IGNORE_READONLY_ATTRIBUTE
-    _File_disposition_info_ex _Info_ex{0x3 | 0x10};
-    constexpr auto _FileDispositionInfoExClass = static_cast<FILE_INFO_BY_HANDLE_CLASS>(21);
-    if (SetFileInformationByHandle(_Handle._Get(), _FileDispositionInfoExClass, &_Info_ex, sizeof(_Info_ex))) {
+    // See minwinbase.h and WinBase.h.
+    // Windows 10 1809 added support for FILE_DISPOSITION_FLAG_IGNORE_READONLY_ATTRIBUTE.
+    FILE_DISPOSITION_INFO_EX _Info_ex{FILE_DISPOSITION_FLAG_DELETE | FILE_DISPOSITION_FLAG_POSIX_SEMANTICS
+                                      | FILE_DISPOSITION_FLAG_IGNORE_READONLY_ATTRIBUTE};
+    if (SetFileInformationByHandle(_Handle._Get(), FileDispositionInfoEx, &_Info_ex, sizeof(_Info_ex))) {
         return {true, __std_win_error::_Success};
     }
 

diff --git a/tests/std/include/test_thread_support.hpp b/tests/std/include/test_thread_support.hpp
@@ -9,9 +9,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <thread>
-#ifdef _MSC_EXTENSIONS
+
 #include <Windows.h>
-#endif // _MSC_EXTENSIONS
 
 class one_shot {
     bool unblock = false;
@@ -50,16 +49,12 @@ class watchdog {
     }
 
     static void kill_if_not_debugging() {
-#ifdef _MSC_EXTENSIONS
         if (::IsDebuggerPresent()) {
             fprintf(stdout, "Watchdog not terminating because debugger is connected.\n");
             fflush(stdout);
         } else {
             kill();
         }
-#else // ^^^ _MSC_EXTENSIONS ^^^ // vvv !_MSC_EXTENSIONS vvv
-        kill();
-#endif // _MSC_EXTENSIONS
     }
 
 public:

diff --git a/tests/std/tests/Dev08_563686_ostream/env.lst b/tests/std/tests/Dev08_563686_ostream/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\native_winsdk_matrix.lst
+RUNALL_INCLUDE ..\native_matrix.lst
diff --git a/tests/std/tests/Dev09_056375_locale_cleanup/env.lst b/tests/std/tests/Dev09_056375_locale_cleanup/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\usual_winsdk_matrix.lst
+RUNALL_INCLUDE ..\usual_matrix.lst
diff --git a/tests/std/tests/Dev09_056375_locale_cleanup/testdll.cpp b/tests/std/tests/Dev09_056375_locale_cleanup/testdll.cpp
@@ -15,7 +15,7 @@ ref struct Test {
     static
 #else
 extern "C" {
-_declspec(dllexport)
+__declspec(dllexport)
 #endif
 
         void

diff --git a/tests/std/tests/Dev11_0437519_container_requirements/test.compile.pass.cpp b/tests/std/tests/Dev11_0437519_container_requirements/test.compile.pass.cpp
@@ -5,9 +5,6 @@ int main() {} // COMPILE-ONLY
 
 #define STATIC_ASSERT(...) static_assert(__VA_ARGS__, #__VA_ARGS__)
 
-// Work around VSO-119998 "/Za's elided-copy-ctor check is still bogus".
-#ifdef _MSC_EXTENSIONS
-
 // This test program verifies all of the container requirements for the Standard Library containers,
 // including the four non-array sequence containers (deque, forward_list, list, vector), the four
 // associative containers (map, multimap, multiset, and set), and the four unordered associative
@@ -3042,4 +3039,3 @@ void assert_all() {
     assert_container<tag_unordered_multiset>();
     assert_container<tag_unordered_set>();
 }
-#endif // _MSC_EXTENSIONS
diff --git a/tests/std/tests/Dev11_0493504_error_category_lifetime/env.lst b/tests/std/tests/Dev11_0493504_error_category_lifetime/env.lst
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\usual_winsdk_matrix.lst
+RUNALL_INCLUDE ..\usual_matrix.lst
 RUNALL_CROSSLIST
 PM_CL="/D_STL_OPTIMIZE_SYSTEM_ERROR_OPERATORS=0"
 PM_CL="/D_STL_OPTIMIZE_SYSTEM_ERROR_OPERATORS=1"
diff --git a/tests/std/tests/GH_002030_asan_annotate_vector/env.lst b/tests/std/tests/GH_002030_asan_annotate_vector/env.lst
@@ -29,8 +29,6 @@ PM_CL="-fsanitize=address /EHsc /MTd /std:c++latest /permissive /fno-sanitize-ad
 PM_CL="-fsanitize=address /EHsc /MTd /std:c++latest /permissive- /analyze:only /analyze:autolog- /fno-sanitize-address-vcasan-lib"
 PM_CL="-fsanitize=address /EHsc /MTd /std:c++latest /permissive- /fp:strict /fno-sanitize-address-vcasan-lib"
 PM_CL="-fsanitize=address /EHsc /MTd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="-fsanitize=address /Za /EHsc /MD /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="-fsanitize=address /Za /EHsc /MDd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
 PM_CL="/D_ANNOTATE_VECTOR /BE /c /EHsc /MD /std:c++14 /fno-sanitize-address-vcasan-lib"
 PM_CL="/D_ANNOTATE_VECTOR /BE /c /EHsc /MDd /std:c++17 /permissive- /fno-sanitize-address-vcasan-lib"
 PM_CL="/D_ANNOTATE_VECTOR /BE /c /EHsc /MT /std:c++20 /permissive- /fno-sanitize-address-vcasan-lib"
@@ -51,8 +49,6 @@ PM_CL="/D_ANNOTATE_VECTOR /EHsc /MTd /std:c++latest /permissive /fno-sanitize-ad
 PM_CL="/D_ANNOTATE_VECTOR /EHsc /MTd /std:c++latest /permissive- /analyze:only /analyze:autolog- /fno-sanitize-address-vcasan-lib"
 PM_CL="/D_ANNOTATE_VECTOR /EHsc /MTd /std:c++latest /permissive- /fp:strict /fno-sanitize-address-vcasan-lib"
 PM_CL="/D_ANNOTATE_VECTOR /EHsc /MTd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="/D_ANNOTATE_VECTOR /Za /EHsc /MD /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
-PM_CL="/D_ANNOTATE_VECTOR /Za /EHsc /MDd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
 # TRANSITION, clang-cl does not support /alternatename so we cannot test /D_ANNOTATE_VECTOR without -fsanitize=address
 PM_COMPILER="clang-cl" PM_CL="-fsanitize=address -fno-ms-compatibility -fno-delayed-template-parsing /EHsc /MD /std:c++14"
 PM_COMPILER="clang-cl" PM_CL="-fsanitize=address -fno-ms-compatibility -fno-delayed-template-parsing /EHsc /MD /std:c++17"

diff --git a/tests/std/tests/GH_002431_byte_range_find_with_unreachable_sentinel/env.lst b/tests/std/tests/GH_002431_byte_range_find_with_unreachable_sentinel/env.lst
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
+RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
 RUNALL_CROSSLIST
 PM_CL=""
 PM_CL="/D_USE_STD_VECTOR_ALGORITHMS=0"
diff --git a/tests/std/tests/P0088R3_variant/env.lst b/tests/std/tests/P0088R3_variant/env.lst
@@ -26,8 +26,6 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri
 PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-"
 PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive /DCONSTEXPR_NOTHROW /DTEST_PERMISSIVE"
 PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-"
-PM_CL="/Za /EHsc /MD /std:c++latest /permissive-"
-PM_CL="/Za /EHsc /MDd /std:c++latest /permissive-"
 PM_CL="/clr /MD /std:c++17 /DCONSTEXPR_NOTHROW /DTEST_PERMISSIVE"
 PM_CL="/clr /MDd /std:c++17 /DCONSTEXPR_NOTHROW /DTEST_PERMISSIVE"
 PM_CL="/BE /c /EHsc /MD /std:c++latest /permissive-"

diff --git a/tests/std/tests/P0122R7_span_death/env.lst b/tests/std/tests/P0122R7_span_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\usual_20_winsdk_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0220R1_optional_death/env.lst b/tests/std/tests/P0220R1_optional_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\usual_17_winsdk_matrix.lst
+RUNALL_INCLUDE ..\usual_17_matrix.lst
diff --git a/tests/std/tests/P0408R7_efficient_access_to_stringbuf_buffer/env.lst b/tests/std/tests/P0408R7_efficient_access_to_stringbuf_buffer/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\usual_20_winsdk_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0645R10_text_formatting_death/env.lst b/tests/std/tests/P0645R10_text_formatting_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
+RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
diff --git a/tests/std/tests/P0645R10_text_formatting_legacy_text_encoding/env.lst b/tests/std/tests/P0645R10_text_formatting_legacy_text_encoding/env.lst
@@ -21,8 +21,6 @@ PM_CL="/MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:strict"
 PM_CL="/MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-"
 PM_CL="/MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive"
 PM_CL="/MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-"
-PM_CL="/std:c++20 /permissive- /Za /MD"
-PM_CL="/std:c++latest /permissive- /Za /MDd"
 # PM_CL="/std:c++20 /permissive- /BE /c /MD"
 # PM_CL="/std:c++latest /permissive- /BE /c /MTd"
 # PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing /std:c++20 /permissive- /MD"

diff --git a/tests/std/tests/P0660R10_stop_token_death/env.lst b/tests/std/tests/P0660R10_stop_token_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\usual_20_winsdk_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_common_iterator_death/env.lst b/tests/std/tests/P0896R4_common_iterator_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
+RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_counted_iterator_death/env.lst b/tests/std/tests/P0896R4_counted_iterator_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
+RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_istream_view_death/env.lst b/tests/std/tests/P0896R4_istream_view_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
+RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_to_address/env.lst b/tests/std/tests/P0896R4_ranges_to_address/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\usual_20_winsdk_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_views_counted_death/env.lst b/tests/std/tests/P0896R4_views_counted_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
+RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_views_drop_while_death/env.lst b/tests/std/tests/P0896R4_views_drop_while_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
+RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_views_filter_death/env.lst b/tests/std/tests/P0896R4_views_filter_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
+RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_views_take_while_death/env.lst b/tests/std/tests/P0896R4_views_take_while_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
+RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_views_transform_death/env.lst b/tests/std/tests/P0896R4_views_transform_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
+RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
diff --git a/tests/std/tests/P2443R1_views_chunk_by_death/env.lst b/tests/std/tests/P2443R1_views_chunk_by_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\strict_winsdk_concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\strict_concepts_latest_matrix.lst
diff --git a/tests/std/tests/VSO_0000000_condition_variable_any_exceptions/env.lst b/tests/std/tests/VSO_0000000_condition_variable_any_exceptions/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\native_winsdk_matrix.lst
+RUNALL_INCLUDE ..\native_matrix.lst
diff --git a/tests/std/tests/VSO_0000000_instantiate_type_traits/test.compile.pass.cpp b/tests/std/tests/VSO_0000000_instantiate_type_traits/test.compile.pass.cpp
@@ -299,10 +299,8 @@ void type_traits_test() {
         virtual ~F() {}
     };
     type_traits_ref_test_impl<F, C>();
-#ifdef _MSC_EXTENSIONS // TRANSITION, VSO-589178
     type_traits_ref_test_impl<pair<int, double>>();
     type_traits_ref_test_impl<tuple<int, int, int>>();
-#endif // TRANSITION, VSO-589178
 
     INSTANTIATE(make_integer_sequence<int, 0>);
     INSTANTIATE(index_sequence<1, 1, 2, 3, 5, 8, 13>);

diff --git a/tests/std/tests/VSO_0000000_list_iterator_debugging/env.lst b/tests/std/tests/VSO_0000000_list_iterator_debugging/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\usual_winsdk_matrix.lst
+RUNALL_INCLUDE ..\usual_matrix.lst
diff --git a/tests/std/tests/VSO_0000000_string_view_idl/env.lst b/tests/std/tests/VSO_0000000_string_view_idl/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\usual_17_winsdk_matrix.lst
+RUNALL_INCLUDE ..\usual_17_matrix.lst
diff --git a/tests/std/tests/VSO_0121275_filesystem_canonical_should_handle_many_double_dots/env.lst b/tests/std/tests/VSO_0121275_filesystem_canonical_should_handle_many_double_dots/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\usual_winsdk_matrix.lst
+RUNALL_INCLUDE ..\usual_matrix.lst
diff --git a/tests/std/tests/VSO_0144114_sleep_until/env.lst b/tests/std/tests/VSO_0144114_sleep_until/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\native_winsdk_matrix.lst
+RUNALL_INCLUDE ..\native_matrix.lst
diff --git a/tests/std/tests/VSO_0157762_feature_test_macros/env.lst b/tests/std/tests/VSO_0157762_feature_test_macros/env.lst
@@ -22,8 +22,6 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri
 PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-"
 PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive"
 PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-"
-PM_CL="/Za /EHsc /MD /std:c++latest /permissive-"
-PM_CL="/Za /EHsc /MDd /std:c++latest /permissive-"
 PM_CL="/clr /MD /std:c++17"
 PM_CL="/clr /MDd /std:c++17"
 PM_CL="/clr:pure /MD /std:c++14"