From dbeae1ac71d95355452952059f35960991cb3fd2 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 20 Sep 2023 10:19:33 -0500 Subject: [PATCH] Update SDK diff baseline (#17392) --- .../assets/SdkFileDiffExclusions.txt | 5 +++++ .../assets/baselines/MsftToSbSdkFiles.diff | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index f9ecdcc6a..7e2cd688a 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -78,6 +78,11 @@ msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Cryptography.Protecte msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Permissions.dll msft,./sdk/x.y.z/DotnetTools/dotnet-format/System.Windows.Extensions.dll +# https://github.com/dotnet/source-build/issues/3632 +msft,./sdk/x.y.z/DotnetTools/dotnet-format/*/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll +sb,./sdk/x.y.z/DotnetTools/dotnet-format/*/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.resources.dll +sb,./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.dll + # netfx runtimes for fsharp - https://github.com/dotnet/source-build/issues/3290 msft,./sdk/x.y.z/FSharp/Microsoft.VisualStudio.Setup.Configuration.Interop.dll msft,./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff index 1d80c0e06..1f7310c14 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff @@ -45,9 +45,9 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ @@ ------------ @@ + ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll ./sdk-manifests/ ./sdk-manifests/x.y.z/ - ./sdk-manifests/x.y.z/ -./sdk-manifests/x.y.z/ ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/ ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/