From ab5051e92e84f7597aebcc28a56d4e94c631e28a Mon Sep 17 00:00:00 2001 From: ".NET Source-Build Bot" <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Mon, 27 Jan 2025 13:14:00 +0100 Subject: [PATCH 1/5] Update baselines for build https://dev.azure.com/dnceng/internal/_build/results?buildId=2629183 (internal Microsoft link) --- .../assets/SdkContentTests/MsftToSbSdkFiles.diff | 9 +++++++++ .../assets/SdkContentTests/SdkFileDiffExclusions.txt | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) 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 ee625a441aa0..b42f3c44e7c1 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 @@ -52,6 +52,15 @@ 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 d10fb0eca178..e0220b7064ee 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 @@ -79,7 +79,6 @@ # https://github.com/dotnet/source-build/issues/4079 ./sdk/x.y.z/*/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll|sb -./sdk/x.y.z/*/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll|sb ./sdk/x.y.z/*/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll|sb ./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 From 72a979bf59d2203ab342dabe9914c8bee36f66dd Mon Sep 17 00:00:00 2001 From: ".NET Source-Build Bot" <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:11:21 +0100 Subject: [PATCH 2/5] Update baselines for build https://dev.azure.com/dnceng/internal/_build/results?buildId=2629968 (internal Microsoft link) --- .../assets/SdkContentTests/MsftToSbSdkFiles.diff | 8 ++++++++ 1 file changed, 8 insertions(+) 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 b42f3c44e7c1..cd70a679bc23 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 @@ -13,6 +13,14 @@ index ------------ ./packs/ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ +@@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipes.AccessControl.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipes.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Linq.AsyncEnumerable.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Linq.Expressions.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Linq.Parallel.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Linq.Queryable.xml @@ ------------ @@ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XmlSerializer.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XPath.XDocument.xml From 551cb64fc9fb4e04f8a12cbcaccf3d9c554d01af Mon Sep 17 00:00:00 2001 From: ".NET Source-Build Bot" <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Thu, 30 Jan 2025 13:12:27 +0100 Subject: [PATCH 3/5] Update baselines for build https://dev.azure.com/dnceng/internal/_build/results?buildId=2631436 (internal Microsoft link) --- .../assets/SdkContentTests/MsftToSbSdkFiles.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cd70a679bc23..7f8477db949f 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 @@ -53,7 +53,7 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ @@ ------------ @@ - ./sdk-manifests/ + ./sdk-manifests/x.y.z/ ./sdk-manifests/x.y.z/ ./sdk-manifests/x.y.z/ -./sdk-manifests/x.y.z/ From e436128655c331d311d8c9dba25f11f2d1cc7bed Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Mon, 3 Feb 2025 18:59:22 +0000 Subject: [PATCH 4/5] Add vstest exclusion with issue to investigate --- .../assets/SdkContentTests/MsftToSbSdkFiles.diff | 9 --------- .../assets/SdkContentTests/SdkFileDiffExclusions.txt | 4 +++- 2 files changed, 3 insertions(+), 10 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..0d2a1edf3fc2 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 @@ -77,7 +77,9 @@ ./sdk/x.y.z/*/dump/|msft -# https://github.com/dotnet/source-build/issues/4079 +# 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 ./sdk/x.y.z/*/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll|sb ./sdk/x.y.z/*/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll|sb ./sdk/x.y.z/*/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll|sb From 61dca50f58ae7497203294f234f8b30ec0fe33e8 Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Mon, 3 Feb 2025 19:12:05 +0000 Subject: [PATCH 5/5] Add exclusion for ref-pack diff and link runtime issue --- .../assets/SdkContentTests/MsftToSbSdkFiles.diff | 8 -------- .../assets/SdkContentTests/SdkFileDiffExclusions.txt | 3 +++ 2 files changed, 3 insertions(+), 8 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 08e9883a153c..a02cd7d50d12 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 @@ -13,14 +13,6 @@ index ------------ ./packs/ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ -@@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipes.AccessControl.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipes.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Linq.AsyncEnumerable.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Linq.Expressions.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Linq.Parallel.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Linq.Queryable.xml @@ ------------ @@ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XmlSerializer.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Xml.XPath.XDocument.xml 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 0d2a1edf3fc2..ffc0ffbe5c6f 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 @@ -53,6 +53,9 @@ ./sdk-manifests/x.y.z/microsoft.net.sdk.maui/|msft ./sdk-manifests/x.y.z/microsoft.net.sdk.tvos/|msft +# ref pack unintentionally missing from the msft sdk - https://github.com/dotnet/runtime/issues/112102 +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Linq.AsyncEnumerable.xml|sb + # linux runtimes are included in source-build for self-contained apps - https://github.com/dotnet/source-build/issues/3507 ./packs/Microsoft.AspNetCore.App.Runtime.*/|sb ./packs/Microsoft.NETCore.App.Runtime.*/|sb