From 8f67ece4a654625220642c92fa029a5cfc77afa8 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Thu, 14 Sep 2023 19:53:05 -0700 Subject: [PATCH] Toolset update: VS 2022 17.8 Preview 2 (#4028) --- CMakeLists.txt | 2 +- README.md | 8 ++++---- azure-devops/provision-image.ps1 | 2 +- azure-pipelines.yml | 2 +- benchmarks/CMakeLists.txt | 2 +- stl/inc/mdspan | 20 +++++++------------- tools/CMakeLists.txt | 2 +- tools/format/CMakeLists.txt | 2 +- tools/validate/CMakeLists.txt | 2 +- 9 files changed, 18 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62756db88e..296177335e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -cmake_minimum_required(VERSION 3.26.0) +cmake_minimum_required(VERSION 3.27.0) set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) project(msvc_standard_libraries LANGUAGES CXX) diff --git a/README.md b/README.md index 6eb42e7d88..39cd378287 100644 --- a/README.md +++ b/README.md @@ -141,11 +141,11 @@ 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.8 Preview 1 or later. +1. Install Visual Studio 2022 17.8 Preview 2 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.26.0 or later, and [Ninja][] 1.11.0 or later. + * Otherwise, install [CMake][] 3.27.0 or later, and [Ninja][] 1.11.0 or later. * We recommend selecting "Python 3 64-bit" in the VS Installer. * Otherwise, make sure [Python][] 3.9 or later is available to CMake. 2. Open Visual Studio, and choose the "Clone or check out code" option. Enter the URL of this repository, @@ -157,11 +157,11 @@ 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.8 Preview 1 or later. +1. Install Visual Studio 2022 17.8 Preview 2 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.26.0 or later, and [Ninja][] 1.11.0 or later. + * Otherwise, install [CMake][] 3.27.0 or later, and [Ninja][] 1.11.0 or later. * We recommend selecting "Python 3 64-bit" in the VS Installer. * Otherwise, make sure [Python][] 3.9 or later is available to CMake. 2. Open a command prompt. diff --git a/azure-devops/provision-image.ps1 b/azure-devops/provision-image.ps1 index d6de6a305b..5b98c79a01 100644 --- a/azure-devops/provision-image.ps1 +++ b/azure-devops/provision-image.ps1 @@ -136,7 +136,7 @@ $Workloads = @( ) $VisualStudioBootstrapperUrl = 'https://aka.ms/vs/17/pre/vs_enterprise.exe' -$PythonUrl = 'https://www.python.org/ftp/python/3.11.4/python-3.11.4-amd64.exe' +$PythonUrl = 'https://www.python.org/ftp/python/3.11.5/python-3.11.5-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 index 68b5db353d..e469634c6e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,7 +9,7 @@ variables: benchmarkBuildOutputLocation: 'D:\benchmark' pool: - name: 'StlBuild-2023-08-08T1145-Pool' + name: 'StlBuild-2023-09-14T1251-Pool' demands: EnableSpotVM -equals true pr: diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index d9b35a2e68..9568e6f8bc 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -cmake_minimum_required(VERSION 3.26.0) +cmake_minimum_required(VERSION 3.27.0) project(msvc_standard_libraries_benchmarks LANGUAGES CXX) if(DEFINED STL_BINARY_DIR) diff --git a/stl/inc/mdspan b/stl/inc/mdspan index ed037824dc..12e0219294 100644 --- a/stl/inc/mdspan +++ b/stl/inc/mdspan @@ -274,10 +274,7 @@ public: return true; } else { index_type _Result{1}; -#pragma warning(push) -#pragma warning(disable : 6287) // TRANSITION, DevCom-10398426 const bool _Overflow = (_Mul_overflow(static_cast(_Extents), _Result, _Result) || ...); -#pragma warning(pop) return !_Overflow; } } @@ -864,20 +861,17 @@ public: constexpr mapping(const mapping&) noexcept = default; - // TRANSITION, VSO-1852021: `_Extents::rank()` should be `extents_type::rank()` - // TRANSITION, VSO-1852030: `typename _Extents::index_type` should be `index_type` template - requires is_convertible_v - && is_nothrow_constructible_v - constexpr mapping(const extents_type& _Exts_, span<_OtherIndexType, _Extents::rank()> _Strides_) noexcept + requires is_convertible_v + && is_nothrow_constructible_v + constexpr mapping(const extents_type& _Exts_, span<_OtherIndexType, extents_type::rank()> _Strides_) noexcept : mapping(_Exts_, _Strides_, make_index_sequence{}) {} - // TRANSITION, VSO-1852021: `_Extents::rank()` should be `extents_type::rank()` - // TRANSITION, VSO-1852030: `typename _Extents::index_type` should be `index_type` template - requires is_convertible_v - && is_nothrow_constructible_v - constexpr mapping(const extents_type& _Exts_, const array<_OtherIndexType, _Extents::rank()>& _Strides_) noexcept + requires is_convertible_v + && is_nothrow_constructible_v + constexpr mapping( + const extents_type& _Exts_, const array<_OtherIndexType, extents_type::rank()>& _Strides_) noexcept : mapping(_Exts_, span{_Strides_}, make_index_sequence{}) {} template diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index a2e00355de..f4d39316d8 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -cmake_minimum_required(VERSION 3.26.0) +cmake_minimum_required(VERSION 3.27.0) project(msvc_standard_libraries_tools LANGUAGES CXX) add_subdirectory(format) diff --git a/tools/format/CMakeLists.txt b/tools/format/CMakeLists.txt index 4574232ee1..4ccdf836b0 100644 --- a/tools/format/CMakeLists.txt +++ b/tools/format/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -cmake_minimum_required(VERSION 3.26.0) +cmake_minimum_required(VERSION 3.27.0) project(msvc_standard_libraries_format NONE) set(did_search OFF) diff --git a/tools/validate/CMakeLists.txt b/tools/validate/CMakeLists.txt index ff7c92b5ae..8c7b2a7e25 100644 --- a/tools/validate/CMakeLists.txt +++ b/tools/validate/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -cmake_minimum_required(VERSION 3.26.0) +cmake_minimum_required(VERSION 3.27.0) project(msvc_standard_libraries_validate LANGUAGES CXX) add_executable(validate-binary validate.cpp)