Skip to content

Commit fa88a70

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250828.3 (#36690)
[release/9.0] Update dependencies from dotnet/arcade
1 parent e533e1f commit fa88a70

File tree

6 files changed

+26
-10
lines changed

6 files changed

+26
-10
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@
6767
</Dependency>
6868
</ProductDependencies>
6969
<ToolsetDependencies>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25415.3">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25428.3">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
72+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25415.3">
74+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25428.3">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
76+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25415.3">
78+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25428.3">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
80+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
8181
</Dependency>
8282
</ToolsetDependencies>
8383
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemFormatsAsn1Version>9.0.8</SystemFormatsAsn1Version>
3535
</PropertyGroup>
3636
<PropertyGroup Label="Dependencies from dotnet/arcade">
37-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25415.3</MicrosoftDotNetBuildTasksTemplatingVersion>
37+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25428.3</MicrosoftDotNetBuildTasksTemplatingVersion>
3838
</PropertyGroup>
3939
<PropertyGroup Label="Other dependencies">
4040
<MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>

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
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3",
17-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25415.3"
16+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3",
17+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25428.3"
1818
}
1919
}

0 commit comments

Comments
 (0)