Skip to content

[browser][icu][libraries] Load full ICU in library tests only when it's necessary #82619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ilonatommy merged 7 commits into from
Mar 1, 2023
Merged

[browser][icu][libraries] Load full ICU in library tests only when it's necessary #82619

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ee97ec8
Moved the flag to libs that really need it.
ilonatommy Feb 24, 2023
8776903
Remaining libs.
ilonatommy Feb 27, 2023
d1f019b
Property should not be set in ITemsGroup.
ilonatommy Feb 27, 2023
9ffc90c
Previos approach did not work, revert and try new one.
ilonatommy Feb 27, 2023
5059298
Only placing it here does not trim the assigned value.
ilonatommy Feb 27, 2023
942ade1
Merge branch 'main' into issue-82592
ilonatommy Feb 28, 2023
2933932
Add comment to the workaround.
ilonatommy Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remaining libs.
  • Loading branch information
@ilonatommy
ilonatommy committed Feb 27, 2023
commit 8776903940df66b9dd0f7c2866a1d1dc0c8df024
3 changes: 3 additions & 0 deletions src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<UnicodeUcdVersion>15.0</UnicodeUcdVersion>

<!-- some tests require full ICU data, force it -->
<WasmIncludeFullIcuData>true</WasmIncludeFullIcuData>
</PropertyGroup>
<ItemGroup>
<RdXmlFile Include="default.rd.xml" />
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser</TargetFrameworks>

<!-- some tests require full ICU data, force it -->
<WasmIncludeFullIcuData>true</WasmIncludeFullIcuData>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
<PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Runtime/tests/TrimmingTests/System.Runtime.TrimmingTests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
<TestConsoleAppSourceFiles Include="NullabilityInfoContextSupportTrue.cs">
<EnabledFeatureSwitches>System.Reflection.NullabilityInfoContext.IsSupported</EnabledFeatureSwitches>
</TestConsoleAppSourceFiles>

<!-- InvariantGlobalizationFalse requires full ICU data, force it -->
<WasmIncludeFullIcuData>true</WasmIncludeFullIcuData>
</ItemGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
Expand Down
2 changes: 2 additions & 0 deletions ...Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
<IsHighAotMemoryUsageTest>true</IsHighAotMemoryUsageTest> <!-- to avoid OOMs with source generation in wasm: https://github.com/dotnet/runtime/pull/60701 -->

<!-- some tests require full ICU data, force it -->
<WasmIncludeFullIcuData>true</WasmIncludeFullIcuData>
</PropertyGroup>
<ItemGroup>
<Compile Include="AttRegexTests.cs" />
Expand Down