Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.26062.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.26063.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.26062.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.26063.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.26062.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.26063.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.26062.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.26063.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.26062.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.26063.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.26062.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.26063.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7d6bcdd1e851735273e4eed39e40366d48f335c9</Sha>
<Sha>c85f9aceddaf85296e3efbc463daaa34fef5a375</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.26062.2</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.26062.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.26062.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.26063.2</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.26063.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.26063.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,11 +291,11 @@ stages:
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2019.amd64
demands: ImageOverride -equals windows.vs2022.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/variables/pool-providers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# demands: ImageOverride -equals windows.vs2019.amd64
# demands: ImageOverride -equals windows.vs2022.amd64
variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- template: /eng/common/templates-official/variables/pool-providers.yml
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"version": "9.0.112"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26062.2",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.26062.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26062.2",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26063.2",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.26063.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26063.2",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "9.0.12"
},
Expand Down