Simplify icudat file lookup by specifying ICU_DAT_FILE_PATH as a RuntimeHostConfigurationOption #18914

ivanpovazan · 2023-09-01T17:24:10Z

…imeHostConfigurationOption

ivanpovazan · 2023-09-02T10:51:21Z

There seems to be an issue with generator tests in Windows integration jobs, where it fails with:

"D:\Program Files\PowerShell\7\pwsh.exe" -NoLogo -NoProfile -NonInteractive -ExecutionPolicy Unrestricted -Command ". 'D:\AzDO\_work\_temp\96a6f4b1-a5c6-4e9b-b5ff-6d9e90781870.ps1'"
D:\AzDO\_work\1\s/xamarin-macios/tools/devops/automation/scripts/run-generator-tests-on-windows.ps1 : The term 'D:\AzDO\_work\1\s/xamarin-macios/tools/devops/automation/scripts/run-generator-tests-on-windows.ps1' is not recognized as a name of a cmdlet, function, script file, or executable program.

although it doesn't seem to be related to this change.

akoeplinger · 2023-09-06T12:01:45Z

tools/dotnet-linker/Steps/GenerateMainStep.cs

@@ -31,16 +31,13 @@ protected override void TryEndProcess ()

 				contents.AppendLine ("#include <stdlib.h>");
 				contents.AppendLine ();
-				contents.AppendLine ("extern \"C\" const char *xamarin_icu_dat_file_name;");
-				contents.AppendLine ();
 				contents.AppendLine ("static void xamarin_initialize_dotnet ()");
 				contents.AppendLine ("{");
 				if (Configuration.InvariantGlobalization) {
 					contents.AppendLine ("\tsetenv (\"DOTNET_SYSTEM_GLOBALIZATION_INVARIANT\", \"1\", 1);");


for a future PR: this could be a runtime config option too: System.Globalization.Invariant (https://learn.microsoft.com/en-us/dotnet/core/runtime-config/globalization)

or actually we might not even need to do anything if the InvariantGlobalization msbuild property is set it should get turned into the runtime config automatically?

Yes, this is from the early .NET 5 days, so the runtime config option probably didn't work then.

The DOTNET_SYSTEM_GLOBALIZATION_HYBRID environment variable is pretty new though:

3f6d43c

so maybe @mkhamoyan knows if these environment variables are really needed or not?

I added DOTNET_SYSTEM_GLOBALIZATION_HYBRID following to the logic done for Invariant mode. Not sure if these env variables are really needed or not.

The runtime seems to first look into the runtime config switches and then as a fallback into env variables:
https://github.com/dotnet/runtime/blob/1487d46e4ff7731b52af92b1228373a2a66ed6bf/src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.cs#L15-L17
which calls into: https://github.com/dotnet/runtime/blob/1487d46e4ff7731b52af92b1228373a2a66ed6bf/src/libraries/System.Private.CoreLib/src/System/AppContextConfigHelper.cs#L13-L22

Do you want me to remove setting up env variables explicitly in xamarin_initialize_dotnet?

Do you want me to remove setting up env variables explicitly in xamarin_initialize_dotnet?

we can do that in a separate PR after verifying that the switches do end up in runtimeconfig.bin etc. but yeah, it'd be nice to reduce custom logic

I checked this by building MySingleView and inspecting MySingleView.runtimeconfig.json:

"configProperties": { "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.AggressiveAttributeTrimming": false, "System.ComponentModel.TypeConverter.EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization": false, "System.Diagnostics.Debugger.IsSupported": true, "System.Diagnostics.Tracing.EventSource.IsSupported": false, "System.Globalization.Invariant": false, "System.Globalization.Hybrid": false, "System.Net.Http.EnableActivityPropagation": false, "System.Net.Http.UseNativeHttpHandler": true, "System.Reflection.NullabilityInfoContext.IsSupported": false, "System.Resources.ResourceManager.AllowCustomResourceTypes": false, "System.Resources.UseSystemResourceKeys": false, "System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported": false, "System.Runtime.InteropServices.BuiltInComInterop.IsSupported": false, "System.Runtime.InteropServices.EnableConsumingManagedCodeFromNativeHosting": false, "System.Runtime.InteropServices.EnableCppCLIHostActivation": false, "System.Runtime.InteropServices.Marshalling.EnableGeneratedComInterfaceComImportInterop": false, "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false, "System.StartupHookProvider.IsSupported": false, "System.Text.Encoding.EnableUnsafeUTF7Encoding": false, "System.Text.Json.JsonSerializer.IsReflectionEnabledByDefault": true, "System.Threading.Thread.EnableAutoreleasePool": true, "System.Linq.Expressions.CanEmitObjectArrayDelegate": false, "ICU_DAT_FILE_PATH": "icudt.dat" }

I have included the clean up in this PR, will see what the tests say

msbuild/Xamarin.Shared/Xamarin.Shared.targets

vs-mobiletools-engineering-service2 · 2023-09-06T18:24:49Z

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)

~~iOS~~ (no change detected)
~~tvOS~~ (no change detected)
~~watchOS~~ (no change detected)
~~macOS~~ (no change detected)

NET (empty diffs)

~~iOS~~: (empty diff detected)
~~tvOS~~: (empty diff detected)
~~MacCatalyst~~: (empty diff detected)
~~macOS~~: (empty diff detected)

✅ API diff vs stable

Legacy Xamarin (No breaking changes)

iOS: vsdrops gist (No breaking changes)
tvOS: vsdrops gist (No breaking changes)
watchOS: vsdrops gist (No breaking changes)
macOS: vsdrops gist (No breaking changes)

.NET (No breaking changes)

iOS: vsdrops gist (No breaking changes)
tvOS: vsdrops gist (No breaking changes)
MacCatalyst: vsdrops gist (No breaking changes)
macOS: vsdrops gist (No breaking changes)
Microsoft.iOS vs Microsoft.MacCatalyst: vsdrops gist

Legacy Xamarin (stable) vs .NET

iOS: vsdrops gist
tvOS: vsdrops gist
macOS: vsdrops gist

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 1e06cef1e74bc16815aeceb2ee51d89ee3dc3a3f [PR build]

vs-mobiletools-engineering-service2 · 2023-09-06T19:28:27Z

🔥 [PR Build] Build failed 🔥

Build failed for the job 'Build macOS tests'

Pipeline on Agent
Hash: 1e06cef1e74bc16815aeceb2ee51d89ee3dc3a3f [PR build]

vs-mobiletools-engineering-service2 · 2023-09-06T19:39:39Z

💻 [CI Build] Windows Integration Tests passed 💻

✅ All Windows Integration Tests passed.

Pipeline on Agent
Hash: 1e06cef1e74bc16815aeceb2ee51d89ee3dc3a3f [PR build]

vs-mobiletools-engineering-service2 · 2023-09-06T20:01:59Z

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2023-09-06T21:22:17Z

💻 [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) passed 💻

✅ All tests on macOS M1 - Mac Big Sur (11.5) passed.

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2023-09-06T21:25:30Z

💻 [PR Build] Tests on macOS M1 - Mac Ventura (13.0) passed 💻

✅ All tests on macOS M1 - Mac Ventura (13.0) passed.

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2023-09-07T06:48:16Z

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: simulator tests.

🎉 All 233 tests passed 🎉

Tests counts

✅ bcl: All 69 tests passed. Html Report (VSDrops) Download
✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 7 tests passed. Html Report (VSDrops) Download
✅ install_source: All 1 tests passed. Html Report (VSDrops) Download
✅ introspection: All 8 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ linker: All 65 tests passed. Html Report (VSDrops) Download
✅ mac_binding_project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 6 tests passed. Html Report (VSDrops) Download
✅ monotouch: All 39 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 1e06cef1e74bc16815aeceb2ee51d89ee3dc3a3f [PR build]

SamMonoRT · 2023-09-07T15:43:54Z

/cc @directhex fyi

Simplify icudat file lookup by specifying ICU_DAT_FILE_PATH as a Runt…

ed26faa

…imeHostConfigurationOption

ivanpovazan requested review from rolfbjarne, emaf and mauroa as code owners September 1, 2023 17:24

ivanpovazan requested a review from akoeplinger September 1, 2023 17:24

This comment has been minimized.

Sign in to view

Merge branch 'net8.0' into new-find-icu-data

b3c8690

This comment has been minimized.

Sign in to view

rolfbjarne approved these changes Sep 6, 2023

View reviewed changes

akoeplinger approved these changes Sep 6, 2023

View reviewed changes

Clean up globalization custom logic

1e06cef

emaf reviewed Sep 6, 2023

View reviewed changes

msbuild/Xamarin.Shared/Xamarin.Shared.targets Show resolved Hide resolved

This comment has been minimized.

Sign in to view

mauroa approved these changes Sep 8, 2023

View reviewed changes

emaf approved these changes Sep 8, 2023

View reviewed changes

ivanpovazan merged commit bf77022 into xamarin:net8.0 Sep 8, 2023

ivanpovazan deleted the new-find-icu-data branch September 13, 2023 08:24

Simplify icudat file lookup by specifying ICU_DAT_FILE_PATH as a RuntimeHostConfigurationOption #18914

Simplify icudat file lookup by specifying ICU_DAT_FILE_PATH as a RuntimeHostConfigurationOption #18914

Conversation

ivanpovazan commented Sep 1, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ivanpovazan commented Sep 2, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

akoeplinger Sep 6, 2023

Choose a reason for hiding this comment

rolfbjarne Sep 6, 2023

Choose a reason for hiding this comment

rolfbjarne Sep 6, 2023

Choose a reason for hiding this comment

mkhamoyan Sep 6, 2023

Choose a reason for hiding this comment

ivanpovazan Sep 6, 2023

Choose a reason for hiding this comment

akoeplinger Sep 6, 2023 • edited Loading

Choose a reason for hiding this comment

ivanpovazan Sep 6, 2023

Choose a reason for hiding this comment

ivanpovazan Sep 6, 2023

Choose a reason for hiding this comment

vs-mobiletools-engineering-service2 commented Sep 6, 2023

✅ API diff for current PR / commit

✅ API diff vs stable

ℹ️ Generator diff

vs-mobiletools-engineering-service2 commented Sep 6, 2023

🔥 [PR Build] Build failed 🔥

vs-mobiletools-engineering-service2 commented Sep 6, 2023

💻 [CI Build] Windows Integration Tests passed 💻

vs-mobiletools-engineering-service2 commented Sep 6, 2023

📚 [PR Build] Artifacts 📚

Packages generated

vs-mobiletools-engineering-service2 commented Sep 6, 2023

💻 [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) passed 💻

vs-mobiletools-engineering-service2 commented Sep 6, 2023

💻 [PR Build] Tests on macOS M1 - Mac Ventura (13.0) passed 💻

This comment has been minimized.

vs-mobiletools-engineering-service2 commented Sep 7, 2023

🚀 [CI Build] Test results 🚀

Test results

Tests counts

SamMonoRT commented Sep 7, 2023

akoeplinger Sep 6, 2023 •

edited

Loading