From 77de54d4d46081ec78c359f921b509c5b1e8bada 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 19:09:24 +0100 Subject: [PATCH 1/3] Update baselines for build https://dev.azure.com/dnceng/internal/_build/results?buildId=2630126 (internal Microsoft link) --- .../SdkContentTests/MsftToSbSdkFiles.diff | 17 +++++++++++++++++ .../SdkContentTests/SdkFileDiffExclusions.txt | 1 - 2 files changed, 17 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..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 @@ -52,6 +60,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 19a67c2e4218295d29f40c5877adb0a9d0863142 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 03:13:09 +0100 Subject: [PATCH 2/3] Update baselines for build https://dev.azure.com/dnceng/internal/_build/results?buildId=2631186 (internal Microsoft link) --- .../assets/SdkContentTests/MsftToSbSdkFiles.diff | 10 +--------- 1 file changed, 1 insertion(+), 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 cd70a679bc23..e9b8b9ec42f7 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 @@ -53,7 +45,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 7961ce6949568f692a795d18bb74649a4af60f93 Mon Sep 17 00:00:00 2001 From: ".NET Source-Build Bot" <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Fri, 31 Jan 2025 22:32:54 +0100 Subject: [PATCH 3/3] Update baselines for build https://dev.azure.com/dnceng/internal/_build/results?buildId=2632491 (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 e9b8b9ec42f7..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 @@ -45,7 +45,7 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ @@ ------------ @@ - ./sdk-manifests/x.y.z/ + ./sdk-manifests/ ./sdk-manifests/x.y.z/ ./sdk-manifests/x.y.z/ -./sdk-manifests/x.y.z/