Skip to content

Commit ea395c8

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250807.2 (#580)
Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25302.2 -> To Version 9.0.0-beta.25407.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent c77fd50 commit ea395c8

5 files changed

Lines changed: 15 additions & 6 deletions

File tree

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25302.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25407.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
8+
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/core-templates/job/job.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22+
microbuildUseESRP: true
2223
enablePublishBuildArtifacts: false
2324
enablePublishBuildAssets: false
2425
enablePublishTestResults: false
@@ -134,6 +135,11 @@ jobs:
134135
signType: $(_SignType)
135136
zipSources: false
136137
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
138+
${{ if eq(parameters.microbuildUseESRP, true) }}:
139+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
140+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
141+
${{ else }}:
142+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
137143
env:
138144
TeamName: $(_TeamName)
139145
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'

eng/common/internal/NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
<clear />
55
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
66
</packageSources>
7+
<packageSourceMapping>
8+
<clear />
9+
</packageSourceMapping>
710
</configuration>

eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
416416

417417
# Locate Visual Studio installation or download x-copy msbuild.
418418
$vsInfo = LocateVisualStudio $vsRequirements
419-
if ($vsInfo -ne $null) {
419+
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
420420
# Ensure vsInstallDir has a trailing slash
421421
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
422422
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"sdk": {
3-
"version": "9.0.106",
3+
"version": "9.0.109",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "9.0.106"
8+
"dotnet": "9.0.109"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2",
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2",
1212
"Microsoft.Build.NoTargets": "3.7.0",
1313
"Microsoft.Build.Traversal": "3.4.0"
1414
}

0 commit comments

Comments
 (0)