From 9fa934c39ca025bdea8af816c29330a004fec8c5 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 1 Sep 2023 08:50:10 -0400 Subject: [PATCH] fix: Remove linked satellite assemblies refs in interp mode (cherry picked from commit 781b152318a229f2b3fb8bc5c9c863a62585d695) # Conflicts: # src/Uno.Wasm.Bootstrap.sln # src/Uno.Wasm.SampleNet7/Uno.Wasm.SampleNet7.csproj --- src/Uno.Wasm.Bootstrap.sln | 43 +++++++++++++++++++ src/Uno.Wasm.Bootstrap/ShellTask.cs | 4 +- src/Uno.Wasm.Sample.Library/ClassLibrary01.cs | 12 ++++++ .../Uno.Wasm.Sample.Library.csproj | 13 ++++++ src/Uno.Wasm.Sample/Program.cs | 1 + src/Uno.Wasm.Sample/sample.common.props | 8 +++- .../Uno.Wasm.SampleNet7.csproj | 8 ++-- 7 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 src/Uno.Wasm.Sample.Library/ClassLibrary01.cs create mode 100644 src/Uno.Wasm.Sample.Library/Uno.Wasm.Sample.Library.csproj diff --git a/src/Uno.Wasm.Bootstrap.sln b/src/Uno.Wasm.Bootstrap.sln index 4d8d985f..105a182c 100644 --- a/src/Uno.Wasm.Bootstrap.sln +++ b/src/Uno.Wasm.Bootstrap.sln @@ -131,6 +131,26 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Root", "_Root", "{70AAFC96 ..\Readme.md = ..\Readme.md EndProjectSection EndProject +<<<<<<< HEAD +======= +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Wasm.Tests.AbsoluteIntermediate", "Uno.Wasm.Tests.AbsoluteIntermediate\Uno.Wasm.Tests.AbsoluteIntermediate.csproj", "{6584CC1B-2628-4872-851A-E85C0E572D39}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Wasm.StaticLinking.Embedded", "Uno.Wasm.StaticLinking.Embedded\Uno.Wasm.StaticLinking.Embedded.csproj", "{B7270680-8BCF-4246-834C-0F7CAF48FBB9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D9443716-A385-4210-80A3-06B8688EDD96}" + ProjectSection(SolutionItems) = preProject + ..\build\scripts\run-tests-csp.sh = ..\build\scripts\run-tests-csp.sh + ..\build\scripts\run-tests-server.sh = ..\build\scripts\run-tests-server.sh + ..\build\scripts\run-tests-swa.sh = ..\build\scripts\run-tests-swa.sh + ..\build\scripts\run-tests-windows-server.ps1 = ..\build\scripts\run-tests-windows-server.ps1 + ..\build\scripts\run-tests-windows.ps1 = ..\build\scripts\run-tests-windows.ps1 + ..\build\scripts\run-tests.sh = ..\build\scripts\run-tests.sh + ..\build\scripts\server.py = ..\build\scripts\server.py + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Wasm.Sample.Library", "Uno.Wasm.Sample.Library\Uno.Wasm.Sample.Library.csproj", "{42FC5421-72BC-41EA-A1C4-FF88A2DC820A}" +EndProject +>>>>>>> 781b152 (fix: Remove linked satellite assemblies refs in interp mode) Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -313,10 +333,25 @@ Global {A7F3B4BF-A73D-4769-A78D-5F3CAC362AAF}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7F3B4BF-A73D-4769-A78D-5F3CAC362AAF}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7F3B4BF-A73D-4769-A78D-5F3CAC362AAF}.Release|Any CPU.Build.0 = Release|Any CPU +<<<<<<< HEAD {0527B6ED-6050-4B55-A602-31DD46CF5999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0527B6ED-6050-4B55-A602-31DD46CF5999}.Debug|Any CPU.Build.0 = Debug|Any CPU {0527B6ED-6050-4B55-A602-31DD46CF5999}.Release|Any CPU.ActiveCfg = Release|Any CPU {0527B6ED-6050-4B55-A602-31DD46CF5999}.Release|Any CPU.Build.0 = Release|Any CPU +======= + {6584CC1B-2628-4872-851A-E85C0E572D39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6584CC1B-2628-4872-851A-E85C0E572D39}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6584CC1B-2628-4872-851A-E85C0E572D39}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6584CC1B-2628-4872-851A-E85C0E572D39}.Release|Any CPU.Build.0 = Release|Any CPU + {B7270680-8BCF-4246-834C-0F7CAF48FBB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7270680-8BCF-4246-834C-0F7CAF48FBB9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7270680-8BCF-4246-834C-0F7CAF48FBB9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B7270680-8BCF-4246-834C-0F7CAF48FBB9}.Release|Any CPU.Build.0 = Release|Any CPU + {42FC5421-72BC-41EA-A1C4-FF88A2DC820A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42FC5421-72BC-41EA-A1C4-FF88A2DC820A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42FC5421-72BC-41EA-A1C4-FF88A2DC820A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42FC5421-72BC-41EA-A1C4-FF88A2DC820A}.Release|Any CPU.Build.0 = Release|Any CPU +>>>>>>> 781b152 (fix: Remove linked satellite assemblies refs in interp mode) EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -364,6 +399,14 @@ Global {FC27FD88-F96B-4A00-8B8D-9B20B28A7A9C} = {5F914B7D-AFA2-4145-9548-B1B3A16D77AE} {2829B1BF-47C7-4284-9EAF-DEB48C4A0209} = {00F3A4D2-5534-44AF-B655-6209355E32A9} {227B4962-4978-4712-8C52-630E2371A869} = {5F914B7D-AFA2-4145-9548-B1B3A16D77AE} +<<<<<<< HEAD +======= + {A7F3B4BF-A73D-4769-A78D-5F3CAC362AAF} = {84D19B91-8728-4EBD-A6B2-D51F3B0EAB31} + {6584CC1B-2628-4872-851A-E85C0E572D39} = {35E84E5F-1C9B-4168-8333-216B456C12DF} + {B7270680-8BCF-4246-834C-0F7CAF48FBB9} = {5F914B7D-AFA2-4145-9548-B1B3A16D77AE} + {D9443716-A385-4210-80A3-06B8688EDD96} = {70AAFC96-05F5-43A3-959A-95FB32CDE202} + {42FC5421-72BC-41EA-A1C4-FF88A2DC820A} = {00F3A4D2-5534-44AF-B655-6209355E32A9} +>>>>>>> 781b152 (fix: Remove linked satellite assemblies refs in interp mode) EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FA350FE9-9316-4846-8145-356F9A0ACBC7} diff --git a/src/Uno.Wasm.Bootstrap/ShellTask.cs b/src/Uno.Wasm.Bootstrap/ShellTask.cs index a7069a41..cc97111a 100644 --- a/src/Uno.Wasm.Bootstrap/ShellTask.cs +++ b/src/Uno.Wasm.Bootstrap/ShellTask.cs @@ -1011,10 +1011,10 @@ private void RunPackager() // generated by the packager. Synchronize the list with the actual list. // var deletedFiles = Directory - .GetFiles(linkerInput) + .GetFiles(linkerInput, "*.*", SearchOption.AllDirectories) .Select(Path.GetFileName) .Except(Directory - .GetFiles(_managedPath) + .GetFiles(_managedPath, "*.*", SearchOption.AllDirectories) .Select(Path.GetFileName) ); diff --git a/src/Uno.Wasm.Sample.Library/ClassLibrary01.cs b/src/Uno.Wasm.Sample.Library/ClassLibrary01.cs new file mode 100644 index 00000000..4a1b003c --- /dev/null +++ b/src/Uno.Wasm.Sample.Library/ClassLibrary01.cs @@ -0,0 +1,12 @@ +using System.Reflection; + +[assembly: AssemblyMetadata("IsTrimmable", "True")] + +namespace Uno.Wasm.Sample.Library +{ + public class ClassLibrary01 + { + private static void Unused() + => typeof(Microsoft.CodeAnalysis.Accessibility).ToString(); + } +} diff --git a/src/Uno.Wasm.Sample.Library/Uno.Wasm.Sample.Library.csproj b/src/Uno.Wasm.Sample.Library/Uno.Wasm.Sample.Library.csproj new file mode 100644 index 00000000..6e6aac96 --- /dev/null +++ b/src/Uno.Wasm.Sample.Library/Uno.Wasm.Sample.Library.csproj @@ -0,0 +1,13 @@ + + + + netstandard2.0 + enable + enable + + + + + + + diff --git a/src/Uno.Wasm.Sample/Program.cs b/src/Uno.Wasm.Sample/Program.cs index b93158bb..9bf00ed1 100644 --- a/src/Uno.Wasm.Sample/Program.cs +++ b/src/Uno.Wasm.Sample/Program.cs @@ -25,6 +25,7 @@ namespace Uno.Wasm.Sample public static class Program { private static Timer _t; + private static Uno.Wasm.Sample.Library.ClassLibrary01 _unused; static void Main(string[] args) { diff --git a/src/Uno.Wasm.Sample/sample.common.props b/src/Uno.Wasm.Sample/sample.common.props index ea3a0247..1071ff6a 100644 --- a/src/Uno.Wasm.Sample/sample.common.props +++ b/src/Uno.Wasm.Sample/sample.common.props @@ -11,6 +11,7 @@ + @@ -56,7 +57,8 @@ - + + @@ -76,4 +78,8 @@ + + + + diff --git a/src/Uno.Wasm.SampleNet7/Uno.Wasm.SampleNet7.csproj b/src/Uno.Wasm.SampleNet7/Uno.Wasm.SampleNet7.csproj index 0ffa3757..83308d90 100644 --- a/src/Uno.Wasm.SampleNet7/Uno.Wasm.SampleNet7.csproj +++ b/src/Uno.Wasm.SampleNet7/Uno.Wasm.SampleNet7.csproj @@ -16,15 +16,15 @@ latest true - - - - +<<<<<<< HEAD +======= + +>>>>>>> 781b152 (fix: Remove linked satellite assemblies refs in interp mode)