Skip to content

Commit 6511d1e

Browse files
github-actions[bot]github-actions[bot]
committed
Reset files to feature/net11-scouting
Reset patterns: - global.json - eng/Version.Details.xml - eng/Version.Details.props - eng/Versions.props - eng/common/** - eng/TargetFrameworks.props
1 parent df38aef commit 6511d1e

36 files changed

+873
-397
lines changed

‎eng/TargetFrameworks.props‎

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

1212
<PropertyGroup>
1313
<!-- Default target framework for F# products - only set if not already provided -->
14-
<FSharpNetCoreProductTargetFramework Condition="'$(FSharpNetCoreProductTargetFramework)' == ''">net10.0</FSharpNetCoreProductTargetFramework>
14+
<FSharpNetCoreProductTargetFramework Condition="'$(FSharpNetCoreProductTargetFramework)' == ''">net11.0</FSharpNetCoreProductTargetFramework>
1515

1616
<!-- Derive major version by stripping 'net' prefix and '.0' suffix (e.g., net10.0 -> 10) -->
1717
<FSharpNetCoreProductMajorVersion>$([System.Text.RegularExpressions.Regex]::Replace('$(FSharpNetCoreProductTargetFramework)', '^net(\d+)\.0$', '$1'))</FSharpNetCoreProductMajorVersion>

‎eng/Version.Details.props‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-arcade dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26177.7</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26171.1</MicrosoftDotNetArcadeSdkPackageVersion>
1010
<!-- dotnet-msbuild dependencies -->
11-
<MicrosoftBuildPackageVersion>18.6.0-preview-26177-02</MicrosoftBuildPackageVersion>
12-
<MicrosoftBuildFrameworkPackageVersion>18.6.0-preview-26177-02</MicrosoftBuildFrameworkPackageVersion>
13-
<MicrosoftBuildTasksCorePackageVersion>18.6.0-preview-26177-02</MicrosoftBuildTasksCorePackageVersion>
14-
<MicrosoftBuildUtilitiesCorePackageVersion>18.6.0-preview-26177-02</MicrosoftBuildUtilitiesCorePackageVersion>
11+
<MicrosoftBuildPackageVersion>18.6.0-preview-26170-03</MicrosoftBuildPackageVersion>
12+
<MicrosoftBuildFrameworkPackageVersion>18.6.0-preview-26170-03</MicrosoftBuildFrameworkPackageVersion>
13+
<MicrosoftBuildTasksCorePackageVersion>18.6.0-preview-26170-03</MicrosoftBuildTasksCorePackageVersion>
14+
<MicrosoftBuildUtilitiesCorePackageVersion>18.6.0-preview-26170-03</MicrosoftBuildUtilitiesCorePackageVersion>
1515
<!-- dotnet-optimization dependencies -->
1616
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26153.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
1717
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.26153.1</optimizationlinuxx64MIBCRuntimePackageVersion>
1818
<optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26153.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
1919
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.26153.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
2020
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.26153.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
2121
<!-- dotnet-roslyn dependencies -->
22-
<MicrosoftCodeAnalysisPackageVersion>5.6.0-2.26173.11</MicrosoftCodeAnalysisPackageVersion>
23-
<MicrosoftCodeAnalysisCompilersPackageVersion>5.6.0-2.26173.11</MicrosoftCodeAnalysisCompilersPackageVersion>
24-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.6.0-2.26173.11</MicrosoftCodeAnalysisCSharpPackageVersion>
25-
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.6.0-2.26173.11</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
26-
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.6.0-2.26173.11</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
27-
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.6.0-2.26173.11</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
28-
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.6.0-2.26173.11</MicrosoftCodeAnalysisFeaturesPackageVersion>
29-
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.6.0-2.26173.11</MicrosoftVisualStudioLanguageServicesPackageVersion>
22+
<MicrosoftCodeAnalysisPackageVersion>5.6.0-2.26172.2</MicrosoftCodeAnalysisPackageVersion>
23+
<MicrosoftCodeAnalysisCompilersPackageVersion>5.6.0-2.26172.2</MicrosoftCodeAnalysisCompilersPackageVersion>
24+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.6.0-2.26172.2</MicrosoftCodeAnalysisCSharpPackageVersion>
25+
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.6.0-2.26172.2</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
26+
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.6.0-2.26172.2</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
27+
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.6.0-2.26172.2</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
28+
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.6.0-2.26172.2</MicrosoftCodeAnalysisFeaturesPackageVersion>
29+
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.6.0-2.26172.2</MicrosoftVisualStudioLanguageServicesPackageVersion>
3030
<!-- dotnet-runtime dependencies -->
3131
<SystemCollectionsImmutablePackageVersion>10.0.2</SystemCollectionsImmutablePackageVersion>
3232
<SystemCompositionPackageVersion>10.0.2</SystemCompositionPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,53 +2,53 @@
22
<Dependencies>
33
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="542fea6988c173c64859bab06c9d2d100034843c" BarId="305563" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Build" Version="18.6.0-preview-26177-02">
5+
<Dependency Name="Microsoft.Build" Version="18.6.0-preview-26170-03">
66
<Uri>https://github.com/dotnet/msbuild</Uri>
7-
<Sha>db5eca3d0f2c02edc7caf5ceb64ee01547e360b5</Sha>
7+
<Sha>5071b11439964a74583693723fc0db70405e30a1</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Build.Framework" Version="18.6.0-preview-26177-02">
9+
<Dependency Name="Microsoft.Build.Framework" Version="18.6.0-preview-26170-03">
1010
<Uri>https://github.com/dotnet/msbuild</Uri>
11-
<Sha>db5eca3d0f2c02edc7caf5ceb64ee01547e360b5</Sha>
11+
<Sha>5071b11439964a74583693723fc0db70405e30a1</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.6.0-preview-26177-02">
13+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.6.0-preview-26170-03">
1414
<Uri>https://github.com/dotnet/msbuild</Uri>
15-
<Sha>db5eca3d0f2c02edc7caf5ceb64ee01547e360b5</Sha>
15+
<Sha>5071b11439964a74583693723fc0db70405e30a1</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.6.0-preview-26177-02">
17+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.6.0-preview-26170-03">
1818
<Uri>https://github.com/dotnet/msbuild</Uri>
19-
<Sha>db5eca3d0f2c02edc7caf5ceb64ee01547e360b5</Sha>
19+
<Sha>5071b11439964a74583693723fc0db70405e30a1</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.CodeAnalysis" Version="5.6.0-2.26173.11">
21+
<Dependency Name="Microsoft.CodeAnalysis" Version="5.6.0-2.26172.2">
2222
<Uri>https://github.com/dotnet/roslyn</Uri>
23-
<Sha>bd2083ff6d56b296fa1ea5647850c166b5e55fb7</Sha>
23+
<Sha>6e85e46dc82d3eefb46eca37e213c5d32093a8ff</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.6.0-2.26173.11">
25+
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.6.0-2.26172.2">
2626
<Uri>https://github.com/dotnet/roslyn</Uri>
27-
<Sha>bd2083ff6d56b296fa1ea5647850c166b5e55fb7</Sha>
27+
<Sha>6e85e46dc82d3eefb46eca37e213c5d32093a8ff</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.6.0-2.26173.11">
29+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.6.0-2.26172.2">
3030
<Uri>https://github.com/dotnet/roslyn</Uri>
31-
<Sha>bd2083ff6d56b296fa1ea5647850c166b5e55fb7</Sha>
31+
<Sha>6e85e46dc82d3eefb46eca37e213c5d32093a8ff</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.6.0-2.26173.11">
33+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.6.0-2.26172.2">
3434
<Uri>https://github.com/dotnet/roslyn</Uri>
35-
<Sha>bd2083ff6d56b296fa1ea5647850c166b5e55fb7</Sha>
35+
<Sha>6e85e46dc82d3eefb46eca37e213c5d32093a8ff</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.6.0-2.26173.11">
37+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.6.0-2.26172.2">
3838
<Uri>https://github.com/dotnet/roslyn</Uri>
39-
<Sha>bd2083ff6d56b296fa1ea5647850c166b5e55fb7</Sha>
39+
<Sha>6e85e46dc82d3eefb46eca37e213c5d32093a8ff</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.6.0-2.26173.11">
41+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.6.0-2.26172.2">
4242
<Uri>https://github.com/dotnet/roslyn</Uri>
43-
<Sha>bd2083ff6d56b296fa1ea5647850c166b5e55fb7</Sha>
43+
<Sha>6e85e46dc82d3eefb46eca37e213c5d32093a8ff</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.6.0-2.26173.11">
45+
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.6.0-2.26172.2">
4646
<Uri>https://github.com/dotnet/roslyn</Uri>
47-
<Sha>bd2083ff6d56b296fa1ea5647850c166b5e55fb7</Sha>
47+
<Sha>6e85e46dc82d3eefb46eca37e213c5d32093a8ff</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.6.0-2.26173.11">
49+
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.6.0-2.26172.2">
5050
<Uri>https://github.com/dotnet/roslyn</Uri>
51-
<Sha>bd2083ff6d56b296fa1ea5647850c166b5e55fb7</Sha>
51+
<Sha>6e85e46dc82d3eefb46eca37e213c5d32093a8ff</Sha>
5252
</Dependency>
5353
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
5454
<Dependency Name="System.Collections.Immutable" Version="10.0.2">
@@ -76,9 +76,9 @@
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26177.7">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26171.1">
8080
<Uri>https://github.com/dotnet/arcade</Uri>
81-
<Sha>62dc2defffeadabf6761a9ed7e142692107330c0</Sha>
81+
<Sha>e385506c3dcbeea64fa1aae811e0ff9232815666</Sha>
8282
</Dependency>
8383
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.26153.1">
8484
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,12 @@
8989
<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
9090
<SystemMemoryVersion>4.6.3</SystemMemoryVersion>
9191
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.2</SystemRuntimeCompilerServicesUnsafeVersion>
92-
<!-- System.* packages from dotnet/runtime are managed in Version.Details.xml / Version.Details.props for source-build. -->
92+
<!-- System.* packages from dotnet/runtime, aligned with MSBuild and Roslyn deps. -->
93+
<SystemPackagesVersion>10.0.2</SystemPackagesVersion>
94+
<SystemCollectionsImmutableVersion>$(SystemPackagesVersion)</SystemCollectionsImmutableVersion>
95+
<SystemCompositionVersion>$(SystemPackagesVersion)</SystemCompositionVersion>
96+
<SystemDiagnosticsDiagnosticSourceVersion>$(SystemPackagesVersion)</SystemDiagnosticsDiagnosticSourceVersion>
97+
<SystemReflectionMetadataVersion>$(SystemPackagesVersion)</SystemReflectionMetadataVersion>
9398
</PropertyGroup>
9499

95100
<PropertyGroup>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
2-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
3-
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
4-
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
2+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
3+
# disabled internal Maestro (darc-int*) feeds.
54
#
65
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
76
#
@@ -174,16 +173,4 @@ foreach ($dotnetVersion in $dotnetVersions) {
174173
}
175174
}
176175

177-
# Check for dotnet-eng and add dotnet-eng-internal if present
178-
$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
179-
if ($dotnetEngSource -ne $null) {
180-
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
181-
}
182-
183-
# Check for dotnet-tools and add dotnet-tools-internal if present
184-
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
185-
if ($dotnetToolsSource -ne $null) {
186-
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
187-
}
188-
189176
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#!/usr/bin/env bash
22

33
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
4-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
5-
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
6-
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
4+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
5+
# disabled internal Maestro (darc-int*) feeds.
76
#
87
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
98
#
@@ -174,18 +173,6 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
174173
fi
175174
done
176175

177-
# Check for dotnet-eng and add dotnet-eng-internal if present
178-
grep -i "<add key=\"dotnet-eng\"" $ConfigFile > /dev/null
179-
if [ "$?" == "0" ]; then
180-
AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
181-
fi
182-
183-
# Check for dotnet-tools and add dotnet-tools-internal if present
184-
grep -i "<add key=\"dotnet-tools\"" $ConfigFile > /dev/null
185-
if [ "$?" == "0" ]; then
186-
AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
187-
fi
188-
189176
# I want things split line by line
190177
PrevIFS=$IFS
191178
IFS=$'\n'

‎eng/common/build.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Param(
66
[string][Alias('v')]$verbosity = "minimal",
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
9+
[string] $warnNotAsError = '',
910
[bool] $nodeReuse = $true,
1011
[switch] $buildCheck = $false,
1112
[switch][Alias('r')]$restore,
@@ -70,6 +71,7 @@ function Print-Usage() {
7071
Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)"
7172
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
7273
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
74+
Write-Host " -warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
7375
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
7476
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
7577
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"

‎eng/common/build.sh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ usage()
4242
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
4343
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
4444
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
45+
echo " --warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
4546
echo " --buildCheck <value> Sets /check msbuild parameter"
4647
echo " --fromVMR Set when building from within the VMR"
4748
echo ""
@@ -78,6 +79,7 @@ ci=false
7879
clean=false
7980

8081
warn_as_error=true
82+
warn_not_as_error=''
8183
node_reuse=true
8284
build_check=false
8385
binary_log=false
@@ -92,7 +94,7 @@ runtime_source_feed=''
9294
runtime_source_feed_key=''
9395

9496
properties=()
95-
while [[ $# > 0 ]]; do
97+
while [[ $# -gt 0 ]]; do
9698
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
9799
case "$opt" in
98100
-help|-h)
@@ -176,6 +178,10 @@ while [[ $# > 0 ]]; do
176178
warn_as_error=$2
177179
shift
178180
;;
181+
-warnnotaserror)
182+
warn_not_as_error=$2
183+
shift
184+
;;
179185
-nodereuse)
180186
node_reuse=$2
181187
shift

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22+
enablePreviewMicrobuild: false
23+
microbuildPluginVersion: 'latest'
2224
enableMicrobuildForMacAndLinux: false
2325
microbuildUseESRP: true
2426
enablePublishBuildArtifacts: false
@@ -71,6 +73,8 @@ jobs:
7173
templateContext: ${{ parameters.templateContext }}
7274

7375
variables:
76+
- name: AllowPtrToDetectTestRunRetryFiles
77+
value: true
7478
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
7579
- name: DOTNET_CLI_TELEMETRY_PROFILE
7680
value: '$(Build.Repository.Uri)'
@@ -128,6 +132,8 @@ jobs:
128132
- template: /eng/common/core-templates/steps/install-microbuild.yml
129133
parameters:
130134
enableMicrobuild: ${{ parameters.enableMicrobuild }}
135+
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
136+
microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
131137
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
132138
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
133139
continueOnError: ${{ parameters.continueOnError }}
@@ -153,6 +159,8 @@ jobs:
153159
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
154160
parameters:
155161
enableMicrobuild: ${{ parameters.enableMicrobuild }}
162+
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
163+
microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
156164
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
157165
continueOnError: ${{ parameters.continueOnError }}
158166

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ jobs:
5252
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
5353
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
5454
name: AzurePipelines-EO
55-
image: 1ESPT-Windows2025
55+
image: 1ESPT-Windows2022
5656
demands: Cmd
5757
os: windows
5858
# If it's not devdiv, it's dnceng
5959
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
6060
name: $(DncEngInternalBuildPool)
61-
image: windows.vs2026.amd64
61+
image: 1es-windows-2022
6262
os: windows
6363

6464
steps:

0 commit comments

Comments
 (0)