Skip to content

Commit 921ea44

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/6.0' changes
2 parents 07c4ec3 + f5d3816 commit 921ea44

File tree

19 files changed

+505
-414
lines changed

19 files changed

+505
-414
lines changed

‎eng/Baseline.Designer.props

Lines changed: 246 additions & 246 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 109 additions & 109 deletions
Large diffs are not rendered by default.

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22107.2">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22122.7">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
285+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22107.2">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22122.7">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
290+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22107.2">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22122.7">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
294+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22107.2">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22122.7">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
298+
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>4</AspNetCorePatchVersion>
12-
<ValidateBaseline>false</ValidateBaseline>
12+
<ValidateBaseline>true</ValidateBaseline>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.4</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.4</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22122.7</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22122.7</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138
@@ -212,10 +212,10 @@
212212
<!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. -->
213213
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>
214214
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>
215-
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.22-servicing-21579-4</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
215+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.23-servicing-22123-12</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
216216
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>
217217
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>
218-
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.14-servicing-22063-24</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>
218+
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.15-servicing-22116-16</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>
219219
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>
220220
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>
221221
<!-- 3rd party dependencies -->

‎eng/common/generate-sbom-prep.ps1

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Param(
2+
[Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed
3+
)
4+
5+
Write-Host "Creating dir $ManifestDirPath"
6+
# create directory for sbom manifest to be placed
7+
if (!(Test-Path -path $ManifestDirPath))
8+
{
9+
New-Item -ItemType Directory -path $ManifestDirPath
10+
Write-Host "Successfully created directory $ManifestDirPath"
11+
}
12+
else{
13+
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
14+
}
15+
16+
Write-Host "Updating artifact name"
17+
$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
18+
Write-Host "Artifact name $artifact_name"
19+
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"

‎eng/common/generate-sbom-prep.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
3+
source="${BASH_SOURCE[0]}"
4+
5+
manifest_dir=$1
6+
7+
if [ ! -d "$manifest_dir" ] ; then
8+
mkdir -p "$manifest_dir"
9+
echo "Sbom directory created." $manifest_dir
10+
else
11+
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
12+
fi
13+
14+
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
15+
echo "Artifact name before : "$artifact_name
16+
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
17+
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
18+
echo "Artifact name after : "$safe_artifact_name
19+
export ARTIFACT_NAME=$safe_artifact_name
20+
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
21+
22+
exit 0

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ parameters:
3131
name: ''
3232
preSteps: []
3333
runAsPublic: false
34+
# Sbom related params
35+
enableSbom: true
36+
PackageVersion: 6.0.0
37+
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
3438

3539
jobs:
3640
- job: ${{ parameters.name }}
@@ -247,3 +251,9 @@ jobs:
247251
ArtifactName: AssetManifests
248252
continueOnError: ${{ parameters.continueOnError }}
249253
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
254+
255+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
256+
- template: /eng/common/templates/steps/generate-sbom.yml
257+
parameters:
258+
PackageVersion: ${{ parameters.packageVersion}}
259+
BuildDropPath: ${{ parameters.buildDropPath }}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ parameters:
88
# Optional: Enable publishing using release pipelines
99
enablePublishUsingPipelines: false
1010

11-
# Optional: Disable component governance detection. In general, component governance
12-
# should be on for all jobs. Use only in the event of issues.
13-
disableComponentGovernance: false
14-
1511
# Optional: Enable running the source-build jobs to build repo from source
1612
enableSourceBuild: false
1713

‎eng/common/templates/steps/generate-sbom.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated.
2+
# PackageName - The name of the package this SBOM represents.
3+
# PackageVersion - The version of the package this SBOM represents.
4+
# ManifestDirPath - The path of the directory where the generated manifest files will be placed
5+
6+
parameters:
7+
PackageVersion: 6.0.0
8+
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
9+
PackageName: '.NET'
10+
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
11+
sbomContinueOnError: true
12+
13+
steps:
14+
- task: PowerShell@2
15+
displayName: Prep for SBOM generation in (Non-linux)
16+
condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin'))
17+
inputs:
18+
filePath: ./eng/common/generate-sbom-prep.ps1
19+
arguments: ${{parameters.manifestDirPath}}
20+
21+
# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461
22+
- script: |
23+
chmod +x ./eng/common/generate-sbom-prep.sh
24+
./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}}
25+
displayName: Prep for SBOM generation in (Linux)
26+
condition: eq(variables['Agent.Os'], 'Linux')
27+
continueOnError: ${{ parameters.sbomContinueOnError }}
28+
29+
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
30+
displayName: 'Generate SBOM manifest'
31+
continueOnError: ${{ parameters.sbomContinueOnError }}
32+
inputs:
33+
PackageName: ${{ parameters.packageName }}
34+
BuildDropPath: ${{ parameters.buildDropPath }}
35+
PackageVersion: ${{ parameters.packageVersion }}
36+
ManifestDirPath: ${{ parameters.manifestDirPath }}
37+
38+
- task: PublishPipelineArtifact@1
39+
displayName: Publish SBOM manifest
40+
continueOnError: ${{parameters.sbomContinueOnError}}
41+
inputs:
42+
targetPath: '${{parameters.manifestDirPath}}'
43+
artifactName: $(ARTIFACT_NAME)
44+

‎eng/helix/helix.proj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test" TreatAsLocalProperty="ProjectToBuild">
22

3-
<!--
3+
<!--
44
TEMPORARY workaround while we wait for https://github.com/dotnet/arcade/issues/8336 to be addressed.
5-
When the runtime version we're ingesting was built publicly, or we're building in public CI, IsPublicRuntime should be true,
5+
When the runtime version we're ingesting was built publicly, or we're building in public CI, IsPublicRuntime should be true,
66
causing us to use the normal workflow of downloading it from the public location in Helix.
7-
When the runtime was built internally (which necessarily also means we're building in the internal project), IsPublicRuntime should be false,
7+
When the runtime was built internally (which necessarily also means we're building in the internal project), IsPublicRuntime should be false,
88
causing us to pass the right Sas token to get Helx to download it from the internal location.
99
Once https://github.com/dotnet/arcade/issues/8336, we only need to set AdditionalDotNetPackage below,
1010
not HelixCorrelationPayload.
1111
-->
1212
<PropertyGroup>
13-
<IsPublicRuntime>false</IsPublicRuntime>
13+
<IsPublicRuntime>true</IsPublicRuntime>
1414
</PropertyGroup>
1515

1616
<PropertyGroup>
@@ -59,7 +59,7 @@
5959
Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal' AND '$(IsPublicRuntime)' == 'false'"
6060
Destination="dotnet-cli"
6161
Uri="https://dotnetbuilds.blob.core.windows.net/internal/Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(DotNetCliRuntime)$(ArchiveExtension)$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))" />
62-
62+
6363
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
6464
Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal' OR '$(IsPublicRuntime)' == 'true'">
6565
<PackageType>runtime</PackageType>

0 commit comments

Comments
 (0)