diff options
| author | Tarek Mahmoud Sayed <tarekms@microsoft.com> | 2017-03-20 16:19:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 16:19:48 -0700 |
| commit | 8fb9a5e2f77dbd88a6d6a564ff91f5f1d87e4b65 (patch) | |
| tree | e51644a8255b6f1eb918882982019081d283d78c | |
| parent | 900113351c78d676d0d853df24bdc51a1f1171df (diff) | |
| download | coreclr-8fb9a5e2f77dbd88a6d6a564ff91f5f1d87e4b65.tar.gz coreclr-8fb9a5e2f77dbd88a6d6a564ff91f5f1d87e4b65.tar.bz2 coreclr-8fb9a5e2f77dbd88a6d6a564ff91f5f1d87e4b65.zip | |
Fix MAC build (#10328)
This is temporary fix to unblock the CI and coreclr building for MAC. this change should be reverted after having the proper fix for how we load ICU on MAC
| -rw-r--r-- | src/mscorlib/System.Private.CoreLib.csproj | 5 | ||||
| -rw-r--r-- | src/mscorlib/src/System/Globalization/GlobalizationMode.OSX.cs | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj index 612b1848e5..f79391d4c3 100644 --- a/src/mscorlib/System.Private.CoreLib.csproj +++ b/src/mscorlib/System.Private.CoreLib.csproj @@ -570,7 +570,8 @@ <Compile Include="$(BclSourcesRoot)\System\Globalization\DateTimeStyles.cs" /> <Compile Include="$(BclSourcesRoot)\System\Globalization\DigitShapes.cs" /> <Compile Include="$(BclSourcesRoot)\System\Globalization\EastAsianLunisolarCalendar.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.cs" /> + <Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.cs" Condition="'$(BuildOS)' != 'OSX'"/> + <Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.OSX.cs" Condition="'$(BuildOS)' == 'OSX'"/> <Compile Include="$(BclSourcesRoot)\System\Globalization\GregorianCalendar.cs" /> <Compile Include="$(BclSourcesRoot)\System\Globalization\GregorianCalendarHelper.cs" /> <Compile Include="$(BclSourcesRoot)\System\Globalization\GregorianCalendarTypes.cs" /> @@ -612,7 +613,7 @@ <Compile Include="$(BclSourcesRoot)\System\Globalization\CompareInfo.Unix.cs" /> <Compile Include="$(BclSourcesRoot)\System\Globalization\CultureData.Unix.cs" /> <Compile Include="$(BclSourcesRoot)\System\Globalization\CultureInfo.Unix.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.Unix.cs" /> + <Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.Unix.cs" Condition="'$(BuildOS)' != 'OSX'"/> <Compile Include="$(BclSourcesRoot)\System\Globalization\TextInfo.Unix.cs" /> </ItemGroup> <ItemGroup Condition="'$(TargetsUnix)' != 'true'"> diff --git a/src/mscorlib/src/System/Globalization/GlobalizationMode.OSX.cs b/src/mscorlib/src/System/Globalization/GlobalizationMode.OSX.cs new file mode 100644 index 0000000000..077ce18b20 --- /dev/null +++ b/src/mscorlib/src/System/Globalization/GlobalizationMode.OSX.cs @@ -0,0 +1,12 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +namespace System.Globalization +{ + internal sealed partial class GlobalizationMode + { + // private const string c_InvariantModeConfigSwitch = "System.Globalization.Invariant"; + internal static bool Invariant { get; } = false; + } +} |