Move identical Globalization files to shared partition
authorJan Kotas <jkotas@microsoft.com>
Sat, 1 Apr 2017 19:25:28 +0000 (12:25 -0700)
committerJan Kotas <jkotas@microsoft.com>
Sun, 2 Apr 2017 05:00:46 +0000 (22:00 -0700)
Commit migrated from https://github.com/dotnet/coreclr/commit/b07ed5efbbc94a0a3dad203e0a88d25c746a6c93

38 files changed:
src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
src/coreclr/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems
src/coreclr/src/mscorlib/shared/System/Globalization/CalendarAlgorithmType.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/CalendarAlgorithmType.cs with 98% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/CalendarWeekRule.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/CalendarWeekRule.cs with 97% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/CalendricalCalculationsHelper.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/CalendricalCalculationsHelper.cs with 100% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/ChineseLunisolarCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/ChineseLunisolarCalendar.cs with 99% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/CultureNotFoundException.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/CultureNotFoundException.cs with 97% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/CultureTypes.cs [new file with mode: 0644]
src/coreclr/src/mscorlib/shared/System/Globalization/DateTimeFormat.cs
src/coreclr/src/mscorlib/shared/System/Globalization/DateTimeFormatInfoScanner.cs
src/coreclr/src/mscorlib/shared/System/Globalization/DateTimeParse.cs
src/coreclr/src/mscorlib/shared/System/Globalization/DateTimeStyles.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/DateTimeStyles.cs with 98% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/DaylightTime.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/DaylightTime.cs with 98% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/DigitShapes.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/DigitShapes.cs with 83% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/EastAsianLunisolarCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/EastAsianLunisolarCalendar.cs with 99% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/GregorianCalendarTypes.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/GregorianCalendarTypes.cs with 98% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/HebrewCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/HebrewCalendar.cs with 100% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/HebrewNumber.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/HebrewNumber.cs with 100% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/HijriCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/HijriCalendar.cs with 99% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/InternalGlobalizationHelper.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/InternalGlobalizationHelper.cs with 97% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/JapaneseCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/JapaneseCalendar.cs with 99% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/JapaneseLunisolarCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/JapaneseLunisolarCalendar.cs with 98% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/JulianCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/JulianCalendar.cs with 99% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/KoreanCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/KoreanCalendar.cs with 99% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/KoreanLunisolarCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/KoreanLunisolarCalendar.cs with 99% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/LocaleData.Unix.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/LocaleData.Unix.cs with 100% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/NumberStyles.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/NumberStyles.cs with 98% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/PersianCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/PersianCalendar.cs with 99% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/SortVersion.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/SortVersion.cs with 97% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/TaiwanCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/TaiwanCalendar.cs with 100% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/TaiwanLunisolarCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/TaiwanLunisolarCalendar.cs with 98% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/ThaiBuddhistCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/ThaiBuddhistCalendar.cs with 100% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/TimeSpanStyles.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/TimeSpanStyles.cs with 100% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/UmAlQuraCalendar.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/UmAlQuraCalendar.cs with 99% similarity]
src/coreclr/src/mscorlib/shared/System/Globalization/UnicodeCategory.cs [moved from src/coreclr/src/mscorlib/src/System/Globalization/UnicodeCategory.cs with 95% similarity]
src/coreclr/src/mscorlib/src/System/Globalization/Calendar.cs
src/coreclr/src/mscorlib/src/System/Globalization/CultureTypes.cs [deleted file]
src/coreclr/src/mscorlib/src/System/Globalization/GregorianCalendarHelper.cs

index 39695c5..a5cce4f 100644 (file)
   <ItemGroup>
     <Compile Include="$(BclSourcesRoot)\System\Globalization\BidiCategory.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\Calendar.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\CalendarAlgorithmType.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\CalendarData.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\CalendarWeekRule.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\CalendricalCalculationsHelper.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\CharUnicodeInfo.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\CharUnicodeInfoData.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\ChineseLunisolarCalendar.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\CompareInfo.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\CompareInfo.Invariant.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\CultureData.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\CultureInfo.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\CultureNotFoundException.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\CultureTypes.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\DaylightTime.cs" />
-    <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\GregorianCalendar.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\GregorianCalendarHelper.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\GregorianCalendarTypes.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\HebrewCalendar.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\HebrewNumber.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\HijriCalendar.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\IdnMapping.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\InternalGlobalizationHelper.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\JapaneseCalendar.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\JapaneseLunisolarCalendar.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\JulianCalendar.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\KoreanCalendar.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\KoreanLunisolarCalendar.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\NumberFormatInfo.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\NumberStyles.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\PersianCalendar.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\RegionInfo.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\SortKey.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\SortVersion.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\StringInfo.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\TaiwanCalendar.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\TaiwanLunisolarCalendar.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\TextElementEnumerator.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\TextInfo.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\ThaiBuddhistCalendar.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\TimeSpanFormat.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\TimeSpanParse.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\UmAlQuraCalendar.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\UnicodeCategory.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\TimeSpanStyles.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(FeatureCoreFxGlobalization)' != 'true'">
     <Compile Include="$(BclSourcesRoot)\System\Globalization\EncodingDataItem.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\HijriCalendar.Unix.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\IdnMapping.Unix.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\JapaneseCalendar.Unix.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Globalization\LocaleData.Unix.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(BclSourcesRoot)\System\Threading\AbandonedMutexException.cs" />
index 3acace8..7c6d039 100644 (file)
     <Compile Include="$(MSBuildThisFileDirectory)System\FlagsAttribute.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\FormatException.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\FormattableString.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarAlgorithmType.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarWeekRule.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendricalCalculationsHelper.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ChineseLunisolarCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureNotFoundException.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureTypes.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\DateTimeFormat.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\DateTimeFormatInfo.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\DateTimeFormatInfoScanner.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\DateTimeParse.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\DateTimeStyles.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\DaylightTime.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\DigitShapes.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\EastAsianLunisolarCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\GregorianCalendarTypes.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HebrewCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HebrewNumber.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HijriCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\InternalGlobalizationHelper.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\JapaneseCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\JapaneseLunisolarCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\JulianCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\KoreanCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\KoreanLunisolarCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\NumberStyles.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\PersianCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\SortVersion.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TaiwanCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TaiwanLunisolarCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanStyles.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\UmAlQuraCalendar.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\UnicodeCategory.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\IAsyncResult.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\IComparable.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\IConvertible.cs"/>
   </ItemGroup>
   <ItemGroup Condition="$(TargetsUnix)">
     <Compile Include="$(MSBuildThisFileDirectory)Microsoft\Win32\SafeHandles\SafeFileHandle.Unix.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\LocaleData.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStream.Unix.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\IO\Path.Unix.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)System\IO\PathInternal.Unix.cs"/>
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-
 namespace System.Globalization
 {
     public enum CalendarAlgorithmType
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-
 namespace System.Globalization
 {
     [Serializable]
@@ -2,16 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Diagnostics.Contracts;
 
 namespace System.Globalization
 {
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Notes about ChineseLunisolarCalendar
-    //
-    ////////////////////////////////////////////////////////////////////////////
     /*
     **  Calendar support range:
     **      Calendar               Minimum             Maximum
@@ -2,14 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Runtime.Serialization;
-using System.Threading;
 
 namespace System.Globalization
 {
     [Serializable]
-    public class CultureNotFoundException : ArgumentException, ISerializable
+    public class CultureNotFoundException : ArgumentException
     {
         private string _invalidCultureName; // unrecognized culture name
         private int? _invalidCultureId;     // unrecognized culture Lcid
diff --git a/src/coreclr/src/mscorlib/shared/System/Globalization/CultureTypes.cs b/src/coreclr/src/mscorlib/shared/System/Globalization/CultureTypes.cs
new file mode 100644 (file)
index 0000000..f52ac82
--- /dev/null
@@ -0,0 +1,27 @@
+// 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.
+
+// The enumeration constants used in CultureInfo.GetCultures().
+// On Linux platforms, the only enum values used there is NeutralCultures and SpecificCultures 
+// the rest are obsolete or not valid on Linux
+
+namespace System.Globalization
+{
+    [Flags]
+    public enum CultureTypes
+    {
+        NeutralCultures = 0x0001, // Neutral cultures are cultures like "en", "de", "zh", etc, for enumeration this includes ALL neutrals regardless of other flags
+        SpecificCultures = 0x0002, // Non-netural cultuers.  Examples are "en-us", "zh-tw", etc., for enumeration this includes ALL specifics regardless of other flags
+        InstalledWin32Cultures = 0x0004, // Win32 installed cultures in the system and exists in the framework too., this is effectively all cultures
+
+        AllCultures = NeutralCultures | SpecificCultures | InstalledWin32Cultures,
+
+        UserCustomCulture = 0x0008, // User defined custom culture
+        ReplacementCultures = 0x0010, // User defined replacement custom culture.
+        [Obsolete("This value has been deprecated.  Please use other values in CultureTypes.")]
+        WindowsOnlyCultures = 0x0020, // this will always return empty list.
+        [Obsolete("This value has been deprecated.  Please use other values in CultureTypes.")]
+        FrameworkCultures = 0x0040, // will return only the v2 cultures marked as Framework culture.
+    }
+}
index d3bf255..840409f 100644 (file)
@@ -2,16 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Text;
-using System.Threading;
-using System.Globalization;
 using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-using System.Security;
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
+using System.Globalization;
+using System.Text;
 
 namespace System
 {
index ddf7d7e..15af1b7 100644 (file)
@@ -19,9 +19,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-using System;
-using System.Globalization;
-using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 
index 857ffc6..910fbf2 100644 (file)
@@ -2,33 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-////////////////////////////////////////////////////////////////////////////
-//
-//
-//  Purpose:  This class is called by DateTime to parse a date/time string.
-//
-////////////////////////////////////////////////////////////////////////////
+using System.Diagnostics;
+using System.Diagnostics.Contracts;
+using System.Globalization;
+using System.Text;
 
 namespace System
 {
-    using System;
-    using System.Text;
-    using System.Globalization;
-    using System.Threading;
-    using System.Collections;
-    using System.Runtime.CompilerServices;
-    using System.Runtime.InteropServices;
-    using System.Runtime.Versioning;
-    using System.Security;
-    using System.Diagnostics;
-    using System.Diagnostics.Contracts;
-
-    ////////////////////////////////////////////////////////////////////////
-
-    //This class contains only static members
-
-    internal static
-    class DateTimeParse
+    internal static class DateTimeParse
     {
         internal const Int32 MaxDateTimeNumberDigits = 8;
 
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-
 namespace System.Globalization
 {
     // This class represents a starting/ending time for a period of daylight saving time.
@@ -2,13 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-//
-// The enumeration constants used in NumberFormatInfo.DigitSubstitution.
-//
-
 namespace System.Globalization
 {
-    [Serializable]
     public enum DigitShapes : int
     {
         Context         = 0x0000,   // The shape depends on the previous text in the same output.
@@ -2,17 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Diagnostics.Contracts;
 
 namespace System.Globalization
 {
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Notes about EastAsianLunisolarCalendar
-    //
-    ////////////////////////////////////////////////////////////////////////////
-
     [Serializable]
     public abstract class EastAsianLunisolarCalendar : Calendar
     {
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-
 namespace System.Globalization
 {
     // Note: The values of the members of this enum must match the coresponding values
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Runtime.Versioning;
 using System.Diagnostics.Contracts;
 
 namespace System.Globalization
@@ -2,11 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-
 namespace System.Globalization
 {
-    internal class InternalGloablizationHelper
+    internal class InternalGlobalizationHelper
     {
         // Copied from the TimeSpan to be used inside the globalization code and avoid internal dependancy on TimeSpan class
         internal static long TimeToTicks(int hour, int minute, int second)
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 
@@ -2,16 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Diagnostics.Contracts;
 
 namespace System.Globalization
 {
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Notes about JapaneseLunisolarCalendar
-    //
-    ////////////////////////////////////////////////////////////////////////////
     /*
     **  Calendar support range:
     **      Calendar               Minimum             Maximum
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Diagnostics.Contracts;
 
 namespace System.Globalization
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 
@@ -2,16 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Diagnostics.Contracts;
 
 namespace System.Globalization
 {
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Notes about KoreanLunisolarCalendar
-    //
-    ////////////////////////////////////////////////////////////////////////////
     /*
     **  Calendar support range:
     **      Calendar               Minimum             Maximum
 **
 ===========================================================*/
 
-using System;
-
 namespace System.Globalization
 {
-    [Serializable]
     [Flags]
     public enum NumberStyles
     {
@@ -7,11 +7,6 @@ using System.Diagnostics.Contracts;
 
 namespace System.Globalization
 {
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Notes about PersianCalendar
-    //
-    ////////////////////////////////////////////////////////////////////////////
     // Modern Persian calendar is a solar observation based calendar. Each new year begins on the day when the vernal equinox occurs before noon.
     // The epoch is the date of the vernal equinox prior to the epoch of the Islamic calendar (March 19, 622 Julian or March 22, 622 Gregorian)
 
@@ -2,9 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Diagnostics.Contracts;
-
 namespace System.Globalization
 {
     [Serializable]
@@ -7,17 +7,12 @@ using System.Diagnostics.Contracts;
 
 namespace System.Globalization
 {
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Notes about TaiwanLunisolarCalendar
-    //
-    ////////////////////////////////////////////////////////////////////////////
     /*
     **  Calendar support range:
-    **      Calendar               Minimum             Maximum
-    **      ==========     ==========  ==========
-    **      Gregorian              1912/02/18          2051/02/10
-    **      TaiwanLunisolar     1912/01/01          2050/13/29
+    **      Calendar            Minimum     Maximum
+    **      ==========          ==========  ==========
+    **      Gregorian           1912/02/18  2051/02/10
+    **      TaiwanLunisolar     1912/01/01  2050/13/29
     */
 
     [Serializable]
@@ -7,11 +7,6 @@ using System.Diagnostics.Contracts;
 
 namespace System.Globalization
 {
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Notes about UmAlQuraCalendar
-    //
-    ////////////////////////////////////////////////////////////////////////////
     /*
     **  Calendar support range:
     **      Calendar    Minimum     Maximum
@@ -4,67 +4,37 @@
 
 namespace System.Globalization
 {
-    [Serializable]
     public enum UnicodeCategory
     {
         UppercaseLetter = 0,
-
         LowercaseLetter = 1,
-
         TitlecaseLetter = 2,
-
         ModifierLetter = 3,
-
         OtherLetter = 4,
-
         NonSpacingMark = 5,
-
         SpacingCombiningMark = 6,
-
         EnclosingMark = 7,
-
         DecimalDigitNumber = 8,
-
         LetterNumber = 9,
-
         OtherNumber = 10,
-
         SpaceSeparator = 11,
-
         LineSeparator = 12,
-
         ParagraphSeparator = 13,
-
         Control = 14,
-
         Format = 15,
-
         Surrogate = 16,
-
         PrivateUse = 17,
-
         ConnectorPunctuation = 18,
-
         DashPunctuation = 19,
-
         OpenPunctuation = 20,
-
         ClosePunctuation = 21,
-
         InitialQuotePunctuation = 22,
-
         FinalQuotePunctuation = 23,
-
         OtherPunctuation = 24,
-
         MathSymbol = 25,
-
         CurrencySymbol = 26,
-
         ModifierSymbol = 27,
-
         OtherSymbol = 28,
-
         OtherNotAssigned = 29,
     }
 }
index 422b72a..c23e108 100644 (file)
@@ -839,7 +839,7 @@ namespace System.Globalization
                                     CultureInfo.InvariantCulture,
                                     SR.Format(SR.ArgumentOutOfRange_Range, 0, MillisPerSecond - 1)));
                 }
-                return InternalGloablizationHelper.TimeToTicks(hour, minute, second) + millisecond * TicksPerMillisecond;
+                return InternalGlobalizationHelper.TimeToTicks(hour, minute, second) + millisecond * TicksPerMillisecond;
             }
             throw new ArgumentOutOfRangeException(null, SR.ArgumentOutOfRange_BadHourMinuteSecond);
         }
diff --git a/src/coreclr/src/mscorlib/src/System/Globalization/CultureTypes.cs b/src/coreclr/src/mscorlib/src/System/Globalization/CultureTypes.cs
deleted file mode 100644 (file)
index 10d9246..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-// 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.
-
-// The enumeration constants used in CultureInfo.GetCultures().
-// On Linux platforms, the only enum values used there is NeutralCultures and SpecificCultures 
-// the rest are obsolete or not valid on Linux
-
-namespace System.Globalization
-{
-    [Serializable]
-    [Flags]
-    public enum CultureTypes
-    {
-        NeutralCultures = 0x0001,             // Neutral cultures are cultures like "en", "de", "zh", etc, for enumeration this includes ALL neutrals regardless of other flags
-        SpecificCultures = 0x0002,             // Non-netural cultuers.  Examples are "en-us", "zh-tw", etc., for enumeration this includes ALL specifics regardless of other flags
-        InstalledWin32Cultures = 0x0004,             // Win32 installed cultures in the system and exists in the framework too., this is effectively all cultures
-
-        AllCultures = NeutralCultures | SpecificCultures | InstalledWin32Cultures,
-
-        UserCustomCulture = 0x0008,               // User defined custom culture
-        ReplacementCultures = 0x0010,               // User defined replacement custom culture.
-        [Obsolete("This value has been deprecated.  Please use other values in CultureTypes.")]
-        WindowsOnlyCultures = 0x0020,               // this will always return empty list.
-        [Obsolete("This value has been deprecated.  Please use other values in CultureTypes.")]
-        FrameworkCultures = 0x0040,               // will return only the v2 cultures marked as Framework culture.
-    }
-}
index ee8ba13..bdc35f0 100644 (file)
@@ -315,7 +315,7 @@ namespace System.Globalization
                                     0,
                                     MillisPerSecond - 1));
                 }
-                return (InternalGloablizationHelper.TimeToTicks(hour, minute, second) + millisecond * TicksPerMillisecond); ;
+                return (InternalGlobalizationHelper.TimeToTicks(hour, minute, second) + millisecond * TicksPerMillisecond); ;
             }
             throw new ArgumentOutOfRangeException(null, SR.ArgumentOutOfRange_BadHourMinuteSecond);
         }