diff --git a/src/Android/Xamarin.Android/ArcGISRuntime.Xamarin.Samples.Android.csproj b/src/Android/Xamarin.Android/ArcGISRuntime.Xamarin.Samples.Android.csproj
index c928a946bf..0c2e32b889 100644
--- a/src/Android/Xamarin.Android/ArcGISRuntime.Xamarin.Samples.Android.csproj
+++ b/src/Android/Xamarin.Android/ArcGISRuntime.Xamarin.Samples.Android.csproj
@@ -47,7 +47,7 @@
false
false
false
- armeabi-v7a;x86;arm64-v8a
+ armeabi-v7a;x86;x86_64;arm64-v8a
pdbonly
@@ -60,6 +60,7 @@
Xamarin.Android.Net.AndroidClientHandler
true
d8
+ armeabi-v7a;x86;x86_64;arm64-v8a
diff --git a/src/ArcGISRuntime.Viewers.All.sln b/src/ArcGISRuntime.Viewers.All.sln
index a4d6a0aac0..bd0d81eb8b 100644
--- a/src/ArcGISRuntime.Viewers.All.sln
+++ b/src/ArcGISRuntime.Viewers.All.sln
@@ -56,24 +56,28 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
Ad-Hoc|ARM = Ad-Hoc|ARM
+ Ad-Hoc|ARM64 = Ad-Hoc|ARM64
Ad-Hoc|iPhone = Ad-Hoc|iPhone
Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
Ad-Hoc|x64 = Ad-Hoc|x64
Ad-Hoc|x86 = Ad-Hoc|x86
AppStore|Any CPU = AppStore|Any CPU
AppStore|ARM = AppStore|ARM
+ AppStore|ARM64 = AppStore|ARM64
AppStore|iPhone = AppStore|iPhone
AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
AppStore|x64 = AppStore|x64
AppStore|x86 = AppStore|x86
Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
+ Debug|ARM64 = Debug|ARM64
Debug|iPhone = Debug|iPhone
Debug|iPhoneSimulator = Debug|iPhoneSimulator
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
+ Release|ARM64 = Release|ARM64
Release|iPhone = Release|iPhone
Release|iPhoneSimulator = Release|iPhoneSimulator
Release|x64 = Release|x64
@@ -86,6 +90,9 @@ Global
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Ad-Hoc|ARM.Deploy.0 = Release|Any CPU
+ {BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
+ {BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
+ {BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Ad-Hoc|ARM64.Deploy.0 = Debug|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
@@ -104,6 +111,9 @@ Global
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.AppStore|ARM.ActiveCfg = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.AppStore|ARM.Build.0 = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.AppStore|ARM.Deploy.0 = Release|Any CPU
+ {BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
+ {BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.AppStore|ARM64.Build.0 = Debug|Any CPU
+ {BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.AppStore|ARM64.Deploy.0 = Debug|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.AppStore|iPhone.Build.0 = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.AppStore|iPhone.Deploy.0 = Release|Any CPU
@@ -122,6 +132,9 @@ Global
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Debug|ARM.ActiveCfg = Debug|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Debug|ARM.Build.0 = Debug|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Debug|ARM.Deploy.0 = Debug|Any CPU
+ {BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Debug|ARM64.Build.0 = Debug|Any CPU
+ {BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Debug|ARM64.Deploy.0 = Debug|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Debug|iPhone.Build.0 = Debug|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Debug|iPhone.Deploy.0 = Debug|Any CPU
@@ -140,6 +153,9 @@ Global
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Release|ARM.ActiveCfg = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Release|ARM.Build.0 = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Release|ARM.Deploy.0 = Release|Any CPU
+ {BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Release|ARM64.Build.0 = Release|Any CPU
+ {BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Release|ARM64.Deploy.0 = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Release|iPhone.ActiveCfg = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Release|iPhone.Build.0 = Release|Any CPU
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Release|iPhone.Deploy.0 = Release|Any CPU
@@ -154,6 +170,7 @@ Global
{BF0E3CEE-E88E-44E0-80CE-46EDA6CD4B54}.Release|x86.Deploy.0 = Release|Any CPU
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhoneSimulator
+ {DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Ad-Hoc|ARM64.ActiveCfg = Ad-Hoc|iPhoneSimulator
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
@@ -162,6 +179,7 @@ Global
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhoneSimulator
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.AppStore|ARM.ActiveCfg = AppStore|iPhoneSimulator
+ {DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.AppStore|ARM64.ActiveCfg = AppStore|iPhoneSimulator
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.AppStore|iPhone.Build.0 = AppStore|iPhone
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
@@ -170,6 +188,7 @@ Global
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.AppStore|x86.ActiveCfg = AppStore|iPhoneSimulator
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Debug|Any CPU.ActiveCfg = Debug|iPhone
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator
+ {DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Debug|iPhone.ActiveCfg = Debug|iPhone
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Debug|iPhone.Build.0 = Debug|iPhone
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Debug|iPhone.Deploy.0 = Debug|iPhone
@@ -179,6 +198,7 @@ Global
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Release|Any CPU.ActiveCfg = Release|iPhone
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
+ {DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Release|iPhone.ActiveCfg = Release|iPhone
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Release|iPhone.Build.0 = Release|iPhone
{DB2FC14A-7608-44F9-BCF4-88EC7C1AA949}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
@@ -191,6 +211,9 @@ Global
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Ad-Hoc|ARM.Deploy.0 = Debug|Any CPU
+ {5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
+ {5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
+ {5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Ad-Hoc|ARM64.Deploy.0 = Debug|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
@@ -209,6 +232,9 @@ Global
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.AppStore|ARM.Build.0 = Debug|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.AppStore|ARM.Deploy.0 = Debug|Any CPU
+ {5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
+ {5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.AppStore|ARM64.Build.0 = Debug|Any CPU
+ {5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.AppStore|ARM64.Deploy.0 = Debug|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.AppStore|iPhone.Build.0 = Release|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.AppStore|iPhone.Deploy.0 = Release|Any CPU
@@ -227,6 +253,9 @@ Global
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Debug|ARM.ActiveCfg = Debug|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Debug|ARM.Build.0 = Debug|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Debug|ARM.Deploy.0 = Debug|Any CPU
+ {5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Debug|ARM64.Build.0 = Debug|Any CPU
+ {5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Debug|ARM64.Deploy.0 = Debug|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Debug|iPhone.Build.0 = Debug|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Debug|iPhone.Deploy.0 = Debug|Any CPU
@@ -245,6 +274,9 @@ Global
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Release|ARM.ActiveCfg = Release|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Release|ARM.Build.0 = Release|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Release|ARM.Deploy.0 = Release|Any CPU
+ {5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Release|ARM64.Build.0 = Release|Any CPU
+ {5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Release|ARM64.Deploy.0 = Release|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Release|iPhone.ActiveCfg = Release|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Release|iPhone.Build.0 = Release|Any CPU
{5DA4DCDA-0167-4EDA-B6CF-5711458CA9BF}.Release|iPhone.Deploy.0 = Release|Any CPU
@@ -263,6 +295,9 @@ Global
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Ad-Hoc|ARM.Build.0 = Release|ARM
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Ad-Hoc|ARM.Deploy.0 = Release|ARM
+ {183E6918-B2CD-4EEB-9666-8889A151BC7D}.Ad-Hoc|ARM64.ActiveCfg = Release|ARM64
+ {183E6918-B2CD-4EEB-9666-8889A151BC7D}.Ad-Hoc|ARM64.Build.0 = Release|ARM64
+ {183E6918-B2CD-4EEB-9666-8889A151BC7D}.Ad-Hoc|ARM64.Deploy.0 = Release|ARM64
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Ad-Hoc|iPhone.ActiveCfg = Release|x86
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Ad-Hoc|iPhone.Build.0 = Release|x86
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Ad-Hoc|iPhone.Deploy.0 = Release|x86
@@ -281,6 +316,9 @@ Global
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.AppStore|ARM.ActiveCfg = Release|ARM
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.AppStore|ARM.Build.0 = Release|ARM
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.AppStore|ARM.Deploy.0 = Release|ARM
+ {183E6918-B2CD-4EEB-9666-8889A151BC7D}.AppStore|ARM64.ActiveCfg = Release|ARM64
+ {183E6918-B2CD-4EEB-9666-8889A151BC7D}.AppStore|ARM64.Build.0 = Release|ARM64
+ {183E6918-B2CD-4EEB-9666-8889A151BC7D}.AppStore|ARM64.Deploy.0 = Release|ARM64
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.AppStore|iPhone.ActiveCfg = Release|x86
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.AppStore|iPhone.Build.0 = Release|x86
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.AppStore|iPhone.Deploy.0 = Release|x86
@@ -299,6 +337,9 @@ Global
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Debug|ARM.ActiveCfg = Debug|ARM
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Debug|ARM.Build.0 = Debug|ARM
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Debug|ARM.Deploy.0 = Debug|ARM
+ {183E6918-B2CD-4EEB-9666-8889A151BC7D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {183E6918-B2CD-4EEB-9666-8889A151BC7D}.Debug|ARM64.Build.0 = Debug|ARM64
+ {183E6918-B2CD-4EEB-9666-8889A151BC7D}.Debug|ARM64.Deploy.0 = Debug|ARM64
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Debug|iPhone.ActiveCfg = Debug|x86
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Debug|iPhone.Build.0 = Debug|x86
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Debug|iPhone.Deploy.0 = Debug|x86
@@ -313,6 +354,9 @@ Global
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Release|ARM.ActiveCfg = Release|ARM
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Release|ARM.Build.0 = Release|ARM
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Release|ARM.Deploy.0 = Release|ARM
+ {183E6918-B2CD-4EEB-9666-8889A151BC7D}.Release|ARM64.ActiveCfg = Release|ARM64
+ {183E6918-B2CD-4EEB-9666-8889A151BC7D}.Release|ARM64.Build.0 = Release|ARM64
+ {183E6918-B2CD-4EEB-9666-8889A151BC7D}.Release|ARM64.Deploy.0 = Release|ARM64
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Release|iPhone.ActiveCfg = Release|x86
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Release|iPhoneSimulator.ActiveCfg = Release|x86
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Release|x64.ActiveCfg = Release|x64
@@ -323,6 +367,7 @@ Global
{183E6918-B2CD-4EEB-9666-8889A151BC7D}.Release|x86.Deploy.0 = Release|x86
{3192A404-34AC-4083-A3B9-44610EE92E68}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
+ {3192A404-34AC-4083-A3B9-44610EE92E68}.Ad-Hoc|ARM64.ActiveCfg = Ad-Hoc|iPhoneSimulator
{3192A404-34AC-4083-A3B9-44610EE92E68}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
@@ -331,6 +376,7 @@ Global
{3192A404-34AC-4083-A3B9-44610EE92E68}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.AppStore|ARM.ActiveCfg = AppStore|iPhone
+ {3192A404-34AC-4083-A3B9-44610EE92E68}.AppStore|ARM64.ActiveCfg = AppStore|iPhoneSimulator
{3192A404-34AC-4083-A3B9-44610EE92E68}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.AppStore|iPhone.Build.0 = AppStore|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
@@ -340,6 +386,7 @@ Global
{3192A404-34AC-4083-A3B9-44610EE92E68}.Debug|Any CPU.ActiveCfg = Debug|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.Debug|Any CPU.Build.0 = Debug|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.Debug|ARM.ActiveCfg = Debug|iPhone
+ {3192A404-34AC-4083-A3B9-44610EE92E68}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator
{3192A404-34AC-4083-A3B9-44610EE92E68}.Debug|iPhone.ActiveCfg = Debug|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.Debug|iPhone.Build.0 = Debug|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.Debug|iPhone.Deploy.0 = Debug|iPhone
@@ -349,6 +396,7 @@ Global
{3192A404-34AC-4083-A3B9-44610EE92E68}.Debug|x86.ActiveCfg = Debug|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.Release|Any CPU.ActiveCfg = Release|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.Release|ARM.ActiveCfg = Release|iPhone
+ {3192A404-34AC-4083-A3B9-44610EE92E68}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator
{3192A404-34AC-4083-A3B9-44610EE92E68}.Release|iPhone.ActiveCfg = Release|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.Release|iPhone.Build.0 = Release|iPhone
{3192A404-34AC-4083-A3B9-44610EE92E68}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
@@ -361,6 +409,9 @@ Global
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Ad-Hoc|ARM.Build.0 = Release|ARM
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Ad-Hoc|ARM.Deploy.0 = Release|ARM
+ {BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Ad-Hoc|ARM64.ActiveCfg = Release|ARM64
+ {BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Ad-Hoc|ARM64.Build.0 = Release|ARM64
+ {BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Ad-Hoc|ARM64.Deploy.0 = Release|ARM64
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Ad-Hoc|iPhone.ActiveCfg = Release|x64
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Ad-Hoc|iPhone.Build.0 = Release|x64
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Ad-Hoc|iPhone.Deploy.0 = Release|x64
@@ -379,6 +430,9 @@ Global
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.AppStore|ARM.ActiveCfg = Release|ARM
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.AppStore|ARM.Build.0 = Release|ARM
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.AppStore|ARM.Deploy.0 = Release|ARM
+ {BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.AppStore|ARM64.ActiveCfg = Release|ARM64
+ {BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.AppStore|ARM64.Build.0 = Release|ARM64
+ {BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.AppStore|ARM64.Deploy.0 = Release|ARM64
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.AppStore|iPhone.ActiveCfg = Release|x64
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.AppStore|iPhone.Build.0 = Release|x64
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.AppStore|iPhone.Deploy.0 = Release|x64
@@ -397,6 +451,9 @@ Global
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Debug|ARM.ActiveCfg = Debug|ARM
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Debug|ARM.Build.0 = Debug|ARM
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Debug|ARM.Deploy.0 = Debug|ARM
+ {BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Debug|ARM64.Build.0 = Debug|ARM64
+ {BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Debug|ARM64.Deploy.0 = Debug|ARM64
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Debug|iPhone.ActiveCfg = Debug|x86
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Debug|x64.ActiveCfg = Debug|x64
@@ -411,6 +468,9 @@ Global
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Release|ARM.ActiveCfg = Release|ARM
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Release|ARM.Build.0 = Release|ARM
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Release|ARM.Deploy.0 = Release|ARM
+ {BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Release|ARM64.ActiveCfg = Release|ARM64
+ {BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Release|ARM64.Build.0 = Release|ARM64
+ {BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Release|ARM64.Deploy.0 = Release|ARM64
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Release|iPhone.ActiveCfg = Release|x86
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Release|iPhoneSimulator.ActiveCfg = Release|x86
{BE5076AF-ECE0-4EA9-994E-37BAD4B19828}.Release|x64.ActiveCfg = Release|x64
@@ -423,6 +483,8 @@ Global
{5278F66E-D41F-45D2-8327-25EA13A11618}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+ {5278F66E-D41F-45D2-8327-25EA13A11618}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
+ {5278F66E-D41F-45D2-8327-25EA13A11618}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
@@ -435,6 +497,8 @@ Global
{5278F66E-D41F-45D2-8327-25EA13A11618}.AppStore|Any CPU.Build.0 = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.AppStore|ARM.ActiveCfg = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.AppStore|ARM.Build.0 = Release|Any CPU
+ {5278F66E-D41F-45D2-8327-25EA13A11618}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
+ {5278F66E-D41F-45D2-8327-25EA13A11618}.AppStore|ARM64.Build.0 = Debug|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.AppStore|iPhone.Build.0 = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
@@ -447,6 +511,8 @@ Global
{5278F66E-D41F-45D2-8327-25EA13A11618}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Debug|ARM.ActiveCfg = Debug|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Debug|ARM.Build.0 = Debug|Any CPU
+ {5278F66E-D41F-45D2-8327-25EA13A11618}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {5278F66E-D41F-45D2-8327-25EA13A11618}.Debug|ARM64.Build.0 = Debug|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Debug|iPhone.Build.0 = Debug|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
@@ -459,6 +525,8 @@ Global
{5278F66E-D41F-45D2-8327-25EA13A11618}.Release|Any CPU.Build.0 = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Release|ARM.ActiveCfg = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Release|ARM.Build.0 = Release|Any CPU
+ {5278F66E-D41F-45D2-8327-25EA13A11618}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {5278F66E-D41F-45D2-8327-25EA13A11618}.Release|ARM64.Build.0 = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Release|iPhone.ActiveCfg = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Release|iPhone.Build.0 = Release|Any CPU
{5278F66E-D41F-45D2-8327-25EA13A11618}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
@@ -473,6 +541,9 @@ Global
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Ad-Hoc|ARM.Deploy.0 = Debug|Any CPU
+ {13A60801-7B9A-4573-923F-9F2373E8BF84}.Ad-Hoc|ARM64.ActiveCfg = Release|Any CPU
+ {13A60801-7B9A-4573-923F-9F2373E8BF84}.Ad-Hoc|ARM64.Build.0 = Release|Any CPU
+ {13A60801-7B9A-4573-923F-9F2373E8BF84}.Ad-Hoc|ARM64.Deploy.0 = Release|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Ad-Hoc|iPhone.Deploy.0 = Debug|Any CPU
@@ -491,6 +562,9 @@ Global
{13A60801-7B9A-4573-923F-9F2373E8BF84}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.AppStore|ARM.Build.0 = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.AppStore|ARM.Deploy.0 = Debug|Any CPU
+ {13A60801-7B9A-4573-923F-9F2373E8BF84}.AppStore|ARM64.ActiveCfg = Release|Any CPU
+ {13A60801-7B9A-4573-923F-9F2373E8BF84}.AppStore|ARM64.Build.0 = Release|Any CPU
+ {13A60801-7B9A-4573-923F-9F2373E8BF84}.AppStore|ARM64.Deploy.0 = Release|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.AppStore|iPhone.Build.0 = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.AppStore|iPhone.Deploy.0 = Debug|Any CPU
@@ -509,6 +583,9 @@ Global
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Debug|ARM.ActiveCfg = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Debug|ARM.Build.0 = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Debug|ARM.Deploy.0 = Debug|Any CPU
+ {13A60801-7B9A-4573-923F-9F2373E8BF84}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {13A60801-7B9A-4573-923F-9F2373E8BF84}.Debug|ARM64.Build.0 = Debug|Any CPU
+ {13A60801-7B9A-4573-923F-9F2373E8BF84}.Debug|ARM64.Deploy.0 = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Debug|iPhone.Build.0 = Debug|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Debug|iPhone.Deploy.0 = Debug|Any CPU
@@ -527,6 +604,9 @@ Global
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Release|ARM.ActiveCfg = Release|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Release|ARM.Build.0 = Release|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Release|ARM.Deploy.0 = Release|Any CPU
+ {13A60801-7B9A-4573-923F-9F2373E8BF84}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {13A60801-7B9A-4573-923F-9F2373E8BF84}.Release|ARM64.Build.0 = Release|Any CPU
+ {13A60801-7B9A-4573-923F-9F2373E8BF84}.Release|ARM64.Deploy.0 = Release|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Release|iPhone.ActiveCfg = Release|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Release|iPhone.Build.0 = Release|Any CPU
{13A60801-7B9A-4573-923F-9F2373E8BF84}.Release|iPhone.Deploy.0 = Release|Any CPU
diff --git a/src/Forms/Android/ArcGISRuntime.Xamarin.Forms.Android.csproj b/src/Forms/Android/ArcGISRuntime.Xamarin.Forms.Android.csproj
index d5f85684a8..1c54292c4e 100644
--- a/src/Forms/Android/ArcGISRuntime.Xamarin.Forms.Android.csproj
+++ b/src/Forms/Android/ArcGISRuntime.Xamarin.Forms.Android.csproj
@@ -38,7 +38,7 @@
4
false
true
- armeabi-v7a;x86;arm64-v8a
+ armeabi-v7a;x86;x86_64;arm64-v8a
Xamarin
7
Xamarin.Android.Net.AndroidClientHandler
@@ -59,7 +59,7 @@
7
Xamarin.Android.Net.AndroidClientHandler
true
- armeabi-v7a;x86;arm64-v8a
+ armeabi-v7a;x86;x86_64;arm64-v8a
diff --git a/src/Forms/UWP/ArcGISRuntime.Xamarin.Forms.UWP.csproj b/src/Forms/UWP/ArcGISRuntime.Xamarin.Forms.UWP.csproj
index 525428e5b6..20b78c3cd5 100644
--- a/src/Forms/UWP/ArcGISRuntime.Xamarin.Forms.UWP.csproj
+++ b/src/Forms/UWP/ArcGISRuntime.Xamarin.Forms.UWP.csproj
@@ -19,7 +19,7 @@
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
Windows_TemporaryKey.pfx
- win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot
+ win10-arm;win10-arm-aot;win10-arm64-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot
true
@@ -219,6 +219,34 @@
14.0
+
+ true
+ bin\ARM64\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS
+ ;2008
+ true
+ full
+ ARM64
+ false
+ 7
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
+
+ bin\ARM64\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS
+ true
+ ;2008
+ true
+ pdbonly
+ ARM64
+ false
+ 7
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
diff --git a/src/UWP/ArcGISRuntime.UWP.Viewer/ArcGISRuntime.UWP.Viewer.csproj b/src/UWP/ArcGISRuntime.UWP.Viewer/ArcGISRuntime.UWP.Viewer.csproj
index 7c2ee34aa8..55f1f149c4 100644
--- a/src/UWP/ArcGISRuntime.UWP.Viewer/ArcGISRuntime.UWP.Viewer.csproj
+++ b/src/UWP/ArcGISRuntime.UWP.Viewer/ArcGISRuntime.UWP.Viewer.csproj
@@ -19,7 +19,7 @@
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
ArcGISRuntime.UWP.Viewer_TemporaryKey.pfx
- win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot
+ win10-arm;win10-arm-aot;win10-arm64-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot
true
@@ -102,6 +102,34 @@
Always
+
+ true
+ bin\ARM64\Debug\
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS
+ ;2008
+ true
+ full
+ ARM64
+ false
+ 7
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
+
+ bin\ARM64\Release\
+ TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS
+ true
+ ;2008
+ true
+ pdbonly
+ ARM64
+ false
+ 7
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+