Skip to content

Commit

Permalink
[httpclient] update sample (64-bit, XF)
Browse files Browse the repository at this point in the history
  • Loading branch information
Craig authored and Craig committed Feb 2, 2019
1 parent ab75ac0 commit 1be0fdd
Show file tree
Hide file tree
Showing 10 changed files with 188 additions and 79 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Resource.designer.cs

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
.vs/

# User-specific files
*.suo
Expand Down
122 changes: 99 additions & 23 deletions HttpClient/Android/HttpClientDemo.Android.csproj

Large diffs are not rendered by default.

37 changes: 27 additions & 10 deletions HttpClient/Android/packages.config
Original file line number Diff line number Diff line change
@@ -1,13 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="MonoAndroid60" />
<package id="Xamarin.Android.Support.Design" version="23.0.1.3" targetFramework="MonoAndroid403" />
<package id="Xamarin.Android.Support.v4" version="23.0.1.3" targetFramework="MonoAndroid403" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="23.0.1.3" targetFramework="MonoAndroid403" />
<package id="Xamarin.Android.Support.v7.CardView" version="23.0.1.3" targetFramework="MonoAndroid403" />
<package id="Xamarin.Android.Support.v7.MediaRouter" version="23.0.1.3" targetFramework="MonoAndroid403" />
<package id="Xamarin.Forms" version="2.0.1.6505" targetFramework="MonoAndroid403" />
<package id="Xamarin.Forms.Maps" version="2.0.1.6505" targetFramework="MonoAndroid60" />
<package id="Xamarin.GooglePlayServices.Base" version="26.0.0.0" targetFramework="MonoAndroid60" />
<package id="Xamarin.GooglePlayServices.Maps" version="26.0.0.0" targetFramework="MonoAndroid60" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Core.Common" version="1.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Annotations" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Compat" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Core.UI" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Core.Utils" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Design" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Fragment" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Media.Compat" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Transition" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v4" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.CardView" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.MediaRouter" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.Palette" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="27.0.2" targetFramework="monoandroid90" />
<package id="Xamarin.Build.Download" version="0.4.9" targetFramework="monoandroid90" />
<package id="Xamarin.Forms" version="3.4.0.1029999" targetFramework="monoandroid90" />
<package id="Xamarin.Forms.Maps" version="3.4.0.1029999" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Base" version="60.1142.1" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Basement" version="60.1142.1" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Maps" version="60.1142.1" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Tasks" version="60.1142.1" targetFramework="monoandroid90" />
</packages>
36 changes: 20 additions & 16 deletions HttpClient/HttpClientDemo/HttpClientDemo.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.3.4.0.1029999\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.3.4.0.1029999\build\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand Down Expand Up @@ -40,38 +41,40 @@
</Compile>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="..\packages\Xamarin.Forms.2.0.1.6505\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.0.1.6505\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
<ItemGroup>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.2.0.1.6505\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
<Reference Include="System.Net.Http">
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.2.0.1.6505\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
<Reference Include="System.Net.Http.Primitives">
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.2.0.1.6505\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
<Reference Include="System.Net.Http.Extensions">
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\portable-net45+win8+wp8+wpa81\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Net.Http">
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.3.4.0.1029999\lib\netstandard1.0\Xamarin.Forms.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Net.Http.Primitives">
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
<Private>False</Private>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.3.4.0.1029999\lib\netstandard1.0\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Extensions">
<HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.3.4.0.1029999\lib\netstandard1.0\Xamarin.Forms.Xaml.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Forms.Maps.Design">
<HintPath>..\packages\Xamarin.Forms.Maps.3.4.0.1029999\lib\netstandard1.0\Xamarin.Forms.Maps.Design.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Maps">
<HintPath>..\packages\Xamarin.Forms.Maps.2.0.1.6505\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.Maps.3.4.0.1029999\lib\netstandard1.0\Xamarin.Forms.Maps.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -86,4 +89,5 @@
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
</ItemGroup>
<Import Project="..\packages\Xamarin.Forms.3.4.0.1029999\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.3.4.0.1029999\build\Xamarin.Forms.targets')" />
</Project>
6 changes: 3 additions & 3 deletions HttpClient/HttpClientDemo/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
<package id="Xamarin.Forms" version="2.0.1.6505" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
<package id="Xamarin.Forms.Maps" version="2.0.1.6505" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarintvos10+xamarinwatchos10+xamarinios10" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="portable45-net45+win8+wp8" />
<package id="Xamarin.Forms" version="3.4.0.1029999" targetFramework="portable45-net45+win8+wp8" />
<package id="Xamarin.Forms.Maps" version="3.4.0.1029999" targetFramework="portable45-net45+win8+wp8" />
</packages>
6 changes: 3 additions & 3 deletions HttpClient/iOS/AppDelegate.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;

using MonoTouch.Foundation;
using MonoTouch.UIKit;
using Foundation;
using UIKit;

using Xamarin.Forms;
using Xamarin.Forms.Platform.iOS;
Expand Down
43 changes: 26 additions & 17 deletions HttpClient/iOS/HttpClientDemo.iOS.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.3.4.0.1029999\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.3.4.0.1029999\build\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{52E9C32B-6482-4824-8847-175A69AC7134}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>HttpClientDemo.iOS</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>HttpClientiOS</AssemblyName>
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -22,6 +25,8 @@
<MtouchLink>None</MtouchLink>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchArch>x86_64</MtouchArch>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>full</DebugType>
Expand All @@ -45,6 +50,7 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchArch>ARM64</MtouchArch>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>full</DebugType>
Expand All @@ -55,6 +61,7 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<ConsolePause>false</ConsolePause>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchArch>ARMv7, ARM64</MtouchArch>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
<DebugType>full</DebugType>
Expand All @@ -67,6 +74,7 @@
<BuildIpa>true</BuildIpa>
<CodesignProvision>Automatic:AdHoc</CodesignProvision>
<CodesignKey>iPhone Distribution</CodesignKey>
<MtouchArch>ARMv7, ARM64</MtouchArch>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
<DebugType>full</DebugType>
Expand All @@ -78,34 +86,35 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<ConsolePause>false</ConsolePause>
<CodesignProvision>Automatic:AppStore</CodesignProvision>
<MtouchArch>ARMv7, ARM64</MtouchArch>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="monotouch" />
<Reference Include="Xamarin.Forms.Platform.iOS.Classic">
<HintPath>..\packages\Xamarin.Forms.2.0.1.6505\lib\MonoTouch10\Xamarin.Forms.Platform.iOS.Classic.dll</HintPath>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Xamarin.iOS" />
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.2.0.1.6505\lib\MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.2.0.1.6505\lib\MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.3.4.0.1029999\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.2.0.1.6505\lib\MonoTouch10\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.3.4.0.1029999\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\packages\Xamarin.Forms.3.4.0.1029999\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Maps.iOS.Classic">
<HintPath>..\packages\Xamarin.Forms.Maps.2.0.1.6505\lib\MonoTouch10\Xamarin.Forms.Maps.iOS.Classic.dll</HintPath>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.3.4.0.1029999\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Forms.Maps">
<HintPath>..\packages\Xamarin.Forms.Maps.2.0.1.6505\lib\MonoTouch10\Xamarin.Forms.Maps.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.Maps.3.4.0.1029999\lib\Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Maps.iOS">
<HintPath>..\packages\Xamarin.Forms.Maps.3.4.0.1029999\lib\Xamarin.iOS10\Xamarin.Forms.Maps.iOS.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -128,7 +137,7 @@
<Name>HttpClientDemo</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
<Import Project="..\packages\Xamarin.Forms.2.0.1.6505\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.0.1.6505\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\packages\Xamarin.Forms.3.4.0.1029999\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.3.4.0.1029999\build\Xamarin.Forms.targets')" />
</Project>
4 changes: 3 additions & 1 deletion HttpClient/iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
<string>8.0</string>
<string>12.0</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
Expand All @@ -36,5 +36,7 @@
</array>
<key>CFBundleName</key>
<string>HttpClient</string>
<key>CFBundleIdentifier</key>
<string>co.conceptdev.httpclient</string>
</dict>
</plist>
6 changes: 3 additions & 3 deletions HttpClient/iOS/Main.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;

using MonoTouch.Foundation;
using MonoTouch.UIKit;
using Foundation;
using UIKit;

namespace HttpClientDemo.iOS
{
Expand Down
6 changes: 3 additions & 3 deletions HttpClient/iOS/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="MonoTouch10" />
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="MonoTouch10" />
<package id="Xamarin.Forms" version="2.0.1.6505" targetFramework="MonoTouch10" />
<package id="Xamarin.Forms.Maps" version="2.0.1.6505" targetFramework="MonoTouch10" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="monotouch10" />
<package id="Xamarin.Forms" version="3.4.0.1029999" targetFramework="xamarinios10" />
<package id="Xamarin.Forms.Maps" version="3.4.0.1029999" targetFramework="xamarinios10" />
</packages>

0 comments on commit 1be0fdd

Please sign in to comment.