Toolset update: VS 2022 17.5 Preview 1, Python 3.11.0 (#3202)

microsoft · Nov 11, 2022 · f58deab · f58deab
1 parent ea09254
commit f58deab
Show file tree

Hide file tree

Showing 10 changed files with 300 additions and 275 deletions.
diff --git a/README.md b/README.md
@@ -141,7 +141,7 @@ 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.4 Preview 3 or later.
+1. Install Visual Studio 2022 17.5 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.
@@ -157,7 +157,7 @@ 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.4 Preview 3 or later.
+1. Install Visual Studio 2022 17.5 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.

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.6/PowerShell-7.2.6-win-x64.zip'
+  $PowerShellZipUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.0/PowerShell-7.3.0-win-x64.zip'
   Write-Host "Downloading: $PowerShellZipUrl"
   $ExtractedPowerShellPath = DownloadAndExtractZip -Url $PowerShellZipUrl
   $PwshPath = Join-Path $ExtractedPowerShellPath 'pwsh.exe'
@@ -141,7 +141,7 @@ $Workloads = @(
 $ReleaseInPath = 'Preview'
 $Sku = 'Enterprise'
 $VisualStudioBootstrapperUrl = 'https://aka.ms/vs/17/pre/vs_enterprise.exe'
-$PythonUrl = 'https://www.python.org/ftp/python/3.10.8/python-3.10.8-amd64.exe'
+$PythonUrl = 'https://www.python.org/ftp/python/3.11.0/python-3.11.0-amd64.exe'
 
 $CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/11.6.0/local_installers/cuda_11.6.0_511.23_windows.exe'
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -9,7 +9,7 @@ variables:
   benchmarkBuildOutputLocation: 'D:\benchmark'
 
 pool:
-  name: 'StlBuild-2022-10-11T1916-Pool'
+  name: 'StlBuild-2022-11-08T1904-Pool'
   demands: EnableSpotVM -equals true
 
 pr:

diff --git a/stl/inc/xstring b/stl/inc/xstring
@@ -376,7 +376,7 @@ public:
         _In_reads_(_Count) const _Elem* const _First2, const size_t _Count) noexcept /* strengthened */ {
         // compare [_First1, _First1 + _Count) with [_First2, ...)
 #if _HAS_CXX17
-#if _HAS_CXX20 && defined(__EDG__) // TRANSITION, VSO-1641993
+#if _HAS_CXX20 && defined(__EDG__) // TRANSITION, VSO-1675318
         if (_STD is_constant_evaluated()) {
             for (size_t _Idx = 0; _Idx != _Count; ++_Idx) {
                 if (static_cast<unsigned char>(_First1[_Idx]) < static_cast<unsigned char>(_First2[_Idx])) {
@@ -5367,38 +5367,27 @@ basic_ostream<_Elem, _Traits>& operator<<(
 
 inline namespace literals {
     inline namespace string_literals {
-
-#ifdef __EDG__ // TRANSITION, VSO-1273381
-#define _CONSTEXPR20_STRING_LITERALS inline
-#else // ^^^ workaround / no workaround vvv
-#define _CONSTEXPR20_STRING_LITERALS _CONSTEXPR20
-#endif // ^^^ no workaround ^^^
-
-        _EXPORT_STD _NODISCARD _CONSTEXPR20_STRING_LITERALS string operator"" s(const char* _Str, size_t _Len) {
+        _EXPORT_STD _NODISCARD _CONSTEXPR20 string operator"" s(const char* _Str, size_t _Len) {
             return string{_Str, _Len};
         }
 
-        _EXPORT_STD _NODISCARD _CONSTEXPR20_STRING_LITERALS wstring operator"" s(const wchar_t* _Str, size_t _Len) {
+        _EXPORT_STD _NODISCARD _CONSTEXPR20 wstring operator"" s(const wchar_t* _Str, size_t _Len) {
             return wstring{_Str, _Len};
         }
 
 #ifdef __cpp_char8_t
-        _EXPORT_STD _NODISCARD _CONSTEXPR20_STRING_LITERALS basic_string<char8_t> operator"" s(
-            const char8_t* _Str, size_t _Len) {
+        _EXPORT_STD _NODISCARD _CONSTEXPR20 basic_string<char8_t> operator"" s(const char8_t* _Str, size_t _Len) {
             return basic_string<char8_t>{_Str, _Len};
         }
 #endif // __cpp_char8_t
 
-        _EXPORT_STD _NODISCARD _CONSTEXPR20_STRING_LITERALS u16string operator"" s(const char16_t* _Str, size_t _Len) {
+        _EXPORT_STD _NODISCARD _CONSTEXPR20 u16string operator"" s(const char16_t* _Str, size_t _Len) {
             return u16string{_Str, _Len};
         }
 
-        _EXPORT_STD _NODISCARD _CONSTEXPR20_STRING_LITERALS u32string operator"" s(const char32_t* _Str, size_t _Len) {
+        _EXPORT_STD _NODISCARD _CONSTEXPR20 u32string operator"" s(const char32_t* _Str, size_t _Len) {
             return u32string{_Str, _Len};
         }
-
-#undef _CONSTEXPR20_STRING_LITERALS // TRANSITION, VSO-1273381
-
     } // namespace string_literals
 } // namespace literals
 

diff --git a/tests/std/tests/Dev10_816787_swap_vector_bool_elements/test.cpp b/tests/std/tests/Dev10_816787_swap_vector_bool_elements/test.cpp
@@ -17,7 +17,6 @@ int main() {
     assert(all_of(x.begin(), x.end(), is_false));
     assert(all_of(y.begin(), y.end(), is_true));
 
-#if !defined(__EDG__) || _ITERATOR_DEBUG_LEVEL != 2 // TRANSITION, VSO-1273381
     swap(x[12], y[34]);
 
     assert(all_of(x.begin(), x.begin() + 12, is_false));
@@ -27,5 +26,4 @@ int main() {
     assert(all_of(y.begin(), y.begin() + 34, is_true));
     assert(!y[34]);
     assert(all_of(y.begin() + 35, y.end(), is_true));
-#endif // !defined(__EDG__) || _ITERATOR_DEBUG_LEVEL != 2
 }