Skip to content

Commit b85dd2c

Browse files
Toolset update: VS 2022 17.13 Preview 2, F32as_v6 (#5186)
1 parent 89ca073 commit b85dd2c

File tree

8 files changed

+21
-19
lines changed

8 files changed

+21
-19
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.13 Preview 1 or later.
144+
1. Install Visual Studio 2022 17.13 Preview 2 or later.
145145
* Select "Windows 11 SDK (10.0.22621.0)" in the VS Installer.
146146
* Select "MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest)" in the VS Installer
147147
if you would like to build the ARM64/ARM64EC target.
@@ -160,7 +160,7 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
160160

161161
# How To Build With A Native Tools Command Prompt
162162

163-
1. Install Visual Studio 2022 17.13 Preview 1 or later.
163+
1. Install Visual Studio 2022 17.13 Preview 2 or later.
164164
* Select "Windows 11 SDK (10.0.22621.0)" in the VS Installer.
165165
* Select "MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest)" in the VS Installer
166166
if you would like to build the ARM64/ARM64EC target.

azure-devops/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55

66
variables:
77
- name: poolName
8-
value: 'StlBuild-2024-11-12T1255-Pool'
8+
value: 'StlBuild-2024-12-12T1002-Pool'
99
readonly: true
1010
- name: poolDemands
1111
value: 'EnableSpotVM -equals false'
1212
readonly: true
1313
- name: tmpDir
14-
value: 'D:\Temp'
14+
value: 'C:\stlTemp'
1515
readonly: true
1616
- name: buildOutputLocation
17-
value: 'D:\build'
17+
value: 'C:\stlBuild'
1818
readonly: true
1919
- name: benchmarkBuildOutputLocation
20-
value: 'D:\benchmark'
20+
value: 'C:\stlBenchmark'
2121
readonly: true
2222
- name: validationBuildOutputLocation
23-
value: 'D:\validation'
23+
value: 'C:\stlValidation'
2424
readonly: true
2525
- name: Codeql.SkipTaskAutoInjection
2626
value: true

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $ErrorActionPreference = 'Stop'
1414
$CurrentDate = Get-Date
1515

1616
$Location = 'eastus2'
17-
$VMSize = 'Standard_D32ads_v5'
17+
$VMSize = 'Standard_F32as_v6'
1818
$ProtoVMName = 'PROTOTYPE'
1919
$ImagePublisher = 'MicrosoftWindowsServer'
2020
$ImageOffer = 'WindowsServer'
@@ -141,6 +141,7 @@ Display-ProgressBar -Status 'Creating prototype VM'
141141
$VM = New-AzVMConfig `
142142
-VMName $ProtoVMName `
143143
-VMSize $VMSize `
144+
-DiskControllerType 'NVMe' `
144145
-Priority 'Regular'
145146

146147
$VM = Set-AzVMOperatingSystem `
@@ -261,6 +262,9 @@ New-AzRoleAssignment `
261262
Display-ProgressBar -Status 'Creating image definition'
262263

263264
$ImageDefinitionName = $ResourceGroupName + '-ImageDefinition'
265+
$FeatureTrustedLaunch = @{ Name = 'SecurityType'; Value = 'TrustedLaunch'; }
266+
$FeatureNVMe = @{ Name = 'DiskControllerTypes'; Value = 'SCSI, NVMe'; }
267+
$ImageDefinitionFeatures = @($FeatureTrustedLaunch, $FeatureNVMe)
264268
New-AzGalleryImageDefinition `
265269
-Location $Location `
266270
-ResourceGroupName $ResourceGroupName `
@@ -271,7 +275,7 @@ New-AzGalleryImageDefinition `
271275
-Publisher $ImagePublisher `
272276
-Offer $ImageOffer `
273277
-Sku $ImageSku `
274-
-Feature @(@{ Name = 'SecurityType'; Value = 'TrustedLaunch'; }) `
278+
-Feature $ImageDefinitionFeatures `
275279
-HyperVGeneration 'V2' | Out-Null
276280

277281
####################################################################################################

azure-devops/provision-image.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ foreach ($workload in $VisualStudioWorkloads) {
4343
$PowerShellUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.6/PowerShell-7.4.6-win-x64.msi'
4444
$PowerShellArgs = @('/quiet', '/norestart')
4545

46-
$PythonUrl = 'https://www.python.org/ftp/python/3.13.0/python-3.13.0-amd64.exe'
46+
$PythonUrl = 'https://www.python.org/ftp/python/3.13.1/python-3.13.1-amd64.exe'
4747
$PythonArgs = @('/quiet', 'InstallAllUsers=1', 'PrependPath=1', 'CompileAll=1', 'Include_doc=0')
4848

4949
$CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/12.4.0/local_installers/cuda_12.4.0_551.61_windows.exe'
@@ -75,7 +75,7 @@ Function DownloadAndInstall {
7575

7676
try {
7777
Write-Host "Downloading $Name..."
78-
$tempPath = 'D:\installerTemp'
78+
$tempPath = 'C:\installerTemp'
7979
mkdir $tempPath -Force | Out-Null
8080
$fileName = [uri]::new($Url).Segments[-1]
8181
$installerPath = Join-Path $tempPath $fileName

tests/std/tests/Dev09_056375_locale_cleanup/test.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ void test_dll() {
8383
TheFuncProc pFunc = reinterpret_cast<TheFuncProc>(GetProcAddress(hLibrary, "DllTest"));
8484
assert(pFunc != nullptr);
8585
pFunc();
86-
#if defined(_MSVC_INTERNAL_TESTING) || defined(_DLL) || !defined(__SANITIZE_ADDRESS__) // TRANSITION, vs17.13p2
8786
FreeLibrary(hLibrary);
88-
#endif // ^^^ no workaround ^^^
8987
#endif // ^^^ !defined(_M_CEE) ^^^
9088
}
9189

tests/std/tests/P0323R12_expected/test.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2385,10 +2385,8 @@ static_assert(
23852385
static_assert(!is_assignable_v<expected<int, char>&, ambiguating_expected_assignment_source<int, char>>);
23862386
static_assert(!is_assignable_v<expected<void, int>&, ambiguating_expected_assignment_source<void, int>>);
23872387
#endif // ^^^ no workaround ^^^
2388-
#ifndef __EDG__ // TRANSITION, VSO-2188364
23892388
static_assert(!is_assignable_v<expected<move_only, char>&, ambiguating_expected_assignment_source<move_only, char>>);
23902389
static_assert(!is_assignable_v<expected<void, move_only>&, ambiguating_expected_assignment_source<void, move_only>>);
2391-
#endif // ^^^ no workaround ^^^
23922390

23932391
int main() {
23942392
test_unexpected::test_all();

tests/std/tests/P1502R1_standard_library_header_units/custom_format.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ def getBuildSteps(self, test, litConfig, shared):
6262
# Generate JSON files that record how these headers depend on one another.
6363
if noisyProgress:
6464
print('Scanning dependencies...')
65-
cmd = [test.cxx, *test.flags, *test.compileFlags, *clOptions, '/scanDependencies', '.\\', *allHeaders]
65+
cmd = [test.cxx, *test.flags, *test.compileFlags, *clOptions, '/scanDependencies', '.\\',
66+
'/shallowScan', # TRANSITION, VSO-2293247 fixed in VS 2022 17.13 Preview 3 (remove /shallowScan)
67+
*allHeaders]
6668
yield TestStep(cmd, shared.execDir, shared.env, False)
6769

6870
# The JSON files also record what object files will be produced.

tests/std/tests/P2502R2_generator/test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void test_weird_reference_types() {
152152
assert(pos == r.end());
153153
}
154154

155-
#if !(defined(__EDG__) || (defined(__clang__) && defined(_M_IX86))) // TRANSITION, VSO-2254804 and LLVM-56507
155+
#if !(defined(__clang__) && defined(_M_IX86)) // TRANSITION, LLVM-56507
156156
{ // Test with mutable rvalue reference type
157157
constexpr size_t segment_size = 16;
158158
auto woof = []() -> generator<vector<int>&&> {
@@ -172,7 +172,7 @@ void test_weird_reference_types() {
172172
#endif // ^^^ no workaround ^^^
173173
}
174174

175-
#if !(defined(__EDG__) || (defined(__clang__) && defined(_M_IX86))) // TRANSITION, VSO-2254804 and LLVM-56507
175+
#if !(defined(__clang__) && defined(_M_IX86)) // TRANSITION, LLVM-56507
176176
generator<int> iota_repeater(const int hi, const int depth) {
177177
if (depth > 0) {
178178
co_yield ranges::elements_of(iota_repeater(hi, depth - 1));
@@ -401,7 +401,7 @@ int main() {
401401
assert(ranges::equal(co_upto(6), views::iota(0, 6)));
402402
zip_example();
403403
test_weird_reference_types();
404-
#if !(defined(__EDG__) || (defined(__clang__) && defined(_M_IX86))) // TRANSITION, VSO-2254804 and LLVM-56507
404+
#if !(defined(__clang__) && defined(_M_IX86)) // TRANSITION, LLVM-56507
405405
recursive_test();
406406
arbitrary_range_test();
407407

0 commit comments

Comments
 (0)