Changing the unity aot posix profiles to use corefx TZ code

bholmes · bholmes · commit d66bdb26ca8b · 2021-04-08T09:42:46.000-04:00
aot currently uses the Mono implementation and is the only
profile to do so. Unit tests stand not chance to match the
other profiles.
diff --git a/mcs/class/corlib/System/TimeZoneInfo.Unity.cs b/mcs/class/corlib/System/TimeZoneInfo.Unity.cs
@@ -35,6 +35,22 @@ enum TimeZoneNames
 			DaylightNameIdx
 		};
 
+		private static string GetTimeZoneDirectoryMobile()
+		{
+			string tzDirectory = Environment.GetEnvironmentVariable(TimeZoneDirectoryEnvironmentVariable);
+
+			if (tzDirectory == null)
+			{
+				tzDirectory = DefaultTimeZoneDirectory;
+			}
+			else if (!tzDirectory.EndsWith(Path.DirectorySeparatorChar))
+			{
+				tzDirectory += Path.DirectorySeparatorChar;
+			}
+
+			return tzDirectory;
+		}
+
 		static List<AdjustmentRule> CreateAdjustmentRule (int year, out Int64[] data, out string[] names, string standardNameCurrentYear, string daylightNameCurrentYear)
 		{
 			List<AdjustmentRule> rulesForYear = new List<AdjustmentRule> ();
diff --git a/mcs/class/corlib/linux_unityaot_corlib.dll.exclude.sources b/mcs/class/corlib/linux_unityaot_corlib.dll.exclude.sources
@@ -1 +1 @@
-#include unix_build_corlib.dll.exclude.sources
+#include unix_net_4_x_corlib.dll.exclude.sources
diff --git a/mcs/class/corlib/linux_unityaot_corlib.dll.sources b/mcs/class/corlib/linux_unityaot_corlib.dll.sources
@@ -1,2 +1,2 @@
-#include unix_build_corlib.dll.sources
+#include unix_net_4_x_corlib.dll.sources
 System/TimeZoneInfo.Unity.cs
diff --git a/mcs/class/corlib/macos_unityaot_corlib.dll.exclude.sources b/mcs/class/corlib/macos_unityaot_corlib.dll.exclude.sources
@@ -1 +1 @@
-#include unix_build_corlib.dll.exclude.sources
+#include unix_net_4_x_corlib.dll.exclude.sources
diff --git a/mcs/class/corlib/macos_unityaot_corlib.dll.sources b/mcs/class/corlib/macos_unityaot_corlib.dll.sources
@@ -1,2 +1,2 @@
-#include unix_build_corlib.dll.sources
+#include unix_net_4_x_corlib.dll.sources
 System/TimeZoneInfo.Unity.cs
diff --git a/mcs/class/corlib/win32_unityaot_corlib.dll.exclude.sources b/mcs/class/corlib/win32_unityaot_corlib.dll.exclude.sources
@@ -1,3 +1,3 @@
-#include win32_build_corlib.dll.exclude.sources
+#include win32_net_4_x_corlib.dll.exclude.sources
 
 ../../../external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.Win32.cs
diff --git a/mcs/class/corlib/win32_unityaot_corlib.dll.sources b/mcs/class/corlib/win32_unityaot_corlib.dll.sources
@@ -1,5 +1,4 @@
-#include win32_build_corlib.dll.sources
-System/TimeZoneInfo.Unity.cs
+#include win32_net_4_x_corlib.dll.sources
 
 ../../../external/corefx/src/Common/src/Interop/Windows/kernel32/Interop.GetFileInformationByHandleEx.cs
 ../../../external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.WinRT.cs

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-#include unix_build_corlib.dll.exclude.sources`
	`1`	`+#include unix_net_4_x_corlib.dll.exclude.sources`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-#include unix_build_corlib.dll.sources`
	`1`	`+#include unix_net_4_x_corlib.dll.sources`
`2`	`2`	`System/TimeZoneInfo.Unity.cs`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-#include win32_build_corlib.dll.exclude.sources`
	`1`	`+#include win32_net_4_x_corlib.dll.exclude.sources`
`2`	`2`
`3`	`3`	`../../../external/corefx/src/System.IO.FileSystem/src/System/IO/Enumeration/FileSystemEnumerator.Win32.cs`