Skip to content

Commit a6f159e

Browse files
author
Mirroring
committed
Merge commit 'fd73901751cc927f4eb25f322c19d555c9ea8b5a'
2 parents 9fc9d3a + fd73901 commit a6f159e

File tree

9 files changed

+29
-28
lines changed

9 files changed

+29
-28
lines changed

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<!-- End: Package sources from dotnet-runtime -->
1414
<!-- Begin: Package sources from dotnet-winforms -->
1515
<add key="darc-int-dotnet-winforms-f3291ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace/nuget/v3/index.json" />
16+
1617
<!-- End: Package sources from dotnet-winforms -->
1718
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1819
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,29 +151,29 @@
151151
</Dependency>
152152
</ProductDependencies>
153153
<ToolsetDependencies>
154-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25263.4">
154+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25310.3">
155155
<Uri>https://github.com/dotnet/arcade</Uri>
156-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
156+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25263.4">
158+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25310.3">
159159
<Uri>https://github.com/dotnet/arcade</Uri>
160-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
160+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
161161
</Dependency>
162-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25263.4">
162+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25310.3">
163163
<Uri>https://github.com/dotnet/arcade</Uri>
164-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
164+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25263.4">
166+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25310.3">
167167
<Uri>https://github.com/dotnet/arcade</Uri>
168-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
168+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
169169
</Dependency>
170-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25263.4">
170+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25310.3">
171171
<Uri>https://github.com/dotnet/arcade</Uri>
172-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
172+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25263.4">
174+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25310.3">
175175
<Uri>https://github.com/dotnet/arcade</Uri>
176-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
176+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
177177
</Dependency>
178178
</ToolsetDependencies>
179179
</Dependencies>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
</PropertyGroup>
1313
<PropertyGroup>
1414
<!-- arcade -->
15-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25263.4</MicrosoftDotNetBuildTasksFeedVersion>
16-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25263.4</MicrosoftDotNetBuildTasksArchivesVersion>
17-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25263.4</MicrosoftDotNetBuildTasksInstallersVersion>
18-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25263.4</MicrosoftDotNetVersionToolsTasksVersion>
15+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksFeedVersion>
16+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksArchivesVersion>
17+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksInstallersVersion>
18+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25310.3</MicrosoftDotNetVersionToolsTasksVersion>
1919
<!-- corefx -->
2020
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
2121
<SystemDataSqlClientVersion>4.9.0</SystemDataSqlClientVersion>

‎eng/common/templates/job/execute-sdl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
# If it's not devdiv, it's dnceng
5656
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
5757
name: $(DncEngInternalBuildPool)
58-
demands: ImageOverride -equals windows.vs2022.amd64
58+
demands: ImageOverride -equals windows.vs2019.amd64
5959
steps:
6060
- checkout: self
6161
clean: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
# If it's not devdiv, it's dnceng
5555
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
5656
name: $(DncEngInternalBuildPool)
57-
demands: ImageOverride -equals windows.vs2022.amd64
57+
demands: ImageOverride -equals windows.vs2019.amd64
5858

5959
steps:
6060
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:

‎eng/common/templates/job/publish-build-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
# If it's not devdiv, it's dnceng
6060
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
6161
name: NetCore1ESPool-Publishing-Internal
62-
demands: ImageOverride -equals windows.vs2022.amd64
62+
demands: ImageOverride -equals windows.vs2019.amd64
6363

6464
steps:
6565
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
pool:
3232
${{ if eq(variables['System.TeamProject'], 'public') }}:
3333
name: $(DncEngPublicBuildPool)
34-
demands: ImageOverride -equals windows.vs2022.amd64.open
34+
demands: ImageOverride -equals windows.vs2019.amd64.open
3535
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3636
name: $(DncEngInternalBuildPool)
37-
demands: ImageOverride -equals windows.vs2022.amd64
37+
demands: ImageOverride -equals windows.vs2019.amd64
3838

3939
steps:
4040
- ${{ each preStep in parameters.preSteps }}:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ stages:
108108
# If it's not devdiv, it's dnceng
109109
${{ else }}:
110110
name: $(DncEngInternalBuildPool)
111-
demands: ImageOverride -equals windows.vs2022.amd64
111+
demands: ImageOverride -equals windows.vs2019.amd64
112112

113113
steps:
114114
- template: setup-maestro-vars.yml
@@ -145,7 +145,7 @@ stages:
145145
# If it's not devdiv, it's dnceng
146146
${{ else }}:
147147
name: $(DncEngInternalBuildPool)
148-
demands: ImageOverride -equals windows.vs2022.amd64
148+
demands: ImageOverride -equals windows.vs2019.amd64
149149
steps:
150150
- template: setup-maestro-vars.yml
151151
parameters:
@@ -199,7 +199,7 @@ stages:
199199
# If it's not devdiv, it's dnceng
200200
${{ else }}:
201201
name: $(DncEngInternalBuildPool)
202-
demands: ImageOverride -equals windows.vs2022.amd64
202+
demands: ImageOverride -equals windows.vs2019.amd64
203203
steps:
204204
- template: setup-maestro-vars.yml
205205
parameters:
@@ -259,7 +259,7 @@ stages:
259259
# If it's not devdiv, it's dnceng
260260
${{ else }}:
261261
name: NetCore1ESPool-Publishing-Internal
262-
demands: ImageOverride -equals windows.vs2022.amd64
262+
demands: ImageOverride -equals windows.vs2019.amd64
263263
steps:
264264
- template: setup-maestro-vars.yml
265265
parameters:

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.116"
3+
"dotnet": "8.0.117"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25263.4",
7-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25263.4",
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25310.3",
88
"Microsoft.Build.NoTargets": "3.7.0",
99
"Microsoft.Build.Traversal": "3.4.0"
1010
}

0 commit comments

Comments
 (0)