Skip to content

Commit 0a81ee2

Browse files
CopilotMiYanni
andcommitted
Revert PR #9575: [main] Source code updates from dotnet/dotnet
Co-authored-by: MiYanni <[email protected]>
1 parent 2356951 commit 0a81ee2

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
pool:
2626
${{ if eq(variables['System.TeamProject'], 'public') }}:
2727
name: $(DncEngPublicBuildPool)
28-
image: windows.vs2026preview.scout.amd64.open
28+
image: windows.vs2022.amd64.open
2929
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3030
name: $(DncEngInternalBuildPool)
31-
image: windows.vs2026preview.scout.amd64
31+
image: windows.vs2022.amd64
3232

3333
steps:
3434
- ${{ if eq(parameters.is1ESPipeline, '') }}:

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.vs2026preview.scout.amd64
130+
image: windows.vs2022.amd64
131131
os: windows
132132
${{ else }}:
133133
name: $(DncEngInternalBuildPool)
134-
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
134+
demands: ImageOverride -equals windows.vs2022.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.vs2026preview.scout.amd64
178+
demands: ImageOverride -equals windows.vs2022.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.vs2026preview.scout.amd64
239+
demands: ImageOverride -equals windows.vs2022.amd64
240240
steps:
241241
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
242242
parameters:

eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ try {
7070
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
7171
}
7272
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
73-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty
73+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty
7474
}
7575
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7676
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
390390

391391
# If the version of msbuild is going to be xcopied,
392392
# use this version. Version matches a package here:
393-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0
394-
$defaultXCopyMSBuildVersion = '18.0.0'
393+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16
394+
$defaultXCopyMSBuildVersion = '17.14.16'
395395

396396
if (!$vsRequirements) {
397397
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100",
3+
"version": "10.0.100-rc.2.25502.107",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature",
66
"paths": [
@@ -10,7 +10,7 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1111
},
1212
"tools": {
13-
"dotnet": "10.0.100"
13+
"dotnet": "10.0.100-rc.2.25502.107"
1414
},
1515
"msbuild-sdks": {
1616
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25603.102"

tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>$(NetToolCurrent)</TargetFramework>
5+
<TargetFramework>$(NetMinimum)</TargetFramework>
66
<Description>A dotnet CLI tool with commands for template authoring.</Description>
77
<IsPackable>true</IsPackable>
88
<PackAsTool>true</PackAsTool>

tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>$(NetToolCurrent)</TargetFramework>
4+
<TargetFramework>$(NetMinimum)</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<IsPackable>true</IsPackable>
77
<IsShipping>false</IsShipping>

0 commit comments

Comments
 (0)