Skip to content

Commit bc311b9

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250828.3
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.25415.3 -> To Version 9.0.0-beta.25428.3
1 parent 04a5547 commit bc311b9

File tree

7 files changed

+42
-21
lines changed

7 files changed

+42
-21
lines changed

NuGet.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
<!-- End: Package sources from dotnet-runtime -->
3737
<!-- Begin: Package sources from dotnet-templating -->
3838
<add key="darc-pub-dotnet-templating-813004f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-813004f3/nuget/v3/index.json" />
39+
<add key="darc-pub-dotnet-templating-813004f-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-813004f3-5/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-813004f-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-813004f3-4/nuget/v3/index.json" />
41+
<add key="darc-pub-dotnet-templating-813004f-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-813004f3-3/nuget/v3/index.json" />
42+
<add key="darc-pub-dotnet-templating-813004f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-813004f3-2/nuget/v3/index.json" />
43+
<add key="darc-pub-dotnet-templating-813004f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-813004f3-1/nuget/v3/index.json" />
3944
<!-- End: Package sources from dotnet-templating -->
4045
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4146
<!-- End: Package sources from dotnet-windowsdesktop -->

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25415.3">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25428.3">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
560+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25415.3">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25428.3">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
564+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25415.3">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25428.3">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
568+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25415.3">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25428.3">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
572+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25415.3">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25428.3">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
576+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25415.3">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25428.3">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
580+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25415.3">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25428.3">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
585+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<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
@@ -272,10 +272,10 @@
272272
</PropertyGroup>
273273
<PropertyGroup>
274274
<!-- Dependencies from https://github.com/dotnet/arcade -->
275-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25415.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25415.3</MicrosoftDotNetSignToolVersion>
277-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25415.3</MicrosoftDotNetXliffTasksVersion>
278-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25415.3</MicrosoftDotNetXUnitExtensionsVersion>
275+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25428.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25428.3</MicrosoftDotNetSignToolVersion>
277+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25428.3</MicrosoftDotNetXliffTasksVersion>
278+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25428.3</MicrosoftDotNetXUnitExtensionsVersion>
279279
</PropertyGroup>
280280
<PropertyGroup>
281281
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ parameters:
3333
# container and pool.
3434
platform: {}
3535

36+
# Optional list of directories to ignore for component governance scans.
37+
componentGovernanceIgnoreDirectories: []
38+
3639
is1ESPipeline: ''
3740

3841
# If set to true and running on a non-public project,
@@ -93,3 +96,4 @@ jobs:
9396
parameters:
9497
is1ESPipeline: ${{ parameters.is1ESPipeline }}
9598
platform: ${{ parameters.platform }}
99+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

eng/common/core-templates/jobs/source-build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ parameters:
2121
# one job runs on 'defaultManagedPlatform'.
2222
platforms: []
2323

24+
# Optional list of directories to ignore for component governance scans.
25+
componentGovernanceIgnoreDirectories: []
26+
2427
is1ESPipeline: ''
2528

2629
# If set to true and running on a non-public project,
@@ -47,6 +50,7 @@ jobs:
4750
is1ESPipeline: ${{ parameters.is1ESPipeline }}
4851
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4952
platform: ${{ platform }}
53+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
5054
enableInternalSources: ${{ parameters.enableInternalSources }}
5155

5256
- ${{ if eq(length(parameters.platforms), 0) }}:
@@ -55,4 +59,5 @@ jobs:
5559
is1ESPipeline: ${{ parameters.is1ESPipeline }}
5660
jobNamePrefix: ${{ parameters.jobNamePrefix }}
5761
platform: ${{ parameters.defaultManagedPlatform }}
62+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
5863
enableInternalSources: ${{ parameters.enableInternalSources }}

eng/common/core-templates/steps/source-build.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ parameters:
1111
# for details. The entire object is described in the 'job' template for simplicity, even though
1212
# the usage of the properties on this object is split between the 'job' and 'steps' templates.
1313
platform: {}
14+
15+
# Optional list of directories to ignore for component governance scans.
16+
componentGovernanceIgnoreDirectories: []
17+
1418
is1ESPipeline: false
1519

1620
steps:
@@ -126,5 +130,8 @@ steps:
126130
parameters:
127131
displayName: Component Detection (Exclude upstream cache)
128132
is1ESPipeline: ${{ parameters.is1ESPipeline }}
129-
componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
133+
${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}:
134+
componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
135+
${{ else }}:
136+
componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }}
130137
disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}

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.25415.3",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25415.3",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25428.3",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)