Skip to content

Commit 585a409

Browse files
author
Mirroring
committed
Merge commit '3229e9e2e718da6d5211c8872c0da1780e5b0648'
2 parents d4e0524 + 3229e9e commit 585a409

6 files changed

Lines changed: 22 additions & 22 deletions

File tree

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
191191
</ProductDependencies>
192192
<ToolsetDependencies>
193193
<!-- Arcade -->
194-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.26062.2">
194+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.26063.2">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
196+
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.26062.2">
198+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.26063.2">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
200+
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.26062.2">
202+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.26063.2">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
204+
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
205205
</Dependency>
206-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.26062.2">
206+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.26063.2">
207207
<Uri>https://github.com/dotnet/arcade</Uri>
208-
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
208+
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
209209
</Dependency>
210-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.26062.2">
210+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.26063.2">
211211
<Uri>https://github.com/dotnet/arcade</Uri>
212-
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
212+
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
213213
</Dependency>
214-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.26062.2">
214+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.26063.2">
215215
<Uri>https://github.com/dotnet/arcade</Uri>
216-
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
216+
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
217217
</Dependency>
218218
</ToolsetDependencies>
219219
</Dependencies>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
</PropertyGroup>
5858
<!-- Arcade -->
5959
<PropertyGroup>
60-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.26062.2</MicrosoftDotNetGenFacadesPackageVersion>
61-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.26062.2</MicrosoftDotNetRemoteExecutorVersion>
62-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.26062.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
60+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.26063.2</MicrosoftDotNetGenFacadesPackageVersion>
61+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.26063.2</MicrosoftDotNetRemoteExecutorVersion>
62+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.26063.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
6363
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6464
</PropertyGroup>
6565
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
# If it's not devdiv, it's dnceng
7575
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
7676
name: NetCore1ESPool-Publishing-Internal
77-
image: windows.vs2019.amd64
77+
image: windows.vs2022.amd64
7878
os: windows
7979
steps:
8080
- ${{ if eq(parameters.is1ESPipeline, '') }}:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,11 @@ stages:
291291
${{ else }}:
292292
${{ if eq(parameters.is1ESPipeline, true) }}:
293293
name: NetCore1ESPool-Publishing-Internal
294-
image: windows.vs2019.amd64
294+
image: windows.vs2022.amd64
295295
os: windows
296296
${{ else }}:
297297
name: NetCore1ESPool-Publishing-Internal
298-
demands: ImageOverride -equals windows.vs2019.amd64
298+
demands: ImageOverride -equals windows.vs2022.amd64
299299
steps:
300300
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
301301
parameters:

eng/common/templates/variables/pool-providers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# demands: ImageOverride -equals windows.vs2019.amd64
26+
# demands: ImageOverride -equals windows.vs2022.amd64
2727
variables:
2828
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
2929
- template: /eng/common/templates-official/variables/pool-providers.yml

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"version": "9.0.112"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26062.2",
18-
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.26062.2",
19-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26062.2",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26063.2",
18+
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.26063.2",
19+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26063.2",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "9.0.13"
2222
},

0 commit comments

Comments
 (0)