Skip to content

Commit 64e410c

Browse files
Toolset update: VS 2022 17.10 Preview 1 (#4392)
1 parent bd3d740 commit 64e410c

File tree

45 files changed

+86
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+86
-194
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
33

4-
cmake_minimum_required(VERSION 3.27.0)
4+
cmake_minimum_required(VERSION 3.28.0)
55

66
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
77
project(msvc_standard_libraries LANGUAGES CXX)

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
141141

142142
# How To Build With The Visual Studio IDE
143143

144-
1. Install Visual Studio 2022 17.9 Preview 2 or later.
144+
1. Install Visual Studio 2022 17.10 Preview 1 or later.
145145
* Select "Windows 11 SDK (10.0.22000.0)" in the VS Installer.
146146
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
147147
This will ensure that you're using supported versions of CMake and Ninja.
148-
* Otherwise, install [CMake][] 3.27.0 or later, and [Ninja][] 1.11.0 or later.
148+
* Otherwise, install [CMake][] 3.28.0 or later, and [Ninja][] 1.11.0 or later.
149149
* Make sure [Python][] 3.12 or later is available to CMake.
150150
2. Open Visual Studio, and choose the "Clone or check out code" option. Enter the URL of this repository,
151151
`https://github.com/microsoft/STL`.
@@ -156,11 +156,11 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
156156

157157
# How To Build With A Native Tools Command Prompt
158158

159-
1. Install Visual Studio 2022 17.9 Preview 2 or later.
159+
1. Install Visual Studio 2022 17.10 Preview 1 or later.
160160
* Select "Windows 11 SDK (10.0.22000.0)" in the VS Installer.
161161
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
162162
This will ensure that you're using supported versions of CMake and Ninja.
163-
* Otherwise, install [CMake][] 3.27.0 or later, and [Ninja][] 1.11.0 or later.
163+
* Otherwise, install [CMake][] 3.28.0 or later, and [Ninja][] 1.11.0 or later.
164164
* Make sure [Python][] 3.12 or later is available to CMake.
165165
2. Open a command prompt.
166166
3. Change directories to a location where you'd like a clone of this STL repository.

azure-devops/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
variables:
77
- name: poolName
8-
value: 'StlBuild-2024-01-09T1215-Pool'
8+
value: 'StlBuild-2024-02-13T1246-Pool'
99
readonly: true
1010
- name: poolDemands
1111
value: 'EnableSpotVM -equals true'

azure-devops/cross-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- job: '${{ parameters.targetPlatform }}'
2020
strategy:
2121
parallel: ${{ parameters.numShards }}
22-
timeoutInMinutes: 25
22+
timeoutInMinutes: 30
2323
steps:
2424
- script: |
2525
if exist "$(tmpDir)" (rmdir /S /Q $(tmpDir))

azure-devops/native-build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- job: '${{ parameters.targetPlatform }}'
2525
strategy:
2626
parallel: ${{ parameters.numShards }}
27-
timeoutInMinutes: 25
27+
timeoutInMinutes: 30
2828
steps:
2929
- script: |
3030
if exist "$(tmpDir)" (rmdir /S /Q $(tmpDir))

azure-devops/provision-image.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if ([string]::IsNullOrEmpty($AdminUserPassword)) {
9191
$PsExecPath = Join-Path $ExtractedPsToolsPath 'PsExec64.exe'
9292

9393
# https://github.com/PowerShell/PowerShell/releases/latest
94-
$PowerShellZipUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/PowerShell-7.4.0-win-x64.zip'
94+
$PowerShellZipUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.1/PowerShell-7.4.1-win-x64.zip'
9595
Write-Host "Downloading: $PowerShellZipUrl"
9696
$ExtractedPowerShellPath = DownloadAndExtractZip -Url $PowerShellZipUrl
9797
$PwshPath = Join-Path $ExtractedPowerShellPath 'pwsh.exe'
@@ -136,7 +136,7 @@ $Workloads = @(
136136
)
137137

138138
$VisualStudioBootstrapperUrl = 'https://aka.ms/vs/17/pre/vs_enterprise.exe'
139-
$PythonUrl = 'https://www.python.org/ftp/python/3.12.1/python-3.12.1-amd64.exe'
139+
$PythonUrl = 'https://www.python.org/ftp/python/3.12.2/python-3.12.2-amd64.exe'
140140

141141
$CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/11.6.0/local_installers/cuda_11.6.0_511.23_windows.exe'
142142

azure-devops/run-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ parameters:
1717
steps:
1818
- task: CmdLine@2
1919
displayName: ${{ parameters.displayName }}
20-
timeoutInMinutes: 20
20+
timeoutInMinutes: 30
2121
condition: succeeded()
2222
inputs:
2323
workingDirectory: $(buildOutputLocation)

benchmarks/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation.
22
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
33

4-
cmake_minimum_required(VERSION 3.27.0)
4+
cmake_minimum_required(VERSION 3.28.0)
55
project(msvc_standard_libraries_benchmarks LANGUAGES CXX)
66

77
if(DEFINED STL_BINARY_DIR)

stl/inc/__msvc_all_public_headers.hpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,6 @@
2424
#include <mbctype.h>
2525
#endif // !defined(_MSVC_TESTING_NVCC)
2626

27-
#if 1 // TRANSITION, OS-17090155 (UCRT)
28-
#define _CRT_DECLARE_NONSTDC_NAMES 0
29-
#ifndef _MSVC_TESTING_NVCC
30-
#include <sys/stat.h>
31-
#include <sys/timeb.h>
32-
#include <sys/utime.h>
33-
#endif // !defined(_MSVC_TESTING_NVCC)
34-
#undef _CRT_DECLARE_NONSTDC_NAMES
35-
#endif // TRANSITION, OS-17090155 (UCRT)
36-
3727
#define _SILENCE_CXX17_C_HEADER_DEPRECATION_WARNING
3828
#define _SILENCE_CXX20_CISO646_REMOVED_WARNING
3929
#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING

stl/inc/__msvc_iter_core.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -405,11 +405,7 @@ concept weakly_incrementable = movable<_Ty>
405405
requires _Signed_integer_like<iter_difference_t<_Ty>>;
406406
{ ++__i } -> same_as<_Ty&>;
407407
__i++;
408-
}
409-
#ifdef __clang__ // TRANSITION, LLVM-48173
410-
&& !same_as<_Ty, bool>
411-
#endif // ^^^ workaround ^^^
412-
;
408+
};
413409

414410
_EXPORT_STD template <class _It>
415411
concept input_or_output_iterator = requires(_It __i) { { *__i } -> _Can_reference; }

0 commit comments

Comments
 (0)