You've already forked linux-packaging-mono
Imported Upstream version 6.12.0.98
Former-commit-id: 066e1c5ebb0cc420bd293e60a01325420779fdd1
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
15e620f34f
commit
7d4706c3d7
@@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.12.0.93";
|
||||
public const string MonoVersion = "6.12.0.98";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@@ -58,10 +58,16 @@ namespace System {
|
||||
* https://android.googlesource.com/platform/libcore/+/master/luni/src/main/java/libcore/util/ZoneInfoDB.java
|
||||
*
|
||||
* This is needed in order to read Android v4.3 tzdata files.
|
||||
*
|
||||
* Android 10+ moved the up-to-date tzdata location to a module updatable via the Google Play Store and the
|
||||
* database location changed (https://source.android.com/devices/architecture/modular-system/runtime#time-zone-data-interactions)
|
||||
* The older locations still exist (at least the `/system/usr/share/zoneinfo` one) but they won't be updated.
|
||||
*/
|
||||
sealed class AndroidTzData : IAndroidTimeZoneDB {
|
||||
|
||||
internal static readonly string[] Paths = new string[]{
|
||||
GetApexTimeDataRoot () + "/etc/tz/tzdata", // Android 10+, TimeData module where the updates land
|
||||
GetApexRuntimeRoot () + "/etc/tz/tzdata", // Android 10+, Fallback location if the above isn't found or corrupted
|
||||
Environment.GetEnvironmentVariable ("ANDROID_DATA") + "/misc/zoneinfo/tzdata",
|
||||
Environment.GetEnvironmentVariable ("ANDROID_ROOT") + "/usr/share/zoneinfo/tzdata",
|
||||
};
|
||||
@@ -98,6 +104,26 @@ namespace System {
|
||||
get {return zoneTab;}
|
||||
}
|
||||
|
||||
static string GetApexTimeDataRoot ()
|
||||
{
|
||||
string ret = Environment.GetEnvironmentVariable ("ANDROID_TZDATA_ROOT");
|
||||
if (!String.IsNullOrEmpty (ret)) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
return "/apex/com.android.tzdata";
|
||||
}
|
||||
|
||||
static string GetApexRuntimeRoot ()
|
||||
{
|
||||
string ret = Environment.GetEnvironmentVariable ("ANDROID_RUNTIME_ROOT");
|
||||
if (!String.IsNullOrEmpty (ret)) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
return "/apex/com.android.runtime";
|
||||
}
|
||||
|
||||
bool LoadData (string path)
|
||||
{
|
||||
if (!File.Exists (path))
|
||||
|
||||
@@ -1 +1 @@
|
||||
dd15607ff6d9b83f7d278306d76552778815d3aa
|
||||
1c75687948c4942ceadf9e0aea9f2071755f58a0
|
||||
@@ -1 +1 @@
|
||||
cc768730e5ed75eba615f0522c81b06b147f90f3
|
||||
f8f2558a14462eb0628a69de89749bdd4b624980
|
||||
@@ -1 +1 @@
|
||||
e47d58e09f2d1d0234d41daa945a28e853c9cd13
|
||||
480ec8e660d0b59ace894d6a437fe85daf134bd4
|
||||
@@ -1 +1 @@
|
||||
afd79ac0db7443a209b6e956d048d7aaaf93c5bc
|
||||
64388ecf9113efa25ea3cb83bdcef27bf26be7b6
|
||||
@@ -1 +1 @@
|
||||
080f1ee5f613b05b1c9e81f1613715093bf1ae8e
|
||||
bcec45c69a095ad0c9b0c33eed3dbd6d87093299
|
||||
@@ -1 +1 @@
|
||||
474b72fb984f30016461f330c68e291635fcd776
|
||||
e478a81b39236d06502888d5daddcf9024d33ee1
|
||||
@@ -1 +1 @@
|
||||
93d38dbd6f1743097c706c4e00ec02571bf2cf44
|
||||
b024cfb3f6e8408e93c9bf1fb4c9ca40c0d0e151
|
||||
@@ -1 +1 @@
|
||||
f951468838bb1b1b4e130ab05e172029fead65f1
|
||||
cb902767dbf84e1ed910a3001c9ffb7b370215ac
|
||||
@@ -1 +1 @@
|
||||
dd15607ff6d9b83f7d278306d76552778815d3aa
|
||||
1c75687948c4942ceadf9e0aea9f2071755f58a0
|
||||
@@ -1 +1 @@
|
||||
cc768730e5ed75eba615f0522c81b06b147f90f3
|
||||
f8f2558a14462eb0628a69de89749bdd4b624980
|
||||
@@ -1 +1 @@
|
||||
e47d58e09f2d1d0234d41daa945a28e853c9cd13
|
||||
480ec8e660d0b59ace894d6a437fe85daf134bd4
|
||||
@@ -1 +1 @@
|
||||
afd79ac0db7443a209b6e956d048d7aaaf93c5bc
|
||||
64388ecf9113efa25ea3cb83bdcef27bf26be7b6
|
||||
@@ -1 +1 @@
|
||||
080f1ee5f613b05b1c9e81f1613715093bf1ae8e
|
||||
bcec45c69a095ad0c9b0c33eed3dbd6d87093299
|
||||
@@ -1 +1 @@
|
||||
474b72fb984f30016461f330c68e291635fcd776
|
||||
e478a81b39236d06502888d5daddcf9024d33ee1
|
||||
@@ -1 +1 @@
|
||||
93d38dbd6f1743097c706c4e00ec02571bf2cf44
|
||||
b024cfb3f6e8408e93c9bf1fb4c9ca40c0d0e151
|
||||
@@ -1 +1 @@
|
||||
f951468838bb1b1b4e130ab05e172029fead65f1
|
||||
cb902767dbf84e1ed910a3001c9ffb7b370215ac
|
||||
@@ -1 +1 @@
|
||||
dd15607ff6d9b83f7d278306d76552778815d3aa
|
||||
1c75687948c4942ceadf9e0aea9f2071755f58a0
|
||||
@@ -1 +1 @@
|
||||
cc768730e5ed75eba615f0522c81b06b147f90f3
|
||||
f8f2558a14462eb0628a69de89749bdd4b624980
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user