Skip to content

Commit 491c867

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250807.1 (#63189)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25407.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 55f4d2c commit 491c867

File tree

6 files changed

+26
-16
lines changed

6 files changed

+26
-16
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -376,26 +376,26 @@
376376
<Uri>https://github.com/dotnet/winforms</Uri>
377377
<Sha>abda8e3bfa78319363526b5a5f86863ec979940e</Sha>
378378
</Dependency>
379-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25310.3">
379+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25407.1">
380380
<Uri>https://github.com/dotnet/arcade</Uri>
381-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
381+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
382382
<SourceBuild RepoName="arcade" ManagedOnly="true" />
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25310.3">
384+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25407.1">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
386+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
387387
</Dependency>
388-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25310.3">
388+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25407.1">
389389
<Uri>https://github.com/dotnet/arcade</Uri>
390-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
390+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
391391
</Dependency>
392-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25310.3">
392+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25407.1">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
394+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25310.3">
396+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25407.1">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
398+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
399399
</Dependency>
400400
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.9.24518.1">
401401
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@
162162
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
163163
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
164164
<!-- Packages from dotnet/arcade -->
165-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksInstallersVersion>
166-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksTemplatingVersion>
167-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25310.3</MicrosoftDotNetRemoteExecutorVersion>
165+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksInstallersVersion>
166+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksTemplatingVersion>
167+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25407.1</MicrosoftDotNetRemoteExecutorVersion>
168168
<!-- Packages from dotnet/source-build-externals -->
169169
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.25202.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
170170
<!-- Packages from dotnet/source-build-reference-packages -->

‎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
@@ -25,8 +25,8 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.22.19",
28-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3",
29-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3"
28+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25407.1",
29+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25407.1"
3030
},
3131
"native-tools": {
3232
"jdk": "latest"

0 commit comments

Comments
 (0)