Skip to content

Commit 916bd2a

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#5115)
[main] Update dependencies from dotnet/arcade
1 parent fdc2269 commit 916bd2a

File tree

6 files changed

+40
-24
lines changed

6 files changed

+40
-24
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23219.2">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23221.8">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7</Sha>
9+
<Sha>fc43dcf6508c135e6743889311d86992da080f30</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23219.2">
11+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23221.8">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7</Sha>
13+
<Sha>fc43dcf6508c135e6743889311d86992da080f30</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23219.2">
15+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23221.8">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7</Sha>
17+
<Sha>fc43dcf6508c135e6743889311d86992da080f30</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23219.2">
19+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23221.8">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7</Sha>
21+
<Sha>fc43dcf6508c135e6743889311d86992da080f30</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23219.2">
23+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23221.8">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>dca04a5ec44fe1e75535f51a4e0b9a7aa2318de7</Sha>
25+
<Sha>fc43dcf6508c135e6743889311d86992da080f30</Sha>
2626
</Dependency>
2727
</ToolsetDependencies>
2828
</Dependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
</PropertyGroup>
2424
<!-- Arcade dependencies -->
2525
<PropertyGroup>
26-
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23219.2</MicrosoftDotNetArcadeSdkPackageVersion>
27-
<MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23219.2</MicrosoftDotNetHelixSdkPackageVersion>
28-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23219.2</MicrosoftDotNetGenFacadesPackageVersion>
29-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23219.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
30-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23219.2</MicrosoftDotNetSignToolVersion>
26+
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.23221.8</MicrosoftDotNetArcadeSdkPackageVersion>
27+
<MicrosoftDotNetHelixSdkPackageVersion>8.0.0-beta.23221.8</MicrosoftDotNetHelixSdkPackageVersion>
28+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23221.8</MicrosoftDotNetGenFacadesPackageVersion>
29+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23221.8</MicrosoftDotNetXUnitExtensionsPackageVersion>
30+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23221.8</MicrosoftDotNetSignToolVersion>
3131
</PropertyGroup>
3232
<!-- CoreFx dependencies -->
3333
<PropertyGroup>

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ __AlpinePackages+=" krb5-dev"
7070
__AlpinePackages+=" openssl-dev"
7171
__AlpinePackages+=" zlib-dev"
7272

73-
__FreeBSDBase="12.3-RELEASE"
73+
__FreeBSDBase="12.4-RELEASE"
7474
__FreeBSDPkg="1.17.0"
7575
__FreeBSDABI="12"
7676
__FreeBSDPackages="libunwind"

‎eng/common/templates/job/job.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ parameters:
2525
enablePublishTestResults: false
2626
enablePublishUsingPipelines: false
2727
enableBuildRetry: false
28-
disableComponentGovernance: false
28+
disableComponentGovernance: ''
2929
componentGovernanceIgnoreDirectories: ''
3030
mergeTestResults: false
3131
testRunTitle: ''
@@ -155,11 +155,14 @@ jobs:
155155
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
156156
continueOnError: true
157157

158-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
159-
- task: ComponentGovernanceComponentDetection@0
160-
continueOnError: true
161-
inputs:
162-
ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
158+
- template: /eng/common/templates/steps/component-governance.yml
159+
parameters:
160+
${{ if eq(parameters.disableComponentGovernance, '') }}:
161+
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
162+
disableComponentGovernance: false
163+
${{ else }}:
164+
disableComponentGovernance: true
165+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
163166

164167
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
165168
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

‎eng/common/templates/steps/component-governance.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
parameters:
2+
disableComponentGovernance: false
3+
componentGovernanceIgnoreDirectories: ''
4+
5+
steps:
6+
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
7+
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
8+
displayName: Set skipComponentGovernanceDetection variable
9+
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
10+
- task: ComponentGovernanceComponentDetection@0
11+
continueOnError: true
12+
inputs:
13+
ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"version": "8.0.100-preview.3.23178.7"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23219.2",
17-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23219.2"
16+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23221.8",
17+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23221.8"
1818
}
1919
}

0 commit comments

Comments
 (0)