mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merged PR 42834: Update MsftToSbSdk.diff

Browse source 
Fixes https://github.com/dotnet/source-build/issues/4604

Update MsftToSbSdk.diff

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup to update the `MsftToSbSdk.diff` file.

#### PR Summary
This pull request updates the `MsftToSbSdk.diff` file to clean up and correct the list of SDK files.
- `src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff`: Removed redundant entries and corrected the placement of `System.Text.Json.dll` and `System.Windows.Extensions.dll`.
This commit is contained in:
Ella Hathaway 2024-09-13 21:40:06 +00:00
parent 54f04abdc9
commit a2a6e0c0c9
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
View file

@ -102,10 +102,9 @@ index ------------
+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll +./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll
+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll +./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll
+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll +./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll
+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/ ./sdk/x.y.z/DotnetTools/dotnet-watch/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/
@@ ------------ @@ @@ ------------ @@
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll
@ -428,10 +427,10 @@ index ------------
./sdk/x.y.z/System.Security.Cryptography.Xml.dll ./sdk/x.y.z/System.Security.Cryptography.Xml.dll
-./sdk/x.y.z/System.Security.Permissions.dll -./sdk/x.y.z/System.Security.Permissions.dll
./sdk/x.y.z/System.ServiceProcess.ServiceController.dll ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll
-./sdk/x.y.z/System.Windows.Extensions.dll
+./sdk/x.y.z/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/System.Text.Encoding.CodePages.dll
+./sdk/x.y.z/System.Text.Encodings.Web.dll +./sdk/x.y.z/System.Text.Encodings.Web.dll
+./sdk/x.y.z/System.Text.Json.dll ./sdk/x.y.z/System.Text.Json.dll
-./sdk/x.y.z/System.Windows.Extensions.dll
+./sdk/x.y.z/testhost.deps.json +./sdk/x.y.z/testhost.deps.json
+./sdk/x.y.z/testhost.dll +./sdk/x.y.z/testhost.dll
+./sdk/x.y.z/testhost.dll.config +./sdk/x.y.z/testhost.dll.config