Skip to content

Commit

Permalink
Merge in 'release/7.0' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Oct 18, 2022
2 parents bebb595 + 0cee4aa commit d099f07
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public static partial class PlatformDetection
// do it in a way that failures don't cascade.
//

private static bool IsLinux => RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
public static bool IsLinux => RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
public static bool IsOpenSUSE => IsDistroAndVersion("opensuse");
public static bool IsUbuntu => IsDistroAndVersion("ubuntu");
public static bool IsDebian => IsDistroAndVersion("debian");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<TestRuntime>true</TestRuntime>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
</PropertyGroup>
<ItemGroup>
<Compile Include="IcuAppLocal.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9" />

<!--
We define this switch dynamically during the runtime using RemoteExecutor.
The reason is, if we enable ICU app-local here, this test will compile and run
on all supported OSs even the ICU NuGet package not have native bits support such OSs.
Note, it doesn't matter if we have test case conditioned to not run on such OSs, because
the test has to start running first before filtering the test cases and the globalization
code will run and fail fast at that time.
<RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2.0.9" />
-->
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.DotNet.RemoteExecutor;
using System.Diagnostics;
using System.Reflection;
using Xunit;

namespace System.Globalization.Tests
{
public class IcuAppLocalTests
{
private static bool SupportsIcuPackageDownload => RemoteExecutor.IsSupported &&
((PlatformDetection.IsWindows && !PlatformDetection.IsArmProcess) ||
(PlatformDetection.IsLinux && (PlatformDetection.IsX64Process || PlatformDetection.IsArm64Process) &&
!PlatformDetection.IsAlpine && !PlatformDetection.IsLinuxBionic));


[ConditionalFact(nameof(SupportsIcuPackageDownload))]
public void TestIcuAppLocal()
{
// We define this switch dynamically during the runtime using RemoteExecutor.
// The reason is, if we enable ICU app-local here, this test will compile and run
// on all supported OSs even the ICU NuGet package not have native bits support such OSs.
// Note, it doesn't matter if we have test case conditioned to not run on such OSs, because
// the test has to start running first before filtering the test cases and the globalization
// code will run and fail fast at that time.

ProcessStartInfo psi = new ProcessStartInfo();
psi.Environment.Add("DOTNET_SYSTEM_GLOBALIZATION_APPLOCALICU", "68.2.0.9");

RemoteExecutor.Invoke(() =>
{
// Ensure initializing globalization code before checking the ICU version.
CultureInfo ci = CultureInfo.GetCultureInfo("en-US");
Type? interopGlobalization = Type.GetType("Interop+Globalization, System.Private.CoreLib");
Assert.NotNull(interopGlobalization);
MethodInfo? methodInfo = interopGlobalization.GetMethod("GetICUVersion", BindingFlags.NonPublic | BindingFlags.Static);
Assert.NotNull(methodInfo);
// Assert the ICU version 0x44020009 is 68.2.0.9
Assert.Equal(0x44020009, (int)methodInfo.Invoke(null, null));
// Now call globalization API to ensure the binding working without any problem.
Assert.Equal(-1, ci.CompareInfo.Compare("sample\u0000", "Sample\u0000", CompareOptions.IgnoreSymbols));
}, new RemoteInvokeOptions { StartInfo = psi }).Dispose();
}
}
}
1 change: 1 addition & 0 deletions src/native/libs/System.Globalization.Native/pal_icushim.c
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@ void GlobalizationNative_InitICUFunctions(void* icuuc, void* icuin, const char*
ValidateICUDataCanLoad();

InitializeVariableMaxAndTopPointers(symbolVersion);
InitializeUColClonePointers(symbolVersion);
}

#undef PER_FUNCTION_BLOCK
Expand Down

0 comments on commit d099f07

Please sign in to comment.