diff options
| author | Jason Smith <jason.smith@xamarin.com> | 2016-04-27 14:48:28 -0400 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2016-04-27 14:48:28 -0400 |
| commit | 8a00a96ffb34058bfb03f8cc16c28b38a79791a4 (patch) | |
| tree | 294842819c3b051e9b4050971475fda48431f109 /Xamarin.Forms.Pages | |
| parent | 2d9288eee6e6f197364a64308183725e7bd561f9 (diff) | |
| download | xamarin-forms-8a00a96ffb34058bfb03f8cc16c28b38a79791a4.tar.gz xamarin-forms-8a00a96ffb34058bfb03f8cc16c28b38a79791a4.tar.bz2 xamarin-forms-8a00a96ffb34058bfb03f8cc16c28b38a79791a4.zip | |
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
Diffstat (limited to 'Xamarin.Forms.Pages')
| -rw-r--r-- | Xamarin.Forms.Pages/UriJsonSource.cs | 3 | ||||
| -rw-r--r-- | Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj | 7 | ||||
| -rw-r--r-- | Xamarin.Forms.Pages/packages.config | 3 |
3 files changed, 5 insertions, 8 deletions
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<string> 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 @@ <Compile Include="UriJsonSource.cs" /> </ItemGroup> <ItemGroup> - <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\modernhttpclient.2.4.2\lib\Portable-Net45+WinRT45+WP8+WPA81\ModernHttpClient.dll</HintPath> + <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="System.Net.Http, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> @@ -82,9 +82,6 @@ <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="Newtonsoft.Json"> - <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll</HintPath> - </Reference> </ItemGroup> <ItemGroup> <None Include="packages.config" /> 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 @@ <package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable45-net45+win8+wp8+wpa81" /> <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable45-net45+win8+wp8+wpa81" /> <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="modernhttpclient" version="2.4.2" targetFramework="portable45-net45+win8+wp8+wpa81" /> - <package id="Newtonsoft.Json" version="8.0.3" targetFramework="portable-net45+win+wpa81+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarintvos10+xamarinwatchos10+xamarinios10" /> + <package id="Newtonsoft.Json" version="6.0.4" targetFramework="portable45-net45+win8+wp8+wpa81" /> </packages>
\ No newline at end of file |