From 24f64f9745ce4000a08be80962a8854ccb8782a8 Mon Sep 17 00:00:00 2001 From: cydhaselton Date: Sun, 5 Mar 2017 18:48:22 +0000 Subject: [PATCH 1/6] Add RIDs for Android --- pkg/Microsoft.NETCore.Platforms/runtime.json | 40 ++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json index ecdfc691bcbf..98c9e0922ace 100644 --- a/pkg/Microsoft.NETCore.Platforms/runtime.json +++ b/pkg/Microsoft.NETCore.Platforms/runtime.json @@ -7,6 +7,46 @@ "#import": [ "base" ] }, + "android": { + "#import": [ "any" ] + }, + "android-x64": { + "#import": [ "any" ] + }, + "android-mips": { + "#import": [ "any" ] + }, + + "android.21": { + "#import": [ "android" ] + }, + "android.21-x64": { + "#import": [ "android.21", "android-x64" ] + }, + "android.21-mips": { + "#import": [ "android.21", "android-mips" ] + }, + + "android.22": { + "#import": [ "android" ] + }, + "android.22-x64": { + "#import": [ "android.22", "android-x64" ] + }, + "android.22-mips": { + "#import": [ "android.22", "android-mips" ] + }, + + "android.23": { + "#import": [ "android" ] + }, + "android.23-x64": { + "#import": [ "android.23", "android-x64" ] + }, + "android.23-mips": { + "#import": [ "android.23", "android-mips" ] + }, + "win": { "#import": [ "any" ] }, From f72592bb84903cad42627ca02a035f76dab6c4a5 Mon Sep 17 00:00:00 2001 From: cydhaselton Date: Sun, 5 Mar 2017 20:33:50 +0000 Subject: [PATCH 2/6] Changed android x64 RID to clearer arm64 --- pkg/Microsoft.NETCore.Platforms/runtime.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json index 98c9e0922ace..0a5f3e3e7b6f 100644 --- a/pkg/Microsoft.NETCore.Platforms/runtime.json +++ b/pkg/Microsoft.NETCore.Platforms/runtime.json @@ -10,7 +10,7 @@ "android": { "#import": [ "any" ] }, - "android-x64": { + "android-arm64": { "#import": [ "any" ] }, "android-mips": { @@ -20,8 +20,8 @@ "android.21": { "#import": [ "android" ] }, - "android.21-x64": { - "#import": [ "android.21", "android-x64" ] + "android.21-arm64": { + "#import": [ "android.21", "android-arm64" ] }, "android.21-mips": { "#import": [ "android.21", "android-mips" ] @@ -30,8 +30,8 @@ "android.22": { "#import": [ "android" ] }, - "android.22-x64": { - "#import": [ "android.22", "android-x64" ] + "android.22-arm64": { + "#import": [ "android.22", "android-arm64" ] }, "android.22-mips": { "#import": [ "android.22", "android-mips" ] @@ -40,13 +40,13 @@ "android.23": { "#import": [ "android" ] }, - "android.23-x64": { - "#import": [ "android.23", "android-x64" ] + "android.23-arm64": { + "#import": [ "android.23", "android-arm64" ] }, "android.23-mips": { "#import": [ "android.23", "android-mips" ] }, - + "win": { "#import": [ "any" ] }, From e2be12a4743e76d436b85d1733aab9417e24ca5e Mon Sep 17 00:00:00 2001 From: cydhaselton Date: Tue, 7 Mar 2017 12:26:51 +0000 Subject: [PATCH 3/6] Replace Android MIPS RID with arm. Remove Android API levels 22-23 (corrected authoring info) --- pkg/Microsoft.NETCore.Platforms/runtime.json | 34 ++++---------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json index 0a5f3e3e7b6f..d2d17e485412 100644 --- a/pkg/Microsoft.NETCore.Platforms/runtime.json +++ b/pkg/Microsoft.NETCore.Platforms/runtime.json @@ -10,42 +10,22 @@ "android": { "#import": [ "any" ] }, - "android-arm64": { + "android-arm": { "#import": [ "any" ] }, - "android-mips": { - "#import": [ "any" ] + "android-arm64": { + "#import": [ "any" ] }, "android.21": { "#import": [ "android" ] - }, + }, + "android.21-arm": { + "#import": [ "android.21", "android-arm" ] + }, "android.21-arm64": { "#import": [ "android.21", "android-arm64" ] }, - "android.21-mips": { - "#import": [ "android.21", "android-mips" ] - }, - - "android.22": { - "#import": [ "android" ] - }, - "android.22-arm64": { - "#import": [ "android.22", "android-arm64" ] - }, - "android.22-mips": { - "#import": [ "android.22", "android-mips" ] - }, - - "android.23": { - "#import": [ "android" ] - }, - "android.23-arm64": { - "#import": [ "android.23", "android-arm64" ] - }, - "android.23-mips": { - "#import": [ "android.23", "android-mips" ] - }, "win": { "#import": [ "any" ] From f52368d54f6c0fd03390e8d4edd299d5c70b1651 Mon Sep 17 00:00:00 2001 From: cydhaselton Date: Tue, 7 Mar 2017 12:32:31 +0000 Subject: [PATCH 4/6] Fixed whitespace issue --- pkg/Microsoft.NETCore.Platforms/runtime.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json index d2d17e485412..e8d277249c71 100644 --- a/pkg/Microsoft.NETCore.Platforms/runtime.json +++ b/pkg/Microsoft.NETCore.Platforms/runtime.json @@ -11,20 +11,20 @@ "#import": [ "any" ] }, "android-arm": { - "#import": [ "any" ] + "#import": [ "any" ] }, "android-arm64": { - "#import": [ "any" ] + "#import": [ "any" ] }, "android.21": { - "#import": [ "android" ] + "#import": [ "android" ] }, "android.21-arm": { - "#import": [ "android.21", "android-arm" ] + "#import": [ "android.21", "android-arm" ] }, "android.21-arm64": { - "#import": [ "android.21", "android-arm64" ] + "#import": [ "android.21", "android-arm64" ] }, "win": { From 01c20a13abb79701f3f6c3d9b24e4f13e0a29ee3 Mon Sep 17 00:00:00 2001 From: cydhaselton Date: Tue, 7 Mar 2017 12:49:03 +0000 Subject: [PATCH 5/6] Fixing hidden tabs, replacing with correct spacing --- pkg/Microsoft.NETCore.Platforms/runtime.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json index e8d277249c71..1a3dd824b122 100644 --- a/pkg/Microsoft.NETCore.Platforms/runtime.json +++ b/pkg/Microsoft.NETCore.Platforms/runtime.json @@ -11,20 +11,20 @@ "#import": [ "any" ] }, "android-arm": { - "#import": [ "any" ] + "#import": [ "any" ] }, "android-arm64": { - "#import": [ "any" ] + "#import": [ "any" ] }, "android.21": { "#import": [ "android" ] }, "android.21-arm": { - "#import": [ "android.21", "android-arm" ] + "#import": [ "android.21", "android-arm" ] }, "android.21-arm64": { - "#import": [ "android.21", "android-arm64" ] + "#import": [ "android.21", "android-arm64" ] }, "win": { From c7c4fcc353a4fa89bb88f87b3129335a2c5673e1 Mon Sep 17 00:00:00 2001 From: cydhaselton Date: Tue, 7 Mar 2017 12:57:12 +0000 Subject: [PATCH 6/6] Removed final hidden tab, replace with whitespace. --- pkg/Microsoft.NETCore.Platforms/runtime.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json index 1a3dd824b122..ccb00fadae55 100644 --- a/pkg/Microsoft.NETCore.Platforms/runtime.json +++ b/pkg/Microsoft.NETCore.Platforms/runtime.json @@ -19,7 +19,7 @@ "android.21": { "#import": [ "android" ] - }, + }, "android.21-arm": { "#import": [ "android.21", "android-arm" ] },