Skip to content

Commit 18938c4

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#5631)
[main] Update dependencies from dotnet/arcade
1 parent 01e1055 commit 18938c4

File tree

10 files changed

+73
-70
lines changed

10 files changed

+73
-70
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24414.3">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24430.1">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68</Sha>
9+
<Sha>0ed1d3dc15420cd41c252b0c5d9474f197a29e06</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24414.3">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24430.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68</Sha>
13+
<Sha>0ed1d3dc15420cd41c252b0c5d9474f197a29e06</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24414.3">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24430.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68</Sha>
17+
<Sha>0ed1d3dc15420cd41c252b0c5d9474f197a29e06</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24414.3</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24414.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.24430.1</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24430.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

‎eng/common/SetupNugetSources.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
157157
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
158158
}
159159

160-
$dotnetVersions = @('5','6','7','8')
160+
$dotnetVersions = @('5','6','7','8','9')
161161

162162
foreach ($dotnetVersion in $dotnetVersions) {
163163
$feedPrefix = "dotnet" + $dotnetVersion;

‎eng/common/SetupNugetSources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
9999
PackageSources+=('dotnet3.1-internal-transport')
100100
fi
101101

102-
DotNetVersions=('5' '6' '7' '8')
102+
DotNetVersions=('5' '6' '7' '8' '9')
103103

104104
for DotNetVersion in ${DotNetVersions[@]} ; do
105105
FeedPrefix="dotnet${DotNetVersion}";

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ parameters:
3333
artifactPublishSteps: []
3434
runAsPublic: false
3535

36-
# Sbom related params
37-
enableSbom: true
38-
PackageVersion: 9.0.0
39-
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
40-
4136
# 1es specific parameters
4237
is1ESPipeline: ''
4338

‎eng/common/core-templates/steps/publish-logs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ steps:
4545
SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs'
4646
Contents: '**'
4747
TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs'
48+
condition: always()
4849

4950
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
5051
parameters:

‎eng/common/internal/Tools.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PropertyGroup>
55
<TargetFramework>net472</TargetFramework>
66
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
7+
<BuildWithNetFrameworkHostedCompiler>false</BuildWithNetFrameworkHostedCompiler>
78
</PropertyGroup>
89
<ItemGroup>
910
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
1+
parameters:
2+
# Sbom related params
3+
enableSbom: true
4+
PackageVersion: 9.0.0
5+
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
6+
17
jobs:
28
- template: /eng/common/core-templates/job/job.yml
39
parameters:
410
is1ESPipeline: true
511

12+
componentGovernanceSteps:
13+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
14+
- template: /eng/common/templates/steps/generate-sbom.yml
15+
parameters:
16+
PackageVersion: ${{ parameters.packageVersion }}
17+
BuildDropPath: ${{ parameters.buildDropPath }}
18+
publishArtifacts: false
19+
620
# publish artifacts
721
# for 1ES managed templates, use the templateContext.output to handle multiple outputs.
822
templateContext:

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

Lines changed: 44 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -19,71 +19,63 @@ jobs:
1919
steps:
2020
- ${{ each step in parameters.steps }}:
2121
- ${{ step }}
22-
22+
2323
componentGovernanceSteps:
24-
- template: /eng/common/templates/steps/component-governance.yml
25-
parameters:
26-
${{ if eq(parameters.disableComponentGovernance, '') }}:
27-
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
28-
disableComponentGovernance: false
29-
${{ else }}:
30-
disableComponentGovernance: true
24+
- template: /eng/common/templates/steps/component-governance.yml
25+
parameters:
26+
${{ if eq(parameters.disableComponentGovernance, '') }}:
27+
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
28+
disableComponentGovernance: false
3129
${{ else }}:
32-
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
33-
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
34-
35-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
36-
- template: /eng/common/templates/steps/generate-sbom.yml
37-
parameters:
38-
PackageVersion: ${{ parameters.packageVersion }}
39-
BuildDropPath: ${{ parameters.buildDropPath }}
40-
publishArtifacts: false
41-
30+
disableComponentGovernance: true
31+
${{ else }}:
32+
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
33+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
4234

4335
artifactPublishSteps:
44-
- ${{ if ne(parameters.artifacts.publish, '') }}:
45-
- ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
46-
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
47-
parameters:
48-
is1ESPipeline: false
49-
args:
50-
displayName: Publish pipeline artifacts
51-
pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
52-
publishLocation: Container
53-
artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
54-
continueOnError: true
55-
condition: always()
56-
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
57-
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
58-
parameters:
59-
is1ESPipeline: false
60-
args:
61-
targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log'
62-
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
63-
displayName: 'Publish logs'
64-
continueOnError: true
65-
condition: always()
66-
sbomEnabled: false # we don't need SBOM for logs
67-
68-
- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
36+
- ${{ if ne(parameters.artifacts.publish, '') }}:
37+
- ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
6938
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
7039
parameters:
7140
is1ESPipeline: false
7241
args:
73-
displayName: Publish Logs
74-
pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
42+
displayName: Publish pipeline artifacts
43+
pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
7544
publishLocation: Container
76-
artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
45+
artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
7746
continueOnError: true
7847
condition: always()
79-
80-
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
48+
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
8149
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
8250
parameters:
8351
is1ESPipeline: false
8452
args:
85-
targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
86-
artifactName: 'BuildConfiguration'
87-
displayName: 'Publish build retry configuration'
53+
targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log'
54+
artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
55+
displayName: 'Publish logs'
8856
continueOnError: true
89-
sbomEnabled: false # we don't need SBOM for BuildConfiguration
57+
condition: always()
58+
sbomEnabled: false # we don't need SBOM for logs
59+
60+
- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
61+
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
62+
parameters:
63+
is1ESPipeline: false
64+
args:
65+
displayName: Publish Logs
66+
pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
67+
publishLocation: Container
68+
artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
69+
continueOnError: true
70+
condition: always()
71+
72+
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
73+
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
74+
parameters:
75+
is1ESPipeline: false
76+
args:
77+
targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
78+
artifactName: 'BuildConfiguration'
79+
displayName: 'Publish build retry configuration'
80+
continueOnError: true
81+
sbomEnabled: false # we don't need SBOM for BuildConfiguration

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.5.24307.3",
3+
"dotnet": "9.0.100-preview.7.24407.12",
44
"runtimes": {
55
"aspnetcore": [
66
"3.1.5",
@@ -11,10 +11,10 @@
1111
}
1212
},
1313
"sdk": {
14-
"version": "9.0.100-preview.5.24307.3"
14+
"version": "9.0.100-preview.7.24407.12"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24414.3",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24430.1",
1818
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
1919
}
2020
}

0 commit comments

Comments
 (0)