Skip to content

Commit c9fef31

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20250807.1 (#11040)
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk 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 0aaec26 commit c9fef31

File tree

7 files changed

+35
-17
lines changed

7 files changed

+35
-17
lines changed

‎NuGet.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
88
<add key="darc-int-dotnet-runtime-fce8ed9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-fce8ed9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90-2/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-fce8ed9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90-1/nuget/v3/index.json" />
911
<!-- End: Package sources from dotnet-runtime -->
1012
<!-- Begin: Package sources from dotnet-winforms -->
1113
<add key="darc-int-dotnet-winforms-1957eae" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-1957eae5/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-winforms-1957eae-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-1957eae5-2/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-winforms-1957eae-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-1957eae5-1/nuget/v3/index.json" />
1216
<!-- End: Package sources from dotnet-winforms -->
1317
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1418
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,9 +26,13 @@
2226
<disabledPackageSources>
2327
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2428
<!-- Begin: Package sources from dotnet-runtime -->
29+
<add key="darc-int-dotnet-runtime-fce8ed9-1" value="true" />
30+
<add key="darc-int-dotnet-runtime-fce8ed9-2" value="true" />
2531
<add key="darc-int-dotnet-runtime-fce8ed9" value="true" />
2632
<!-- End: Package sources from dotnet-runtime -->
2733
<!-- Begin: Package sources from dotnet-winforms -->
34+
<add key="darc-int-dotnet-winforms-1957eae-1" value="true" />
35+
<add key="darc-int-dotnet-winforms-1957eae-2" value="true" />
2836
<add key="darc-int-dotnet-winforms-1957eae" value="true" />
2937
<!-- End: Package sources from dotnet-winforms -->
3038
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,25 +156,25 @@
156156
</Dependency>
157157
</ProductDependencies>
158158
<ToolsetDependencies>
159-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25310.3">
159+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25407.1">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
161+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25310.3">
163+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25407.1">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
165+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25310.3">
167+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25407.1">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
169+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.25310.3">
171+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.25407.1">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
173+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25310.3">
175+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25407.1">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
177+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
178178
</Dependency>
179179
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
180180
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/arcade -->
5151
<PropertyGroup>
52-
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.25310.3</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.25310.3</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.25407.1</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.25407.1</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Sourcelink -->
5656
<PropertyGroup>

‎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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.117",
3+
"dotnet": "8.0.119",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3",
16-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3"
15+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25407.1",
16+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25407.1"
1717
},
1818
"sdk": {
19-
"version": "8.0.117"
19+
"version": "8.0.119"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)