Skip to content

Commit 9f52b5c

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/9.0] Update dependencies from dotnet/arcade (#57446)
* Update dependencies from https://github.com/dotnet/arcade build 20240821.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.24408.2 -> To Version 9.0.0-beta.24421.2 * Update dependencies from https://github.com/dotnet/arcade build 20240823.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.24421.2 -> To Version 9.0.0-beta.24423.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent c75a99c commit 9f52b5c

File tree

9 files changed

+81
-79
lines changed

9 files changed

+81
-79
lines changed

‎eng/Version.Details.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -388,31 +388,31 @@
388388
<Uri>https://github.com/dotnet/winforms</Uri>
389389
<Sha>382ad3e43a8e9c81fbb738940a33cdc0f6442a59</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24408.2">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24423.2">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>60ae233c3d77f11c5fdb53e570b64d503b13ba59</Sha>
393+
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24408.2">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24423.2">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>60ae233c3d77f11c5fdb53e570b64d503b13ba59</Sha>
398+
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24408.2">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24423.2">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>60ae233c3d77f11c5fdb53e570b64d503b13ba59</Sha>
403+
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24408.2">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24423.2">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>60ae233c3d77f11c5fdb53e570b64d503b13ba59</Sha>
407+
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24408.2">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24423.2">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>60ae233c3d77f11c5fdb53e570b64d503b13ba59</Sha>
411+
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24408.2">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24423.2">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>60ae233c3d77f11c5fdb53e570b64d503b13ba59</Sha>
415+
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
416416
</Dependency>
417417
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.8.24425.2">
418418
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@
165165
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
166166
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
167167
<!-- Packages from dotnet/arcade -->
168-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24408.2</MicrosoftDotNetBuildTasksInstallersVersion>
169-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24408.2</MicrosoftDotNetBuildTasksTemplatingVersion>
170-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24408.2</MicrosoftDotNetRemoteExecutorVersion>
171-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24408.2</MicrosoftSourceBuildIntermediatearcadeVersion>
168+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24423.2</MicrosoftDotNetBuildTasksInstallersVersion>
169+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24423.2</MicrosoftDotNetBuildTasksTemplatingVersion>
170+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24423.2</MicrosoftDotNetRemoteExecutorVersion>
171+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24423.2</MicrosoftSourceBuildIntermediatearcadeVersion>
172172
<!-- Packages from dotnet/source-build-externals -->
173173
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24407.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
174174
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/SetupNugetSources.ps1

+1-1
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

+1-1
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

-5
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/internal/Tools.csproj

+1
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

+14
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

+44-52
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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-preview.7.24371.4"
3+
"version": "9.0.100-preview.7.24407.12"
44
},
55
"tools": {
6-
"dotnet": "9.0.100-preview.7.24371.4",
6+
"dotnet": "9.0.100-preview.7.24407.12",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
@@ -27,7 +27,7 @@
2727
"jdk": "11"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.2",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24408.2"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24423.2",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24423.2"
3232
}
3333
}

0 commit comments

Comments
 (0)