Skip to content

Commit 0c9b70d

Browse files
author
Mirroring
committed
Merge commit 'f0d7e1f58406583972ea640029d5a5a341a76731'
2 parents d7dd049 + f0d7e1f commit 0c9b70d

File tree

9 files changed

+92
-77
lines changed

9 files changed

+92
-77
lines changed

‎NuGet.config

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
1212
<add key="darc-pub-dotnet-emsdk-78be8cd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-78be8cdf/nuget/v3/index.json" />
13-
<add key="darc-pub-dotnet-emsdk-dad5528" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dad5528e/nuget/v3/index.json" />
1413
<!-- End: Package sources from dotnet-emsdk -->
1514
<!-- Begin: Package sources from dotnet-sdk -->
1615
<add key="darc-pub-dotnet-sdk-346d06b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-sdk-346d06ba/nuget/v3/index.json" />

‎eng/Version.Details.xml

+42-42
Original file line numberDiff line numberDiff line change
@@ -92,87 +92,87 @@
9292
</Dependency>
9393
</ProductDependencies>
9494
<ToolsetDependencies>
95-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25111.5">
95+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25161.4">
9696
<Uri>https://github.com/dotnet/arcade</Uri>
97-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
97+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
9898
</Dependency>
9999
<!-- Intermediate is necessary for source build. -->
100-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25111.5">
100+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25161.4">
101101
<Uri>https://github.com/dotnet/arcade</Uri>
102-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
102+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
103103
<SourceBuild RepoName="arcade" ManagedOnly="true" />
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25111.5">
105+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25161.4">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
107+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25111.5">
109+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25161.4">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
111+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25111.5">
113+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25161.4">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
115+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.25111.5">
117+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.25161.4">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
119+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.25111.5">
121+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.25161.4">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
123+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25111.5">
125+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25161.4">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
127+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.25111.5">
129+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.25161.4">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
131+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25111.5">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25161.4">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
135+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.25111.5">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.25161.4">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
139+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25111.5">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25161.4">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
143+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25111.5">
145+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25161.4">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
147+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25111.5">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.25161.4">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
151+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25111.5">
153+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25161.4">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
155+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.25111.5">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.25161.4">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
159+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25111.5">
161+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25161.4">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
163+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25111.5">
165+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25161.4">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
167+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25111.5">
169+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25161.4">
170170
<Uri>https://github.com/dotnet/arcade</Uri>
171-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
171+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25111.5">
173+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25161.4">
174174
<Uri>https://github.com/dotnet/arcade</Uri>
175-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
175+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
176176
</Dependency>
177177
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.25113.2">
178178
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -332,9 +332,9 @@
332332
<Uri>https://github.com/dotnet/xharness</Uri>
333333
<Sha>edc52ac68c1bf77e3b107fc8a448674a6d058d8a</Sha>
334334
</Dependency>
335-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.25111.5">
335+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.25161.4">
336336
<Uri>https://github.com/dotnet/arcade</Uri>
337-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
337+
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
338338
</Dependency>
339339
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
340340
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

+16-16
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,22 @@
8585
<!-- SDK dependencies (also used in wasm build tests -->
8686
<MicrosoftDotNetApiCompatTaskVersion>9.0.104</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25111.5</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25111.5</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25111.5</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25111.5</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25111.5</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25111.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25111.5</MicrosoftDotNetRemoteExecutorVersion>
102-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25111.5</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25111.5</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25161.4</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25161.4</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25161.4</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25161.4</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25161.4</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25161.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25161.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25161.4</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25161.4</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25161.4</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->

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

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

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

+11-6
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

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "9.0.103",
3+
"version": "9.0.104",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "9.0.103"
8+
"dotnet": "9.0.104"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5",
12-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25111.5",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25111.5",
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25161.4",
12+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25161.4",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25161.4",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"

‎src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs

+2
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ public async Task TestBasicReceiveAndResponseEvents()
145145
}
146146
}
147147

148+
[ActiveIssue("https://github.com/dotnet/runtime/issues/112792")]
148149
[OuterLoop]
149150
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
150151
public void TestW3CHeaders()
@@ -194,6 +195,7 @@ public void TestW3CHeadersTraceStateAndCorrelationContext()
194195
{
195196
using (var eventRecords = new EventObserverAndRecorder())
196197
{
198+
Activity.DefaultIdFormat = ActivityIdFormat.W3C;
197199
var parent = new Activity("w3c activity");
198200
parent.SetParentId(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom());
199201
parent.TraceStateString = "some=state";

0 commit comments

Comments
 (0)