Skip to content

Commit ef7df32

Browse files
Toolset update: VS 2022 17.7 Preview 2 (#3769)
1 parent c8d1efb commit ef7df32

File tree

10 files changed

+16
-34
lines changed

10 files changed

+16
-34
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ 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.7 Preview 1 or later.
144+
1. Install Visual Studio 2022 17.7 Preview 2 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.
@@ -157,7 +157,7 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
157157

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

160-
1. Install Visual Studio 2022 17.7 Preview 1 or later.
160+
1. Install Visual Studio 2022 17.7 Preview 2 or later.
161161
* Select "Windows 11 SDK (10.0.22000.0)" in the VS Installer.
162162
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
163163
This will ensure that you're using supported versions of CMake and Ninja.

azure-devops/cmake-configure-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ steps:
4646
-host_arch=${{ parameters.hostArch }} -arch=${{ parameters.targetArch }} -no_logo
4747
cmake --build $(${{ parameters.buildOutputLocationVar }})
4848
displayName: 'Build the STL'
49-
timeoutInMinutes: 10
49+
timeoutInMinutes: 5
5050
env: { TMP: $(tmpDir), TEMP: $(tmpDir) }
5151
- script: |
5252
if exist "$(${{ parameters.benchmarkBuildOutputLocationVar }})" (
@@ -68,6 +68,6 @@ steps:
6868
-host_arch=${{ parameters.hostArch }} -arch=${{ parameters.targetArch }} -no_logo
6969
cmake --build $(${{ parameters.benchmarkBuildOutputLocationVar }})
7070
displayName: 'Build the benchmarks'
71-
timeoutInMinutes: 10
71+
timeoutInMinutes: 2
7272
env: { TMP: $(tmpDir), TEMP: $(tmpDir) }
7373
condition: ne('${{ parameters.benchmarkBuildOutputLocationVar }}', '')

azure-devops/create-1es-hosted-pool.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $ErrorActionPreference = 'Stop'
1414
$CurrentDate = Get-Date
1515

1616
$Location = 'eastus'
17-
$VMSize = 'Standard_D32ds_v5'
17+
$VMSize = 'Standard_D32ads_v5'
1818
$ProtoVMName = 'PROTOTYPE'
1919
$ImagePublisher = 'MicrosoftWindowsServer'
2020
$ImageOffer = 'WindowsServer'

azure-devops/cross-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
litFlags: '$(fixedFlags);$(parallelismFlag);$(xmlOutputFlag);$(shardFlags)'
2929
strategy:
3030
parallel: ${{ parameters.numShards }}
31-
timeoutInMinutes: 360
31+
timeoutInMinutes: 25
3232
steps:
3333
- script: |
3434
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
@@ -25,7 +25,7 @@ jobs:
2525
litFlags: '$(fixedFlags);$(parallelismFlag);$(xmlOutputFlag);$(shardFlags)'
2626
strategy:
2727
parallel: ${{ parameters.numShards }}
28-
timeoutInMinutes: 360
28+
timeoutInMinutes: 25
2929
steps:
3030
- script: |
3131
if exist "$(tmpDir)" (rmdir /S /Q $(tmpDir))

azure-devops/provision-image.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.11.3/python-3.11.3-amd64.exe'
139+
$PythonUrl = 'https://www.python.org/ftp/python/3.11.4/python-3.11.4-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: 2 additions & 2 deletions
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: 120
20+
timeoutInMinutes: 20
2121
condition: succeeded()
2222
inputs:
2323
workingDirectory: $(${{ parameters.buildOutputLocationVar }})
@@ -28,7 +28,7 @@ steps:
2828
env: { TMP: $(tmpDir), TEMP: $(tmpDir) }
2929
- task: PublishTestResults@2
3030
displayName: 'Publish Tests'
31-
timeoutInMinutes: 10
31+
timeoutInMinutes: 5
3232
condition: succeededOrFailed()
3333
inputs:
3434
searchFolder: $(${{ parameters.buildOutputLocationVar }})

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ variables:
99
benchmarkBuildOutputLocation: 'D:\benchmark'
1010

1111
pool:
12-
name: 'StlBuild-2023-05-16T1204-Pool'
12+
name: 'StlBuild-2023-06-13T1913-Pool'
1313
demands: EnableSpotVM -equals true
1414

1515
pr:
@@ -20,7 +20,7 @@ stages:
2020
displayName: 'Code Format'
2121
jobs:
2222
- job: Code_Format_Validation
23-
timeoutInMinutes: 20
23+
timeoutInMinutes: 5
2424
displayName: 'Validation'
2525
steps:
2626
- script: |

stl/inc/memory

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,11 +1218,7 @@ public:
12181218
_Ref_count_resource(_Resource _Px, _Dx _Dt)
12191219
: _Ref_count_base(), _Mypair(_One_then_variadic_args_t{}, _STD move(_Dt), _Px) {}
12201220

1221-
#ifdef __EDG__ // TRANSITION, VSO-1292293
1222-
~_Ref_count_resource() noexcept override {} // TRANSITION, should be non-virtual
1223-
#else // ^^^ workaround / no workaround vvv
12241221
~_Ref_count_resource() noexcept override = default; // TRANSITION, should be non-virtual
1225-
#endif // ^^^ no workaround ^^^
12261222

12271223
void* _Get_deleter(const type_info& _Typeid) const noexcept override {
12281224
#if _HAS_STATIC_RTTI
@@ -1256,11 +1252,7 @@ public:
12561252
: _Ref_count_base(),
12571253
_Mypair(_One_then_variadic_args_t{}, _STD move(_Dt), _One_then_variadic_args_t{}, _Ax, _Px) {}
12581254

1259-
#ifdef __EDG__ // TRANSITION, VSO-1292293
1260-
~_Ref_count_resource_alloc() noexcept override {} // TRANSITION, should be non-virtual
1261-
#else // ^^^ workaround / no workaround vvv
12621255
~_Ref_count_resource_alloc() noexcept override = default; // TRANSITION, should be non-virtual
1263-
#endif // ^^^ no workaround ^^^
12641256

12651257
void* _Get_deleter(const type_info& _Typeid) const noexcept override {
12661258
#if _HAS_STATIC_RTTI

stl/inc/xutility

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4170,24 +4170,14 @@ public:
41704170
return _Left._Current - _Right._Get_last();
41714171
}
41724172

4173-
_NODISCARD_FRIEND constexpr reference iter_move(const move_iterator& _It)
4174-
#ifdef __EDG__ // TRANSITION, VSO-1222776
4175-
noexcept(noexcept(_RANGES iter_move(_STD declval<const _Iter&>())))
4176-
#else // ^^^ workaround / no workaround vvv
4177-
noexcept(noexcept(_RANGES iter_move(_It._Current)))
4178-
#endif // TRANSITION, VSO-1222776
4179-
{
4173+
_NODISCARD_FRIEND constexpr reference iter_move(const move_iterator& _It) noexcept(
4174+
noexcept(_RANGES iter_move(_It._Current))) {
41804175
return _RANGES iter_move(_It._Current);
41814176
}
41824177

41834178
template <indirectly_swappable<_Iter> _Iter2>
4184-
friend constexpr void iter_swap(const move_iterator& _Left, const move_iterator<_Iter2>& _Right)
4185-
#ifdef __EDG__ // TRANSITION, VSO-1222776
4186-
noexcept(noexcept(_RANGES iter_swap(_STD declval<const _Iter&>(), _STD declval<const _Iter2&>())))
4187-
#else // ^^^ workaround / no workaround vvv
4188-
noexcept(noexcept(_RANGES iter_swap(_Left._Current, _Right.base())))
4189-
#endif // TRANSITION, VSO-1222776
4190-
{
4179+
friend constexpr void iter_swap(const move_iterator& _Left, const move_iterator<_Iter2>& _Right) noexcept(
4180+
noexcept(_RANGES iter_swap(_Left._Current, _Right.base()))) {
41914181
_RANGES iter_swap(_Left._Current, _Right.base());
41924182
}
41934183
#endif // __cpp_lib_concepts

0 commit comments

Comments
 (0)