Skip to content

Commit 9172eea

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 48410: [internal/release/9.0] Merge from public
Merge from public release/9.0 to internal/release/9.0 and resolve conflicts if necessary
2 parents 0a16d41 + 97b629f commit 9172eea

File tree

7 files changed

+47
-33
lines changed

7 files changed

+47
-33
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
191191
</ProductDependencies>
192192
<ToolsetDependencies>
193193
<!-- Arcade -->
194-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25111.5">
194+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25161.4">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
196+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.25111.5">
198+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.25161.4">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
200+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.25111.5">
202+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.25161.4">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
204+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
205205
</Dependency>
206-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25111.5">
206+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25161.4">
207207
<Uri>https://github.com/dotnet/arcade</Uri>
208-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
208+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
209209
</Dependency>
210-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25111.5">
210+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25161.4">
211211
<Uri>https://github.com/dotnet/arcade</Uri>
212-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
212+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
213213
</Dependency>
214-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25111.5">
214+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25161.4">
215215
<Uri>https://github.com/dotnet/arcade</Uri>
216-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
216+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
217217
</Dependency>
218218
</ToolsetDependencies>
219219
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
</PropertyGroup>
5858
<!-- Arcade -->
5959
<PropertyGroup>
60-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.25111.5</MicrosoftDotNetGenFacadesPackageVersion>
61-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25111.5</MicrosoftDotNetRemoteExecutorVersion>
62-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.25111.5</MicrosoftDotNetXUnitExtensionsPackageVersion>
60+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetGenFacadesPackageVersion>
61+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25161.4</MicrosoftDotNetRemoteExecutorVersion>
62+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
6363
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6464
</PropertyGroup>
6565
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ steps:
3838
PackageName: ${{ parameters.packageName }}
3939
BuildDropPath: ${{ parameters.buildDropPath }}
4040
PackageVersion: ${{ parameters.packageVersion }}
41-
ManifestDirPath: ${{ parameters.manifestDirPath }}
41+
ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
4242
${{ if ne(parameters.IgnoreDirectories, '') }}:
4343
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
4444

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,26 @@ Param(
44

55
. $PSScriptRoot\pipeline-logging-functions.ps1
66

7+
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
8+
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
9+
$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
10+
$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
11+
$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName
12+
13+
Write-Host "Artifact name before : $ArtifactName"
14+
Write-Host "Artifact name after : $SafeArtifactName"
15+
716
Write-Host "Creating dir $ManifestDirPath"
17+
818
# create directory for sbom manifest to be placed
9-
if (!(Test-Path -path $ManifestDirPath))
19+
if (!(Test-Path -path $SbomGenerationDir))
1020
{
11-
New-Item -ItemType Directory -path $ManifestDirPath
12-
Write-Host "Successfully created directory $ManifestDirPath"
21+
New-Item -ItemType Directory -path $SbomGenerationDir
22+
Write-Host "Successfully created directory $SbomGenerationDir"
1323
}
1424
else{
1525
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
1626
}
1727

1828
Write-Host "Updating artifact name"
19-
$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
20-
Write-Host "Artifact name $artifact_name"
21-
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
29+
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,24 @@ done
1414
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1515
. $scriptroot/pipeline-logging-functions.sh
1616

17+
18+
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
19+
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
20+
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
1721
manifest_dir=$1
1822

19-
if [ ! -d "$manifest_dir" ] ; then
20-
mkdir -p "$manifest_dir"
21-
echo "Sbom directory created." $manifest_dir
23+
# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
24+
# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
25+
sbom_generation_dir="$manifest_dir/$safe_artifact_name"
26+
27+
if [ ! -d "$sbom_generation_dir" ] ; then
28+
mkdir -p "$sbom_generation_dir"
29+
echo "Sbom directory created." $sbom_generation_dir
2230
else
2331
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
2432
fi
2533

26-
artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
2734
echo "Artifact name before : "$artifact_name
28-
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
29-
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
3035
echo "Artifact name after : "$safe_artifact_name
3136
export ARTIFACT_NAME=$safe_artifact_name
3237
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
parameters:
1717
PackageVersion: ${{ parameters.packageVersion }}
1818
BuildDropPath: ${{ parameters.buildDropPath }}
19+
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
1920
publishArtifacts: false
2021

2122
# publish artifacts

‎global.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.103",
3+
"dotnet": "9.0.104",
44
"runtimes": {
55
"dotnet/x64": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -11,12 +11,12 @@
1111
}
1212
},
1313
"sdk": {
14-
"version": "9.0.103"
14+
"version": "9.0.104"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5",
18-
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25111.5",
19-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25111.5",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25161.4",
18+
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25161.4",
19+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25161.4",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "9.0.4"
2222
},

0 commit comments

Comments
 (0)