diff --git a/NuGet.config b/NuGet.config
index 9d44e25da71a31..deafa2a01414c9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,7 +10,6 @@
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index af2296e50d4fed..5417063b3d3b6b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -92,87 +92,87 @@
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
https://github.com/dotnet/runtime-assets
@@ -332,9 +332,9 @@
https://github.com/dotnet/xharness
edc52ac68c1bf77e3b107fc8a448674a6d058d8a
-
+
https://github.com/dotnet/arcade
- 5da211e1c42254cb35e7ef3d5a8428fb24853169
+ f33d9e642f0e68a61312164cd9e0baf4e142a999
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index 529914efb810e3..8ba353723841c2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -85,22 +85,22 @@
9.0.104
- 9.0.0-beta.25111.5
- 9.0.0-beta.25111.5
- 9.0.0-beta.25111.5
- 9.0.0-beta.25111.5
- 2.9.0-beta.25111.5
- 9.0.0-beta.25111.5
- 2.9.0-beta.25111.5
- 9.0.0-beta.25111.5
- 9.0.0-beta.25111.5
- 9.0.0-beta.25111.5
- 9.0.0-beta.25111.5
- 9.0.0-beta.25111.5
- 9.0.0-beta.25111.5
- 9.0.0-beta.25111.5
- 9.0.0-beta.25111.5
- 9.0.0-beta.25111.5
+ 9.0.0-beta.25161.4
+ 9.0.0-beta.25161.4
+ 9.0.0-beta.25161.4
+ 9.0.0-beta.25161.4
+ 2.9.0-beta.25161.4
+ 9.0.0-beta.25161.4
+ 2.9.0-beta.25161.4
+ 9.0.0-beta.25161.4
+ 9.0.0-beta.25161.4
+ 9.0.0-beta.25161.4
+ 9.0.0-beta.25161.4
+ 9.0.0-beta.25161.4
+ 9.0.0-beta.25161.4
+ 9.0.0-beta.25161.4
+ 9.0.0-beta.25161.4
+ 9.0.0-beta.25161.4
1.4.0
diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml
index d938b60e1bb534..56a090094824f4 100644
--- a/eng/common/core-templates/steps/generate-sbom.yml
+++ b/eng/common/core-templates/steps/generate-sbom.yml
@@ -38,7 +38,7 @@ steps:
PackageName: ${{ parameters.packageName }}
BuildDropPath: ${{ parameters.buildDropPath }}
PackageVersion: ${{ parameters.packageVersion }}
- ManifestDirPath: ${{ parameters.manifestDirPath }}
+ ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
${{ if ne(parameters.IgnoreDirectories, '') }}:
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1
index 3e5c1c74a1c50d..a0c7d792a76fbe 100644
--- a/eng/common/generate-sbom-prep.ps1
+++ b/eng/common/generate-sbom-prep.ps1
@@ -4,18 +4,26 @@ Param(
. $PSScriptRoot\pipeline-logging-functions.ps1
+# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
+# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
+$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
+$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
+$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName
+
+Write-Host "Artifact name before : $ArtifactName"
+Write-Host "Artifact name after : $SafeArtifactName"
+
Write-Host "Creating dir $ManifestDirPath"
+
# create directory for sbom manifest to be placed
-if (!(Test-Path -path $ManifestDirPath))
+if (!(Test-Path -path $SbomGenerationDir))
{
- New-Item -ItemType Directory -path $ManifestDirPath
- Write-Host "Successfully created directory $ManifestDirPath"
+ New-Item -ItemType Directory -path $SbomGenerationDir
+ Write-Host "Successfully created directory $SbomGenerationDir"
}
else{
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
}
Write-Host "Updating artifact name"
-$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
-Write-Host "Artifact name $artifact_name"
-Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
+Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"
diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh
index d5c76dc827b496..b8ecca72bbf506 100644
--- a/eng/common/generate-sbom-prep.sh
+++ b/eng/common/generate-sbom-prep.sh
@@ -14,19 +14,24 @@ done
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
. $scriptroot/pipeline-logging-functions.sh
+
+# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
+artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
+safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
manifest_dir=$1
-if [ ! -d "$manifest_dir" ] ; then
- mkdir -p "$manifest_dir"
- echo "Sbom directory created." $manifest_dir
+# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
+# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
+sbom_generation_dir="$manifest_dir/$safe_artifact_name"
+
+if [ ! -d "$sbom_generation_dir" ] ; then
+ mkdir -p "$sbom_generation_dir"
+ echo "Sbom directory created." $sbom_generation_dir
else
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
fi
-artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
echo "Artifact name before : "$artifact_name
-# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
-safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
echo "Artifact name after : "$safe_artifact_name
export ARTIFACT_NAME=$safe_artifact_name
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index 605692d2fb770c..817555505aa602 100644
--- a/eng/common/templates-official/job/job.yml
+++ b/eng/common/templates-official/job/job.yml
@@ -16,6 +16,7 @@ jobs:
parameters:
PackageVersion: ${{ parameters.packageVersion }}
BuildDropPath: ${{ parameters.buildDropPath }}
+ ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
publishArtifacts: false
# publish artifacts
diff --git a/global.json b/global.json
index 8cf149480ba5d3..ebf092e8e505d2 100644
--- a/global.json
+++ b/global.json
@@ -1,16 +1,16 @@
{
"sdk": {
- "version": "9.0.103",
+ "version": "9.0.104",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "9.0.103"
+ "dotnet": "9.0.104"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25111.5",
- "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25111.5",
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25161.4",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25161.4",
+ "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25161.4",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs
index 0c23059c17ae88..ecfe219e072843 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs
@@ -145,6 +145,7 @@ public async Task TestBasicReceiveAndResponseEvents()
}
}
+ [ActiveIssue("https://github.com/dotnet/runtime/issues/112792")]
[OuterLoop]
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
public void TestW3CHeaders()
@@ -194,6 +195,7 @@ public void TestW3CHeadersTraceStateAndCorrelationContext()
{
using (var eventRecords = new EventObserverAndRecorder())
{
+ Activity.DefaultIdFormat = ActivityIdFormat.W3C;
var parent = new Activity("w3c activity");
parent.SetParentId(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom());
parent.TraceStateString = "some=state";