Skip to content

Commit 14cffa5

Browse files
jaredparjaredpar
committed
Merge remote-tracking branch 'origin/darc-main-077f1d0c-f949-4402-aa2d-d34ca6f5b304' into darc-main-077f1d0c-f949-4402-aa2d-d34ca6f5b304
 Please enter a commit message to explain why this merge is necessary,
2 parents c1d366c + 407c0f2 commit 14cffa5

File tree

8 files changed

+71
-69
lines changed

8 files changed

+71
-69
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@
122122
</Dependency>
123123
</ProductDependencies>
124124
<ToolsetDependencies>
125-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24416.2">
125+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24426.3">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
127+
<Sha>e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4</Sha>
128128
</Dependency>
129129
<!-- Intermediate is necessary for source build. -->
130-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24416.2">
130+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24426.3">
131131
<Uri>https://github.com/dotnet/arcade</Uri>
132-
<Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
132+
<Sha>e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4</Sha>
133133
<SourceBuild RepoName="arcade" ManagedOnly="true" />
134134
</Dependency>
135135
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
@@ -156,9 +156,9 @@
156156
<Uri>https://github.com/dotnet/roslyn</Uri>
157157
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24416.2">
159+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24426.3">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>8fe02bab989df1265eee225df2c28af6dbdccc83</Sha>
161+
<Sha>e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4</Sha>
162162
</Dependency>
163163
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23468.1">
164164
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

‎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/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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-preview.5.24307.3",
3+
"version": "9.0.100-preview.7.24407.12",
44
"allowPrerelease": false,
55
"rollForward": "patch"
66
},
77
"tools": {
8-
"dotnet": "9.0.100-preview.5.24307.3",
8+
"dotnet": "9.0.100-preview.7.24407.12",
99
"vs": {
1010
"version": "17.8.0"
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24416.2",
15-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24416.2",
14+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24426.3",
15+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24426.3",
1616
"Microsoft.Build.Traversal": "3.4.0"
1717
}
1818
}

0 commit comments

Comments
 (0)