Skip to content

Commit f971db6

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250807.1 (#141)
[dotnet/release/8.0] Update dependencies from dotnet/arcade
1 parent 6255c3b commit f971db6

File tree

6 files changed

+18
-8
lines changed

6 files changed

+18
-8
lines changed

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="8.0.0-beta.25310.3">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25407.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
8+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25310.3">
10+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25407.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
12+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PreReleaseVersionIteration>
88
</PropertyGroup>
99
<PropertyGroup>
10-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksPackagingVersion>
10+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksPackagingVersion>
1111
</PropertyGroup>
1212
<PropertyGroup>
1313
<PythonHexVersion>0x030902F0</PythonHexVersion>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ parameters:
2121
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
2222
artifacts: ''
2323
enableMicrobuild: false
24+
microbuildUseESRP: true
2425
enablePublishBuildArtifacts: false
2526
enablePublishBuildAssets: false
2627
enablePublishTestResults: false
@@ -135,6 +136,11 @@ jobs:
135136
signType: $(_SignType)
136137
zipSources: false
137138
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
139+
${{ if eq(parameters.microbuildUseESRP, true) }}:
140+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
141+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
142+
${{ else }}:
143+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
138144
env:
139145
TeamName: $(_TeamName)
140146
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'

eng/common/templates/job/job.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ jobs:
134134
signType: $(_SignType)
135135
zipSources: false
136136
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
138+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
139+
${{ else }}:
140+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
137141
env:
138142
TeamName: $(_TeamName)
139143
continueOnError: ${{ parameters.continueOnError }}

eng/common/tools.ps1

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

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

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.117"
3+
"dotnet": "8.0.119"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3",
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25407.1",
77
"Microsoft.Build.NoTargets": "3.5.0",
88
"Microsoft.Build.Traversal": "2.0.34"
99
}

0 commit comments

Comments
 (0)