Skip to content

Commit bf6531c

Browse files
SimonZhao888SimonZhao888
authored
[release/8.0.1xx] Update dependencies from dotnet/arcade (#50446)
2 parents 36d8318 + 15921ef commit bf6531c

File tree

15 files changed

+69
-17
lines changed

15 files changed

+69
-17
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25415.2">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25465.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
496+
<Sha>4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25415.2">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25465.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
501+
<Sha>4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25415.2">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25465.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
505+
<Sha>4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25415.2">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25465.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
509+
<Sha>4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25415.2</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25465.1</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -211,7 +211,7 @@
211211
<PropertyGroup>
212212
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
213213
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
214-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25415.2</MicrosoftDotNetXUnitExtensionsVersion>
214+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25465.1</MicrosoftDotNetXUnitExtensionsVersion>
215215
<MoqPackageVersion>4.18.4</MoqPackageVersion>
216216
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
217217
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/common/templates-official/job/publish-build-assets.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ parameters:
3232

3333
repositoryAlias: self
3434

35+
officialBuildId: ''
36+
3537
jobs:
3638
- job: Asset_Registry_Publish
3739

@@ -52,6 +54,11 @@ jobs:
5254
value: false
5355
- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
5456
- template: /eng/common/templates-official/post-build/common-variables.yml
57+
- name: OfficialBuildId
58+
${{ if ne(parameters.officialBuildId, '') }}:
59+
value: ${{ parameters.officialBuildId }}
60+
${{ else }}:
61+
value: $(Build.BuildNumber)
5562

5663
pool:
5764
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -93,7 +100,7 @@ jobs:
93100
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
94101
/p:MaestroApiEndpoint=https://maestro.dot.net
95102
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
96-
/p:OfficialBuildId=$(Build.BuildNumber)
103+
/p:OfficialBuildId=$(OfficialBuildId)
97104
condition: ${{ parameters.condition }}
98105
continueOnError: ${{ parameters.continueOnError }}
99106

‎eng/common/templates-official/job/source-build.yml‎

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

34+
# Optional list of directories to ignore for component governance scans.
35+
cgIgnoreDirectories: []
36+
3437
# If set to true and running on a non-public project,
3538
# Internal blob storage locations will be enabled.
3639
# This is not enabled by default because many repositories do not need internal sources
@@ -73,3 +76,4 @@ jobs:
7376
- template: /eng/common/templates-official/steps/source-build.yml
7477
parameters:
7578
platform: ${{ parameters.platform }}
79+
cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}

‎eng/common/templates-official/jobs/jobs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ parameters:
4141
enableSourceIndex: false
4242
sourceIndexParams: {}
4343
repositoryAlias: self
44+
officialBuildId: ''
4445

4546
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4647
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -97,3 +98,4 @@ jobs:
9798
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
9899
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
99100
repositoryAlias: ${{ parameters.repositoryAlias }}
101+
officialBuildId: ${{ parameters.officialBuildId }}

‎eng/common/templates-official/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+
cgIgnoreDirectories: []
26+
2427
# If set to true and running on a non-public project,
2528
# Internal nuget and blob storage locations will be enabled.
2629
# This is not enabled by default because many repositories do not need internal sources
@@ -44,11 +47,13 @@ jobs:
4447
parameters:
4548
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4649
platform: ${{ platform }}
50+
cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
4751
enableInternalSources: ${{ parameters.enableInternalSources }}
4852

4953
- ${{ if eq(length(parameters.platforms), 0) }}:
5054
- template: /eng/common/templates-official/job/source-build.yml
5155
parameters:
5256
jobNamePrefix: ${{ parameters.jobNamePrefix }}
5357
platform: ${{ parameters.defaultManagedPlatform }}
58+
cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
5459
enableInternalSources: ${{ parameters.enableInternalSources }}

‎eng/common/templates-official/steps/source-build.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ parameters:
1212
# the usage of the properties on this object is split between the 'job' and 'steps' templates.
1313
platform: {}
1414

15+
# Optional list of directories to ignore for component governance scans.
16+
cgIgnoreDirectories: []
17+
1518
steps:
1619
# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.)
1720
- script: |
@@ -126,4 +129,7 @@ steps:
126129
- task: ComponentGovernanceComponentDetection@0
127130
displayName: Component Detection (Exclude upstream cache)
128131
inputs:
129-
ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
132+
${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}:
133+
ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
134+
${{ else }}:
135+
ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }}

‎eng/common/templates/job/publish-build-assets.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ parameters:
3232

3333
repositoryAlias: self
3434

35+
officialBuildId: ''
36+
3537
jobs:
3638
- job: Asset_Registry_Publish
3739

@@ -52,6 +54,11 @@ jobs:
5254
value: false
5355
- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
5456
- template: /eng/common/templates/post-build/common-variables.yml
57+
- name: OfficialBuildId
58+
${{ if ne(parameters.officialBuildId, '') }}:
59+
value: ${{ parameters.officialBuildId }}
60+
${{ else }}:
61+
value: $(Build.BuildNumber)
5562

5663
pool:
5764
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -91,7 +98,7 @@ jobs:
9198
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
9299
/p:MaestroApiEndpoint=https://maestro.dot.net
93100
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
94-
/p:OfficialBuildId=$(Build.BuildNumber)
101+
/p:OfficialBuildId=$(OfficialBuildId)
95102
condition: ${{ parameters.condition }}
96103
continueOnError: ${{ parameters.continueOnError }}
97104

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

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

34+
# Optional list of directories to ignore for component governance scans.
35+
cgIgnoreDirectories: []
36+
3437
# If set to true and running on a non-public project,
3538
# Internal blob storage locations will be enabled.
3639
# This is not enabled by default because many repositories do not need internal sources
@@ -72,3 +75,4 @@ jobs:
7275
- template: /eng/common/templates/steps/source-build.yml
7376
parameters:
7477
platform: ${{ parameters.platform }}
78+
cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}

‎eng/common/templates/jobs/jobs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ parameters:
4141
enableSourceIndex: false
4242
sourceIndexParams: {}
4343
repositoryAlias: self
44+
officialBuildId: ''
4445

4546
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4647
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -97,3 +98,4 @@ jobs:
9798
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
9899
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
99100
repositoryAlias: ${{ parameters.repositoryAlias }}
101+
officialBuildId: ${{ parameters.officialBuildId }}

0 commit comments

Comments
 (0)