Skip to content

Commit 2c7be56

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250806.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25380.1 -> To Version 9.0.0-beta.25406.1
1 parent 01874ae commit 2c7be56

File tree

5 files changed

+42
-24
lines changed

5 files changed

+42
-24
lines changed

NuGet.config

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,14 @@
2525
<!-- End: Package sources from dotnet-aspire -->
2626
<!-- Begin: Package sources from dotnet-emsdk -->
2727
<add key="darc-pub-dotnet-emsdk-0bcc3e6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67/nuget/v3/index.json" />
28+
<add key="darc-pub-dotnet-emsdk-0bcc3e6-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67-3/nuget/v3/index.json" />
29+
<add key="darc-pub-dotnet-emsdk-0bcc3e6-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67-2/nuget/v3/index.json" />
2830
<add key="darc-pub-dotnet-emsdk-0bcc3e6-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67-1/nuget/v3/index.json" />
2931
<!-- End: Package sources from dotnet-emsdk -->
3032
<!-- Begin: Package sources from dotnet-aspnetcore -->
3133
<add key="darc-int-dotnet-aspnetcore-215a587" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-215a587e/nuget/v3/index.json" />
34+
<add key="darc-int-dotnet-aspnetcore-215a587-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-215a587e-2/nuget/v3/index.json" />
35+
<add key="darc-int-dotnet-aspnetcore-215a587-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-215a587e-1/nuget/v3/index.json" />
3236
<!-- End: Package sources from dotnet-aspnetcore -->
3337
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3438
<add key="darc-pub-DotNet-msbuild-Trusted-481b855" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-481b855f/nuget/v3/index.json" />
@@ -37,13 +41,19 @@
3741
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3842
<!-- Begin: Package sources from dotnet-runtime -->
3943
<add key="darc-int-dotnet-runtime-aae90fa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0/nuget/v3/index.json" />
44+
<add key="darc-int-dotnet-runtime-aae90fa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0-2/nuget/v3/index.json" />
45+
<add key="darc-int-dotnet-runtime-aae90fa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0-1/nuget/v3/index.json" />
4046
<!-- End: Package sources from dotnet-runtime -->
4147
<!-- Begin: Package sources from dotnet-templating -->
4248
<add key="darc-pub-dotnet-templating-861f0ec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3/nuget/v3/index.json" />
49+
<add key="darc-pub-dotnet-templating-861f0ec-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-3/nuget/v3/index.json" />
50+
<add key="darc-pub-dotnet-templating-861f0ec-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-2/nuget/v3/index.json" />
4351
<add key="darc-pub-dotnet-templating-861f0ec-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-861f0ec3-1/nuget/v3/index.json" />
4452
<!-- End: Package sources from dotnet-templating -->
4553
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4654
<add key="darc-int-dotnet-windowsdesktop-1d6033e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1d6033e3/nuget/v3/index.json" />
55+
<add key="darc-int-dotnet-windowsdesktop-1d6033e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1d6033e3-2/nuget/v3/index.json" />
56+
<add key="darc-int-dotnet-windowsdesktop-1d6033e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1d6033e3-1/nuget/v3/index.json" />
4757
<!-- End: Package sources from dotnet-windowsdesktop -->
4858
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4959
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -70,14 +80,20 @@
7080
<!-- Begin: Package sources from dotnet-templating -->
7181
<!-- End: Package sources from dotnet-templating -->
7282
<!-- Begin: Package sources from dotnet-aspnetcore -->
83+
<add key="darc-int-dotnet-aspnetcore-215a587-1" value="true" />
84+
<add key="darc-int-dotnet-aspnetcore-215a587-2" value="true" />
7385
<add key="darc-int-dotnet-aspnetcore-215a587" value="true" />
7486
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
7587
<!-- End: Package sources from DotNet-msbuild-Trusted -->
7688
<!-- End: Package sources from dotnet-aspnetcore -->
7789
<!-- Begin: Package sources from dotnet-runtime -->
90+
<add key="darc-int-dotnet-runtime-aae90fa-1" value="true" />
91+
<add key="darc-int-dotnet-runtime-aae90fa-2" value="true" />
7892
<add key="darc-int-dotnet-runtime-aae90fa" value="true" />
7993
<!-- End: Package sources from dotnet-runtime -->
8094
<!-- Begin: Package sources from dotnet-windowsdesktop -->
95+
<add key="darc-int-dotnet-windowsdesktop-1d6033e-1" value="true" />
96+
<add key="darc-int-dotnet-windowsdesktop-1d6033e-2" value="true" />
8197
<add key="darc-int-dotnet-windowsdesktop-1d6033e" value="true" />
8298
<!-- End: Package sources from dotnet-windowsdesktop -->
8399
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25380.1">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25406.1">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
594+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25380.1">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25406.1">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
598+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25380.1">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25406.1">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
602+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25380.1">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25406.1">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
606+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25380.1">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25406.1">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
610+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25380.1">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25406.1">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
614+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25380.1">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25406.1">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
619+
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.8">

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25380.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25380.1</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25380.1</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25380.1</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25406.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25406.1</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25406.1</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25406.1</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

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

Lines changed: 6 additions & 4 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,10 +135,11 @@ jobs:
134135
signType: $(_SignType)
135136
zipSources: false
136137
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
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
141143
env:
142144
TeamName: $(_TeamName)
143145
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25406.1",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25406.1",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)