From cac85ca15abad335e262ea8357e404c8f0e78443 Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Mon, 19 Aug 2024 17:40:26 +0000 Subject: [PATCH] Merged PR 41861: Update MsftToSbSdk.diff Fixes https://github.com/dotnet/source-build/issues/4565 Update MsftToSbSdk.diff Coordinated in Servicing channel - got approval for this to go in. ---- #### AI description (iteration 1) #### PR Classification Code cleanup and update of baseline diff file. #### PR Summary This pull request updates the `MsftToSbSdk.diff` file to reflect recent changes in the SDK and package references. - `MsftToSbSdk.diff`: Removed several references to `.dll` and `.xml` files under `Microsoft.AspNetCore.App.Ref` and `Microsoft.NETCore.App.Host.portable-rid`. - `MsftToSbSdk.diff`: Added new references under `Microsoft.NETCore.App.Host.banana-rid`. - `MsftToSbSdk.diff`: Adjusted entries for `System.Formats.Asn1.dll` and `System.Security.AccessControl.dll` in the `FSharp` and `System` directories. --- .../assets/baselines/MsftToSbSdk.diff | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 6d3d215c4..6dfa7ec1c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,20 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./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.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -42,10 +29,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ @@ -220,7 +203,7 @@ index ------------ -./sdk/x.y.z/FSharp/System.CodeDom.dll -./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll -./sdk/x.y.z/FSharp/System.Drawing.Common.dll -+./sdk/x.y.z/FSharp/System.Formats.Asn1.dll + ./sdk/x.y.z/FSharp/System.Formats.Asn1.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll +./sdk/x.y.z/FSharp/System.Security.AccessControl.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll @@ -436,7 +419,7 @@ index ------------ +./sdk/x.y.z/System.Diagnostics.DiagnosticSource.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll -./sdk/x.y.z/System.Drawing.Common.dll -+./sdk/x.y.z/System.Formats.Asn1.dll + ./sdk/x.y.z/System.Formats.Asn1.dll ./sdk/x.y.z/System.Resources.Extensions.dll +./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.dll +./sdk/x.y.z/System.Security.AccessControl.dll