From 8a00a96ffb34058bfb03f8cc16c28b38a79791a4 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Wed, 27 Apr 2016 14:48:28 -0400 Subject: Azure support (#143) * Initial import of azure support for pages * Add nuspec for azure * move azure nuspec to correct location * Update Newtonsoft.Json to 6.0.4 * Add converters * Fix package --- .nuspec/Xamarin.Forms.Pages.Azure.nuspec | 71 ++++++++++ .nuspec/Xamarin.Forms.Pages.nuspec | 2 +- PagesGallery/PagesGallery.Droid/MainActivity.cs | 4 +- .../PagesGallery.Droid/PagesGallery.Droid.csproj | 28 +++- .../Properties/AndroidManifest.xml | 2 +- PagesGallery/PagesGallery.Droid/app.config | 8 ++ PagesGallery/PagesGallery.Droid/packages.config | 6 +- .../PagesGallery.UWP/PagesGallery.UWP.csproj | 4 + PagesGallery/PagesGallery.UWP/project.json | 3 +- .../PagesGallery.iOS/PagesGallery.iOS.csproj | 11 +- PagesGallery/PagesGallery.iOS/packages.config | 4 - PagesGallery/PagesGallery/EventsPage.xaml | 9 +- PagesGallery/PagesGallery/PagesGallery.csproj | 11 +- PagesGallery/PagesGallery/packages.config | 4 - Xamarin.Forms.Pages.Azure/AzureDataSource.cs | 149 +++++++++++++++++++++ Xamarin.Forms.Pages.Azure/AzureEasyTableSource.cs | 26 ++++ Xamarin.Forms.Pages.Azure/AzureSource.cs | 21 +++ .../Properties/AssemblyInfo.cs | 30 +++++ .../Xamarin.Forms.Pages.Azure.csproj | 99 ++++++++++++++ Xamarin.Forms.Pages.Azure/packages.config | 8 ++ Xamarin.Forms.Pages/UriJsonSource.cs | 3 +- Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj | 7 +- Xamarin.Forms.Pages/packages.config | 3 +- Xamarin.Forms.sln | 31 +++++ 24 files changed, 501 insertions(+), 43 deletions(-) create mode 100644 .nuspec/Xamarin.Forms.Pages.Azure.nuspec delete mode 100644 PagesGallery/PagesGallery.iOS/packages.config delete mode 100644 PagesGallery/PagesGallery/packages.config create mode 100644 Xamarin.Forms.Pages.Azure/AzureDataSource.cs create mode 100644 Xamarin.Forms.Pages.Azure/AzureEasyTableSource.cs create mode 100644 Xamarin.Forms.Pages.Azure/AzureSource.cs create mode 100644 Xamarin.Forms.Pages.Azure/Properties/AssemblyInfo.cs create mode 100644 Xamarin.Forms.Pages.Azure/Xamarin.Forms.Pages.Azure.csproj create mode 100644 Xamarin.Forms.Pages.Azure/packages.config diff --git a/.nuspec/Xamarin.Forms.Pages.Azure.nuspec b/.nuspec/Xamarin.Forms.Pages.Azure.nuspec new file mode 100644 index 00000000..7a4532c9 --- /dev/null +++ b/.nuspec/Xamarin.Forms.Pages.Azure.nuspec @@ -0,0 +1,71 @@ + + + + Xamarin.Forms.Pages.Azure + $version$ + Xamarin, Inc. + Xamarin, Inc. + http://download.xamarin.com/content/licenses/Xamarin.Forms.rtf + http://xamarin.com/content/images/nuget/xamarin.png + http://xamarin.com/forms + false + Pre-built themeable pages for Xamarin.Forms + Copyright 2013-2016 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.nuspec/Xamarin.Forms.Pages.nuspec b/.nuspec/Xamarin.Forms.Pages.nuspec index 73bab273..c91b2ab8 100644 --- a/.nuspec/Xamarin.Forms.Pages.nuspec +++ b/.nuspec/Xamarin.Forms.Pages.nuspec @@ -14,7 +14,7 @@ - + diff --git a/PagesGallery/PagesGallery.Droid/MainActivity.cs b/PagesGallery/PagesGallery.Droid/MainActivity.cs index b991250c..37f4a4ff 100644 --- a/PagesGallery/PagesGallery.Droid/MainActivity.cs +++ b/PagesGallery/PagesGallery.Droid/MainActivity.cs @@ -15,8 +15,10 @@ namespace PagesGallery.Droid ToolbarResource = Resource.Layout.Toolbar; TabLayoutResource = Resource.Layout.Tabbar; - base.OnCreate(bundle); + Microsoft.WindowsAzure.MobileServices.CurrentPlatform.Init(); + base.OnCreate(bundle); + Forms.Init(this, bundle); LoadApplication(new App()); } diff --git a/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj b/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj index 02e1434e..6312a948 100644 --- a/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj +++ b/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj @@ -48,19 +48,31 @@ SdkOnly - - ..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll + + ..\..\packages\Microsoft.Azure.Mobile.Client.2.0.1\lib\monoandroid\Microsoft.WindowsAzure.Mobile.dll + True + + + ..\..\packages\Microsoft.Azure.Mobile.Client.2.0.1\lib\monoandroid\Microsoft.WindowsAzure.Mobile.Ext.dll True - - ..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll + + ..\..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll True - + + + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Extensions.dll + True + + + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Primitives.dll + True + ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll @@ -130,6 +142,10 @@ {57b8b73d-c3b5-4c42-869e-7b2f17d354ac} Xamarin.Forms.Core + + {c9696465-7657-4843-872e-3c01891c4a9b} + Xamarin.Forms.Pages.Azure + {d6133dbd-6c60-4bd5-bea2-07e0a3927c31} Xamarin.Forms.Pages @@ -161,7 +177,9 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + + ..\packages\Microsoft.Azure.Mobile.Client.2.0.1\lib\portable-win+net45+wp8+wpa81+monotouch+monoandroid\Microsoft.WindowsAzure.Mobile.dll + True + + + ..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll + True + + + ..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll + True + + + ..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll + True + + + ..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll + True + + + + + {57b8b73d-c3b5-4c42-869e-7b2f17d354ac} + Xamarin.Forms.Core + + + {d6133dbd-6c60-4bd5-bea2-07e0a3927c31} + Xamarin.Forms.Pages + + + {9db2f292-8034-4e06-89ad-98bbda4306b9} + Xamarin.Forms.Xaml + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + \ No newline at end of file diff --git a/Xamarin.Forms.Pages.Azure/packages.config b/Xamarin.Forms.Pages.Azure/packages.config new file mode 100644 index 00000000..035d1e5d --- /dev/null +++ b/Xamarin.Forms.Pages.Azure/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Xamarin.Forms.Pages/UriJsonSource.cs b/Xamarin.Forms.Pages/UriJsonSource.cs index d732e25c..b8681e9e 100644 --- a/Xamarin.Forms.Pages/UriJsonSource.cs +++ b/Xamarin.Forms.Pages/UriJsonSource.cs @@ -11,6 +11,7 @@ namespace Xamarin.Forms.Pages public static readonly BindableProperty UriProperty = BindableProperty.Create(nameof(Uri), typeof(Uri), typeof(UriJsonSource), null); + [TypeConverter(typeof(UriTypeConverter))] public Uri Uri { get { return (Uri)GetValue(UriProperty); } @@ -19,7 +20,7 @@ namespace Xamarin.Forms.Pages public override async Task GetJson() { - var webClient = new HttpClient(new ModernHttpClient.NativeMessageHandler()); + var webClient = new HttpClient(); try { string json = await webClient.GetStringAsync(Uri); diff --git a/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj b/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj index 15c8e1cd..82e54923 100644 --- a/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj +++ b/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj @@ -66,8 +66,8 @@ - - ..\packages\modernhttpclient.2.4.2\lib\Portable-Net45+WinRT45+WP8+WPA81\ModernHttpClient.dll + + ..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll True @@ -82,9 +82,6 @@ ..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll True - - ..\packages\Newtonsoft.Json.8.0.3\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll - diff --git a/Xamarin.Forms.Pages/packages.config b/Xamarin.Forms.Pages/packages.config index 1861a33d..fc6881e9 100644 --- a/Xamarin.Forms.Pages/packages.config +++ b/Xamarin.Forms.Pages/packages.config @@ -3,6 +3,5 @@ - - + \ No newline at end of file diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln index 1dd56212..eefd13ae 100644 --- a/Xamarin.Forms.sln +++ b/Xamarin.Forms.sln @@ -159,6 +159,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PagesGallery.UWP", "PagesGa EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Platform.Android.AppLinks", "Xamarin.Forms.Platform.Android.AppLinks\Xamarin.Forms.Platform.Android.AppLinks.csproj", "{42DB052E-0909-45D2-8240-187F99F393FB}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Pages.Azure", "Xamarin.Forms.Pages.Azure\Xamarin.Forms.Pages.Azure.csproj", "{C9696465-7657-4843-872E-3C01891C4A9B}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution docs\APIDocs.projitems*{dc1f3933-ac99-4887-8b09-e13c2b346d4f}*SharedItemsImports = 13 @@ -1690,6 +1692,34 @@ Global {42DB052E-0909-45D2-8240-187F99F393FB}.Release|x64.Build.0 = Release|Any CPU {42DB052E-0909-45D2-8240-187F99F393FB}.Release|x86.ActiveCfg = Release|Any CPU {42DB052E-0909-45D2-8240-187F99F393FB}.Release|x86.Build.0 = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|ARM.Build.0 = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhone.Build.0 = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|Templates.ActiveCfg = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|Templates.Build.0 = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x64.ActiveCfg = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x64.Build.0 = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x86.ActiveCfg = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x86.Build.0 = Debug|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|Any CPU.Build.0 = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|ARM.ActiveCfg = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|ARM.Build.0 = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|iPhone.ActiveCfg = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|iPhone.Build.0 = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|Templates.ActiveCfg = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|Templates.Build.0 = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|x64.ActiveCfg = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|x64.Build.0 = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|x86.ActiveCfg = Release|Any CPU + {C9696465-7657-4843-872E-3C01891C4A9B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1754,5 +1784,6 @@ Global {392156B2-760A-4EE3-A822-CABD3238A21D} = {80BAC3FB-357A-4D05-A050-9F234DF49C97} {95FEB8D4-D57E-4B96-A8D8-59D241C0501B} = {80BAC3FB-357A-4D05-A050-9F234DF49C97} {42DB052E-0909-45D2-8240-187F99F393FB} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226} + {C9696465-7657-4843-872E-3C01891C4A9B} = {9AD757F5-E57A-459D-A0A7-E0675E045B84} EndGlobalSection EndGlobal -- cgit v1.2.3