Move platform-neutral part of TimeZone to shared CoreLib partition (#15926)

Prep work for moving the platform specific parts

Author: jkotas

src/mscorlib/System.Private.CoreLib.csproj

@@ -347,10 +347,6 @@
     <Compile Include="$(BclSourcesRoot)\System\RuntimeHandles.cs" />
     <Compile Include="$(BclSourcesRoot)\System\SharedStatics.cs" />
     <Compile Include="$(BclSourcesRoot)\System\StubHelpers.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\TimeZoneInfo.AdjustmentRule.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\TimeZoneInfo.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\TimeZoneInfo.StringSerializer.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\TimeZoneInfo.TransitionTime.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Type.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\TypeNameParser.cs" />
     <Compile Include="$(BclSourcesRoot)\System\TypedReference.cs" />

src/mscorlib/shared/System.Private.CoreLib.Shared.projitems

@@ -551,6 +551,10 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\ThreadStaticAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\TimeoutException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\TimeZone.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\TimeZoneInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\TimeZoneInfo.AdjustmentRule.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\TimeZoneInfo.StringSerializer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\TimeZoneInfo.TransitionTime.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\TimeZoneNotFoundException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Tuple.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\TupleExtensions.cs" />

src/mscorlib/src/System/TimeZoneInfo.AdjustmentRule.cs renamed to src/mscorlib/shared/System/TimeZoneInfo.AdjustmentRule.cs

@@ -107,34 +107,6 @@ public static byte[] ReadAllBytes(String path)
             return bytes;
         }
 
-#if PLATFORM_UNIX
-        public static String[] ReadAllLines(String path)
-        {
-            if (path == null)
-                throw new ArgumentNullException(nameof(path));
-            if (path.Length == 0)
-                throw new ArgumentException(SR.Argument_EmptyPath);
-
-            return InternalReadAllLines(path, Encoding.UTF8);
-        }
-
-        private static String[] InternalReadAllLines(String path, Encoding encoding)
-        {
-            Debug.Assert(path != null);
-            Debug.Assert(encoding != null);
-            Debug.Assert(path.Length != 0);
-
-            String line;
-            List<String> lines = new List<String>();
-
-            using (StreamReader sr = new StreamReader(path, encoding))
-                while ((line = sr.ReadLine()) != null)
-                    lines.Add(line);
-
-            return lines.ToArray();
-        }
-#endif // PLATFORM_UNIX
-
         // Returns 0 on success, otherwise a Win32 error code.  Note that
         // classes should use -1 as the uninitialized state for dataInitialized.
         internal static int FillAttributeInfo(String path, ref Win32Native.WIN32_FILE_ATTRIBUTE_DATA data, bool tryagain, bool returnErrorOnNotFound)

src/mscorlib/src/System/TimeZoneInfo.StringSerializer.cs renamed to src/mscorlib/shared/System/TimeZoneInfo.StringSerializer.cs

@@ -241,54 +241,50 @@ private static TimeZoneInfoResult TryGetTimeZoneFromLocalMachine(string id, out
         /// </remarks>
         private static List<string> GetTimeZoneIds(string timeZoneDirectory)
         {
-            string[] zoneTabFileLines = null;
-            try
-            {
-                zoneTabFileLines = File.ReadAllLines(Path.Combine(timeZoneDirectory, ZoneTabFileName));
-            }
-            catch (IOException) { }
-            catch (UnauthorizedAccessException) { }
+            List<string> timeZoneIds = new List<string>();
 
-            if (zoneTabFileLines == null)
-            {
-                return new List<string>();
-            }
-
-            List<string> timeZoneIds = new List<string>(zoneTabFileLines.Length);
-
-            foreach (string zoneTabFileLine in zoneTabFileLines)
+            try
             {
-                if (!string.IsNullOrEmpty(zoneTabFileLine) && zoneTabFileLine[0] != '#')
+                using (StreamReader sr = new StreamReader(Path.Combine(timeZoneDirectory, ZoneTabFileName), Encoding.UTF8))
                 {
-                    // the format of the line is "country-code \t coordinates \t TimeZone Id \t comments"
-
-                    int firstTabIndex = zoneTabFileLine.IndexOf('\t');
-                    if (firstTabIndex != -1)
+                    string zoneTabFileLine;
+                    while ((zoneTabFileLine = sr.ReadLine()) != null)
                     {
-                        int secondTabIndex = zoneTabFileLine.IndexOf('\t', firstTabIndex + 1);
-                        if (secondTabIndex != -1)
+                        if (!string.IsNullOrEmpty(zoneTabFileLine) && zoneTabFileLine[0] != '#')
                         {
-                            string timeZoneId;
-                            int startIndex = secondTabIndex + 1;
-                            int thirdTabIndex = zoneTabFileLine.IndexOf('\t', startIndex);
-                            if (thirdTabIndex != -1)
-                            {
-                                int length = thirdTabIndex - startIndex;
-                                timeZoneId = zoneTabFileLine.Substring(startIndex, length);
-                            }
-                            else
-                            {
-                                timeZoneId = zoneTabFileLine.Substring(startIndex);
-                            }
+                            // the format of the line is "country-code \t coordinates \t TimeZone Id \t comments"
 
-                            if (!string.IsNullOrEmpty(timeZoneId))
+                            int firstTabIndex = zoneTabFileLine.IndexOf('\t');
+                            if (firstTabIndex != -1)
                             {
-                                timeZoneIds.Add(timeZoneId);
+                                int secondTabIndex = zoneTabFileLine.IndexOf('\t', firstTabIndex + 1);
+                                if (secondTabIndex != -1)
+                                {
+                                    string timeZoneId;
+                                    int startIndex = secondTabIndex + 1;
+                                    int thirdTabIndex = zoneTabFileLine.IndexOf('\t', startIndex);
+                                    if (thirdTabIndex != -1)
+                                    {
+                                        int length = thirdTabIndex - startIndex;
+                                        timeZoneId = zoneTabFileLine.Substring(startIndex, length);
+                                    }
+                                    else
+                                    {
+                                        timeZoneId = zoneTabFileLine.Substring(startIndex);
+                                    }
+
+                                    if (!string.IsNullOrEmpty(timeZoneId))
+                                    {
+                                        timeZoneIds.Add(timeZoneId);
+                                    }
+                                }
                             }
                         }
                     }
                 }
             }
+            catch (IOException) { }
+            catch (UnauthorizedAccessException) { }
 
             return timeZoneIds;
         }