Skip to content

Commit 4e0c787

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#11319)
[main] Source code updates from dotnet/dotnet - Updating build pipelines and MSVC toolset - Updating TestAccessor - Merge branch 'main' into darc-main-f4a1a513-40ec-4a63-8292-e11b0ae6c082
1 parent 6f38bcb commit 4e0c787

File tree

21 files changed

+126
-131
lines changed

21 files changed

+126
-131
lines changed

‎azure-pipelines-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ stages:
4646
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
4747
${{ if eq(variables['System.TeamProject'], 'public') }}:
4848
name: NetCore-Public
49-
demands: ImageOverride -equals windows.vs2022preview.scout.amd64.Open
49+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64.Open
5050
${{ if eq(variables['System.TeamProject'], 'internal') }}:
5151
name: NetCore1ESPool-Internal
52-
demands: ImageOverride -equals windows.vs2022preview.scout.amd64
52+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
5353
variables:
5454
- name: _Platform
5555
value: x86

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ extends:
5050
binlogPath: artifacts/log/Debug/x86/Build.binlog
5151
pool:
5252
name: NetCore1ESPool-Internal
53-
demands: ImageOverride -equals windows.vs2022preview.scout.amd64
53+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64

‎eng/Version.Details.props‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props
88
<!-- dotnet/dotnet dependencies -->
99
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
1010
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.3.25574.108</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25574.108</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25574.108</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.3.25574.108</MicrosoftPrivateWinformsPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26055.114</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.26055.114</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26055.114</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26055.114</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>11.0.0-alpha.1.26055.114</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.26055.114</MicrosoftNETCoreAppRefPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-alpha.1.26055.114</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>11.0.0-alpha.1.26055.114</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
21-
<SystemCodeDomPackageVersion>10.0.0-rc.3.25574.108</SystemCodeDomPackageVersion>
22-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25574.108</SystemConfigurationConfigurationManagerPackageVersion>
23-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.3.25574.108</SystemDiagnosticsEventLogPackageVersion>
24-
<SystemDirectoryServicesPackageVersion>10.0.0-rc.3.25574.108</SystemDirectoryServicesPackageVersion>
25-
<SystemDrawingCommonPackageVersion>10.0.0-rc.3.25574.108</SystemDrawingCommonPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25574.108</SystemFormatsNrbfPackageVersion>
27-
<SystemIOPackagingPackageVersion>10.0.0-rc.3.25574.108</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.3.25574.108</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25574.108</SystemReflectionMetadataLoadContextPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25574.108</SystemResourcesExtensionsPackageVersion>
31-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25574.108</SystemRuntimeSerializationFormattersPackageVersion>
32-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.3.25574.108</SystemSecurityCryptographyXmlPackageVersion>
33-
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.3.25574.108</SystemSecurityPermissionsPackageVersion>
34-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25574.108</SystemWindowsExtensionsPackageVersion>
21+
<SystemCodeDomPackageVersion>11.0.0-alpha.1.26055.114</SystemCodeDomPackageVersion>
22+
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-alpha.1.26055.114</SystemConfigurationConfigurationManagerPackageVersion>
23+
<SystemDiagnosticsEventLogPackageVersion>11.0.0-alpha.1.26055.114</SystemDiagnosticsEventLogPackageVersion>
24+
<SystemDirectoryServicesPackageVersion>11.0.0-alpha.1.26055.114</SystemDirectoryServicesPackageVersion>
25+
<SystemDrawingCommonPackageVersion>11.0.0-alpha.1.26055.114</SystemDrawingCommonPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>11.0.0-alpha.1.26055.114</SystemFormatsNrbfPackageVersion>
27+
<SystemIOPackagingPackageVersion>11.0.0-alpha.1.26055.114</SystemIOPackagingPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>11.0.0-alpha.1.26055.114</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29+
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-alpha.1.26055.114</SystemReflectionMetadataLoadContextPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>11.0.0-alpha.1.26055.114</SystemResourcesExtensionsPackageVersion>
31+
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-alpha.1.26055.114</SystemRuntimeSerializationFormattersPackageVersion>
32+
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-alpha.1.26055.114</SystemSecurityCryptographyXmlPackageVersion>
33+
<SystemSecurityPermissionsPackageVersion>11.0.0-alpha.1.26055.114</SystemSecurityPermissionsPackageVersion>
34+
<SystemWindowsExtensionsPackageVersion>11.0.0-alpha.1.26055.114</SystemWindowsExtensionsPackageVersion>
3535
<!-- _git/dotnet-wpf-int dependencies -->
3636
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.26062.3</MicrosoftDotNetWpfDncEngPackageVersion>
3737
</PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="d119b40e8ff3b88f87ad60b04c807233a159b197" BarId="292184" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="67ecf9e85940271afc2728753b09789c64bfecf2" BarId="296137" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.3.25574.108">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="11.0.0-alpha.1.26055.114">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
7+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.3.25574.108">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="11.0.0-alpha.1.26055.114">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
11+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25574.108">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-alpha.1.26055.114">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
15+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.3.25574.108">
17+
<Dependency Name="System.Windows.Extensions" Version="11.0.0-alpha.1.26055.114">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
19+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25574.108">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-alpha.1.26055.114">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
23+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.26062.3">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>b6f8cd2316cad3031d295f8c7841e47fbeb73409</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25574.108">
29+
<Dependency Name="System.Resources.Extensions" Version="11.0.0-alpha.1.26055.114">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
31+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25574.108">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-alpha.1.26055.114">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
35+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25574.108">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.26055.114">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
39+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25574.108">
41+
<Dependency Name="System.CodeDom" Version="11.0.0-alpha.1.26055.114">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
43+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25574.108">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-alpha.1.26055.114">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
47+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.3.25574.108">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="11.0.0-alpha.1.26055.114">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
51+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.3.25574.108">
53+
<Dependency Name="System.DirectoryServices" Version="11.0.0-alpha.1.26055.114">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
55+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25574.108">
57+
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-alpha.1.26055.114">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
59+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.3.25574.108">
61+
<Dependency Name="System.IO.Packaging" Version="11.0.0-alpha.1.26055.114">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
63+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.3.25574.108">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-alpha.1.26055.114">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
67+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.3.25574.108">
69+
<Dependency Name="System.Security.Permissions" Version="11.0.0-alpha.1.26055.114">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
71+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.3.25574.108">
73+
<Dependency Name="System.Drawing.Common" Version="11.0.0-alpha.1.26055.114">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
75+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -84,21 +84,21 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25574.108">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26055.114">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
89+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25574.108">
91+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.26055.114">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
93+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25574.108">
95+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26055.114">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
97+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25574.108">
99+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26055.114">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
101+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
102102
</Dependency>
103103
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
104104
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
@@ -109,9 +109,9 @@
109109
<Uri>https://github.com/dotnet/dotnet</Uri>
110110
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
111111
</Dependency>
112-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.3.25574.108">
112+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="11.0.0-alpha.1.26055.114">
113113
<Uri>https://github.com/dotnet/dotnet</Uri>
114-
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
114+
<Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
115115
</Dependency>
116116
</ToolsetDependencies>
117117
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Import Project="Version.Details.props" />
44

55
<PropertyGroup>
6-
<MajorVersion>10</MajorVersion>
6+
<MajorVersion>11</MajorVersion>
77
<MinorVersion>0</MinorVersion>
88
<PatchVersion>0</PatchVersion>
9-
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
10-
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>
9+
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
10+
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
1111
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1212
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
1313
<DotNetFinalVersionKind></DotNetFinalVersionKind>

‎eng/WpfArcadeSdk/tools/Wpf.Cpp.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<VCProjectVersion>15.0</VCProjectVersion>
44
<CharacterSet>Unicode</CharacterSet>
55

6-
<!-- v143 = Visual Studio 2022 -->
7-
<PlatformToolset>v143</PlatformToolset>
6+
<!-- v145 = Visual Studio 2026 -->
7+
<PlatformToolset>v145</PlatformToolset>
88

9-
<!-- Windows 11 SDK -->
9+
<!-- 26100 is Windows 11 SDK -->
1010
<WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
1111

1212
<ConfigurationType Condition="'$(ConfigurationType)'==''">DynamicLibrary</ConfigurationType>

‎eng/common/core-templates/job/job.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ jobs:
7373
templateContext: ${{ parameters.templateContext }}
7474

7575
variables:
76+
- name: AllowPtrToDetectTestRunRetryFiles
77+
value: true
7678
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
7779
- name: DOTNET_CLI_TELEMETRY_PROFILE
7880
value: '$(Build.Repository.Uri)'

‎eng/common/core-templates/job/source-index-stage1.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
44
preSteps: []
55
binlogPath: artifacts/log/Debug/Build.binlog
6-
condition: ''
6+
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
77
dependsOn: ''
88
pool: ''
99
is1ESPipeline: ''
@@ -25,10 +25,10 @@ jobs:
2525
pool:
2626
${{ if eq(variables['System.TeamProject'], 'public') }}:
2727
name: $(DncEngPublicBuildPool)
28-
image: windows.vs2022.amd64.open
28+
image: windows.vs2026preview.scout.amd64.open
2929
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3030
name: $(DncEngInternalBuildPool)
31-
image: windows.vs2022.amd64
31+
image: windows.vs2026preview.scout.amd64
3232

3333
steps:
3434
- ${{ if eq(parameters.is1ESPipeline, '') }}:
@@ -41,4 +41,4 @@ jobs:
4141

4242
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
4343
parameters:
44-
binLogPath: ${{ parameters.binLogPath }}
44+
binLogPath: ${{ parameters.binLogPath }}

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ stages:
127127
${{ else }}:
128128
${{ if eq(parameters.is1ESPipeline, true) }}:
129129
name: $(DncEngInternalBuildPool)
130-
image: windows.vs2022.amd64
130+
image: windows.vs2026preview.scout.amd64
131131
os: windows
132132
${{ else }}:
133133
name: $(DncEngInternalBuildPool)
134-
demands: ImageOverride -equals windows.vs2022.amd64
134+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
135135

136136
steps:
137137
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -175,7 +175,7 @@ stages:
175175
os: windows
176176
${{ else }}:
177177
name: $(DncEngInternalBuildPool)
178-
demands: ImageOverride -equals windows.vs2022.amd64
178+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
179179
steps:
180180
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
181181
parameters:
@@ -236,7 +236,7 @@ stages:
236236
os: windows
237237
${{ else }}:
238238
name: $(DncEngInternalBuildPool)
239-
demands: ImageOverride -equals windows.vs2022.amd64
239+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
240240
steps:
241241
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
242242
parameters:

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ __AlpinePackages+=" krb5-dev"
7272
__AlpinePackages+=" openssl-dev"
7373
__AlpinePackages+=" zlib-dev"
7474

75-
__FreeBSDBase="13.4-RELEASE"
75+
__FreeBSDBase="13.5-RELEASE"
7676
__FreeBSDPkg="1.21.3"
7777
__FreeBSDABI="13"
7878
__FreeBSDPackages="libunwind"
@@ -383,7 +383,7 @@ while :; do
383383
;;
384384
freebsd14)
385385
__CodeName=freebsd
386-
__FreeBSDBase="14.2-RELEASE"
386+
__FreeBSDBase="14.3-RELEASE"
387387
__FreeBSDABI="14"
388388
__SkipUnmount=1
389389
;;

0 commit comments

Comments
 (0)