Skip to content

Commit 4e9a2ae

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250620.5 (#1424)
[main] Update dependencies from dotnet/arcade
1 parent 15700cf commit 4e9a2ae

5 files changed

Lines changed: 29 additions & 13 deletions

File tree

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25313.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25320.5">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>7a09c1144283309440a7966c664199944198c920</Sha>
8+
<Sha>066f0d1e5e1a59ce611e82f4a1146239d6253bd7</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25313.2">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25320.5">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>7a09c1144283309440a7966c664199944198c920</Sha>
12+
<Sha>066f0d1e5e1a59ce611e82f4a1146239d6253bd7</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ steps:
3030
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
3131
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
3232
useEsrpCli: true
33+
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
34+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
35+
${{ else }}:
36+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
3337
env:
3438
TeamName: $(_TeamName)
3539
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}

eng/common/core-templates/steps/source-build.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ steps:
3838
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
3939
fi
4040
41-
baseRidArgs=
42-
if [ '${{ parameters.platform.baseRID }}' != '' ]; then
43-
baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
44-
fi
45-
4641
portableBuildArgs=
4742
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
4843
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
@@ -55,7 +50,6 @@ steps:
5550
${{ parameters.platform.buildArguments }} \
5651
$internalRuntimeDownloadArgs \
5752
$targetRidArgs \
58-
$baseRidArgs \
5953
$portableBuildArgs \
6054
displayName: Build
6155

eng/common/templates/vmr-build-pr.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# This pipeline is used for running the VMR verification of the PR changes in repo-level PRs.
2+
#
3+
# It will run a full set of verification jobs defined in:
4+
# https://github.com/dotnet/dotnet/blob/10060d128e3f470e77265f8490f5e4f72dae738e/eng/pipelines/templates/stages/vmr-build.yml#L27-L38
5+
#
6+
# For repos that do not need to run the full set, you would do the following:
7+
#
8+
# 1. Copy this YML file to a repo-specific location, i.e. outside of eng/common.
9+
#
10+
# 2. Add `verifications` parameter to VMR template reference
11+
#
12+
# Examples:
13+
# - For source-build stage 1 verification, add the following:
14+
# verifications: [ "source-build-stage1" ]
15+
#
16+
# - For Windows only verifications, add the following:
17+
# verifications: [ "unified-build-windows-x64", "unified-build-windows-x86" ]
18+
119
trigger: none
220
pr: none
321

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-preview.6.25302.104"
3+
"dotnet": "10.0.100-preview.6.25315.102"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25313.2",
7-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25313.2"
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25320.5",
7+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25320.5"
88
}
99
}

0 commit comments

Comments
 (0)