From 94f35696b7b680baf775a2b9ee097092c4dfe9d3 Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Mon, 3 Feb 2025 17:44:50 +0000 Subject: [PATCH] Add vstest exclusion with issue to investigate --- .../assets/SdkContentTests/MsftToSbSdkFiles.diff | 9 --------- .../assets/SdkContentTests/SdkFileDiffExclusions.txt | 4 ++++ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/SdkContentTests/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/SdkContentTests/MsftToSbSdkFiles.diff index 7f8477db949f..08e9883a153c 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/SdkContentTests/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/SdkContentTests/MsftToSbSdkFiles.diff @@ -60,15 +60,6 @@ index ------------ ./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/ ./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/x.y.z/ ./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/x.y.z/WorkloadManifest.Aspire.targets -@@ ------------ @@ - ./sdk/x.y.z/es/vstest.console.resources.dll - ./sdk/x.y.z/Extensions/ - ./sdk/x.y.z/Extensions/Microsoft.Diagnostics.NETCore.Client.dll --./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.BlameDataCollector.dll --./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.EventLogCollector.dll - ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.TestHostRuntimeProvider.dll - ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll - ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/SdkContentTests/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/SdkContentTests/SdkFileDiffExclusions.txt index e0220b7064ee..9a6b1ea4cb88 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/SdkContentTests/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.Tests/assets/SdkContentTests/SdkFileDiffExclusions.txt @@ -83,6 +83,10 @@ ./sdk/x.y.z/*/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll|sb ./sdk/x.y.z/*/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll|sb +# https://github.com/dotnet/source-build/issues/4881 +./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.BlameDataCollector.dll|msft +./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.EventLogCollector.dll|msft + # Needed for source-built NativeAOT with the source-built SDK ./library-packs/|sb ./packs/runtime.banana-rid.Microsoft.DotNet.ILCompiler/|sb