From ee97ec87bab043b1ff2dd830c139799b4b942c5d Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Fri, 24 Feb 2023 16:51:44 +0000 Subject: [PATCH 1/6] Moved the flag to libs that really need it. --- eng/testing/tests.browser.targets | 3 --- .../tests/System.Collections.NonGeneric.Tests.csproj | 3 +++ .../tests/System.Globalization.Calendars.Tests.csproj | 3 +++ src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/eng/testing/tests.browser.targets b/eng/testing/tests.browser.targets index 849a12e96a83b..0f49d3230d3d5 100644 --- a/eng/testing/tests.browser.targets +++ b/eng/testing/tests.browser.targets @@ -8,9 +8,6 @@ true - - true - $([MSBuild]::NormalizeDirectory($(MonoProjectRoot), 'wasm', 'emsdk')) diff --git a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj index 60b01faed6ed1..69a3250dd1597 100644 --- a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj +++ b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj @@ -3,6 +3,9 @@ true $(NetCoreAppCurrent) true + + + true diff --git a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj b/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj index 2a64681a8b567..6d348d0875922 100644 --- a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj +++ b/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj @@ -2,6 +2,9 @@ $(NetCoreAppCurrent) true + + + true diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj index 8be0ce5839a3c..6233d31e47cc9 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj +++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj @@ -7,6 +7,9 @@ true $(Features.Replace('nullablePublicOnly', '') + + + true + true diff --git a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj index 3e2285f9612c3..75008d1bde78e 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj +++ b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj @@ -5,6 +5,9 @@ true true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser + + + true diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj b/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj index c29e8c3e65895..b8f7a32d7d380 100644 --- a/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj +++ b/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj @@ -45,6 +45,9 @@ System.Reflection.NullabilityInfoContext.IsSupported + + + true diff --git a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj index cd7501f1f9ee9..539ad69bcaf83 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj +++ b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj @@ -10,6 +10,8 @@ true true + + true From d1f019b826ce3b97480083953c37c655d443f725 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Mon, 27 Feb 2023 09:48:46 +0000 Subject: [PATCH 3/6] Property should not be set in ITemsGroup. --- .../tests/TrimmingTests/System.Runtime.TrimmingTests.proj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj b/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj index b8f7a32d7d380..ca0ccdd664050 100644 --- a/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj +++ b/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj @@ -45,10 +45,12 @@ System.Reflection.NullabilityInfoContext.IsSupported + + true - + From 9ffc90c418eb609dbb52ab3063048a5023d1c7f6 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Mon, 27 Feb 2023 11:21:36 +0000 Subject: [PATCH 4/6] Previos approach did not work, revert and try new one. --- eng/testing/linker/trimmingTests.props | 3 +++ .../tests/TrimmingTests/System.Runtime.TrimmingTests.proj | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/eng/testing/linker/trimmingTests.props b/eng/testing/linker/trimmingTests.props index b917cd5fe3826..eeb908915e3c3 100644 --- a/eng/testing/linker/trimmingTests.props +++ b/eng/testing/linker/trimmingTests.props @@ -4,5 +4,8 @@ $([MSBuild]::NormalizeDirectory('$(TrimmingTestDir)', 'projects')) $(MSBuildThisFileDirectory)project.csproj.template true + + + true diff --git a/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj b/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj index ca0ccdd664050..c29e8c3e65895 100644 --- a/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj +++ b/src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj @@ -47,10 +47,5 @@ - - - true - - From 5059298b009e1b2daad6b4fc600d12b10d6b8b42 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Mon, 27 Feb 2023 14:55:01 +0000 Subject: [PATCH 5/6] Only placing it here does not trim the assigned value. --- eng/testing/linker/trimmingTests.props | 3 --- eng/testing/tests.browser.targets | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/eng/testing/linker/trimmingTests.props b/eng/testing/linker/trimmingTests.props index eeb908915e3c3..b917cd5fe3826 100644 --- a/eng/testing/linker/trimmingTests.props +++ b/eng/testing/linker/trimmingTests.props @@ -4,8 +4,5 @@ $([MSBuild]::NormalizeDirectory('$(TrimmingTestDir)', 'projects')) $(MSBuildThisFileDirectory)project.csproj.template true - - - true diff --git a/eng/testing/tests.browser.targets b/eng/testing/tests.browser.targets index 0f49d3230d3d5..be27eccdef007 100644 --- a/eng/testing/tests.browser.targets +++ b/eng/testing/tests.browser.targets @@ -32,6 +32,11 @@ <_BundleAOTTestWasmAppForHelixDependsOn>$(_BundleAOTTestWasmAppForHelixDependsOn);PrepareForWasmBuildApp;_PrepareForAOTOnHelix + + + true + + Date: Wed, 1 Mar 2023 10:33:39 +0100 Subject: [PATCH 6/6] Add comment to the workaround. --- eng/testing/tests.browser.targets | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/testing/tests.browser.targets b/eng/testing/tests.browser.targets index d591159e1bcb4..203183c4dfdc3 100644 --- a/eng/testing/tests.browser.targets +++ b/eng/testing/tests.browser.targets @@ -32,7 +32,10 @@ <_BundleAOTTestWasmAppForHelixDependsOn>$(_BundleAOTTestWasmAppForHelixDependsOn);PrepareForWasmBuildApp;_PrepareForAOTOnHelix - + + + + true