Skip to content

Commit 16c386b

Browse files
David BritchDavid Britch
David Britch
authored and
David Britch
committed
Web service samples updated to Xamarin.Forms 1.5.0.
1 parent 357c523 commit 16c386b

File tree

68 files changed

+573
-439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+573
-439
lines changed

‎WebServices/TodoASMX/Droid/TodoASMX.Droid.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
1616
<AssemblyName>TodoASMX.Droid</AssemblyName>
1717
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
18-
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v5.1</TargetFrameworkVersion>
1919
</PropertyGroup>
2020
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2121
<DebugSymbols>true</DebugSymbols>
@@ -42,25 +42,25 @@
4242
<Reference Include="System.Xml" />
4343
<Reference Include="System.Core" />
4444
<Reference Include="Mono.Android" />
45+
<Reference Include="Xamarin.Android.Support.v4">
46+
<HintPath>..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
47+
</Reference>
48+
<Reference Include="System.Web.Services" />
4549
<Reference Include="Xamarin.Forms.Platform.Android">
46-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
50+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
4751
</Reference>
4852
<Reference Include="FormsViewGroup">
49-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
53+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
5054
</Reference>
5155
<Reference Include="Xamarin.Forms.Core">
52-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
56+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
5357
</Reference>
5458
<Reference Include="Xamarin.Forms.Xaml">
55-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
59+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
5660
</Reference>
5761
<Reference Include="Xamarin.Forms.Platform">
58-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
62+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
5963
</Reference>
60-
<Reference Include="Xamarin.Android.Support.v4">
61-
<HintPath>..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
62-
</Reference>
63-
<Reference Include="System.Web.Services" />
6464
</ItemGroup>
6565
<ItemGroup>
6666
<ProjectReference Include="..\TodoASMX\TodoASMX.csproj">
@@ -104,7 +104,7 @@
104104
<AndroidResource Include="Resources\drawable\plus.png" />
105105
</ItemGroup>
106106
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
107-
<Import Project="..\packages\Xamarin.Forms.1.4.4.6392\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.4.4.6392\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
107+
<Import Project="..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
108108
<ItemGroup>
109109
<WebReferences Include="Web References" />
110110
</ItemGroup>

‎WebServices/TodoASMX/Droid/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Xamarin.Android.Support.v4" version="22.2.1.0" targetFramework="MonoAndroid50" />
4-
<package id="Xamarin.Forms" version="1.4.4.6392" targetFramework="MonoAndroid50" />
4+
<package id="Xamarin.Forms" version="1.5.0.6446" targetFramework="MonoAndroid51" />
55
</packages>

‎WebServices/TodoASMX/TodoASMX/TodoASMX.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,21 @@
4646
<Compile Include="Constants.cs" />
4747
</ItemGroup>
4848
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
49-
<Import Project="..\packages\Xamarin.Forms.1.4.4.6392\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.4.4.6392\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
49+
<Import Project="..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
5050
<ItemGroup>
51+
<Reference Include="System" />
52+
<Reference Include="System.ServiceModel" />
53+
<Reference Include="System.Runtime.Serialization" />
54+
<Reference Include="System.Xml" />
5155
<Reference Include="Xamarin.Forms.Core">
52-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
56+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
5357
</Reference>
5458
<Reference Include="Xamarin.Forms.Xaml">
55-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
59+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
5660
</Reference>
5761
<Reference Include="Xamarin.Forms.Platform">
58-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
62+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
5963
</Reference>
60-
<Reference Include="System" />
61-
<Reference Include="System.ServiceModel" />
62-
<Reference Include="System.Runtime.Serialization" />
63-
<Reference Include="System.Xml" />
64-
</ItemGroup>
65-
<ItemGroup>
66-
<None Include="packages.config" />
6764
</ItemGroup>
6865
<ItemGroup />
6966
<ItemGroup>
@@ -74,4 +71,7 @@
7471
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
7572
</EmbeddedResource>
7673
</ItemGroup>
74+
<ItemGroup>
75+
<None Include="packages.config" />
76+
</ItemGroup>
7777
</Project>

‎WebServices/TodoASMX/TodoASMX/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xamarin.Forms" version="1.4.4.6392" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" requireReinstallation="True" />
3+
<package id="Xamarin.Forms" version="1.5.0.6446" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
44
</packages>

‎WebServices/TodoASMX/iOS/TodoASMX.iOS.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,22 @@
6565
<Reference Include="System.Xml" />
6666
<Reference Include="System.Core" />
6767
<Reference Include="Xamarin.iOS" />
68+
<Reference Include="System.Web.Services" />
6869
<Reference Include="Calabash">
69-
<HintPath>..\packages\Xamarin.TestCloud.Agent.0.14.1\lib\Xamarin.iOS10\Calabash.dll</HintPath>
70+
<HintPath>..\packages\Xamarin.TestCloud.Agent.0.16.1\lib\Xamarin.iOS10\Calabash.dll</HintPath>
7071
</Reference>
7172
<Reference Include="Xamarin.Forms.Platform.iOS">
72-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
73+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
7374
</Reference>
7475
<Reference Include="Xamarin.Forms.Core">
75-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
76+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
7677
</Reference>
7778
<Reference Include="Xamarin.Forms.Xaml">
78-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
79+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
7980
</Reference>
8081
<Reference Include="Xamarin.Forms.Platform">
81-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
82+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
8283
</Reference>
83-
<Reference Include="System.Web.Services" />
8484
</ItemGroup>
8585
<ItemGroup>
8686
<ProjectReference Include="..\TodoASMX\TodoASMX.csproj">
@@ -136,7 +136,7 @@
136136
<ITunesArtwork Include="ITunesArtwork%402x" />
137137
</ItemGroup>
138138
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
139-
<Import Project="..\packages\Xamarin.Forms.1.4.4.6392\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.4.4.6392\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
139+
<Import Project="..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
140140
<ItemGroup>
141141
<WebReferences Include="Web References" />
142142
</ItemGroup>

‎WebServices/TodoASMX/iOS/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xamarin.Forms" version="1.4.4.6392" targetFramework="xamarinios10" />
4-
<package id="Xamarin.TestCloud.Agent" version="0.14.1" targetFramework="xamarinios10" />
3+
<package id="Xamarin.Forms" version="1.5.0.6446" targetFramework="xamarinios10" />
4+
<package id="Xamarin.TestCloud.Agent" version="0.16.1" targetFramework="xamarinios10" />
55
</packages>

‎WebServices/TodoAWS/Droid/TodoAWS.Droid.csproj‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
1717
<AssemblyName>TodoAWS.Droid</AssemblyName>
1818
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
19+
<NuGetPackageImportStamp>58061c8d</NuGetPackageImportStamp>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2122
<DebugSymbols>true</DebugSymbols>
@@ -38,6 +39,10 @@
3839
<ConsolePause>false</ConsolePause>
3940
</PropertyGroup>
4041
<ItemGroup>
42+
<Reference Include="FormsViewGroup, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<SpecificVersion>False</SpecificVersion>
44+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
45+
</Reference>
4146
<Reference Include="System" />
4247
<Reference Include="System.Xml" />
4348
<Reference Include="System.Core" />
@@ -76,20 +81,21 @@
7681
<Reference Include="AWSSDK.CognitoIdentity">
7782
<HintPath>..\packages\AWSSDK.CognitoIdentity.3.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+xamarinios10+MonoTouch10\AWSSDK.CognitoIdentity.dll</HintPath>
7883
</Reference>
79-
<Reference Include="Xamarin.Forms.Platform.Android">
80-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
81-
</Reference>
82-
<Reference Include="FormsViewGroup">
83-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
84+
<Reference Include="Xamarin.Forms.Core, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
85+
<SpecificVersion>False</SpecificVersion>
86+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
8487
</Reference>
85-
<Reference Include="Xamarin.Forms.Core">
86-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
88+
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
89+
<SpecificVersion>False</SpecificVersion>
90+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
8791
</Reference>
88-
<Reference Include="Xamarin.Forms.Xaml">
89-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
92+
<Reference Include="Xamarin.Forms.Platform.Android, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
93+
<SpecificVersion>False</SpecificVersion>
94+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
9095
</Reference>
91-
<Reference Include="Xamarin.Forms.Platform">
92-
<HintPath>..\packages\Xamarin.Forms.1.4.4.6392\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
96+
<Reference Include="Xamarin.Forms.Xaml, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
97+
<SpecificVersion>False</SpecificVersion>
98+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
9399
</Reference>
94100
</ItemGroup>
95101
<ItemGroup>
@@ -125,5 +131,11 @@
125131
</ItemGroup>
126132
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
127133
<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')" />
128-
<Import Project="..\packages\Xamarin.Forms.1.4.4.6392\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.4.4.6392\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
134+
<Import Project="..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
135+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
136+
<PropertyGroup>
137+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
138+
</PropertyGroup>
139+
<Error Condition="!Exists('..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
140+
</Target>
129141
</Project>

‎WebServices/TodoAWS/Droid/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
<package id="PCLStorage" version="1.0.2" targetFramework="MonoAndroid50" />
1212
<package id="Validation" version="2.0.6.15003" targetFramework="MonoAndroid50" />
1313
<package id="Xamarin.Android.Support.v4" version="22.2.1.0" targetFramework="MonoAndroid50" />
14-
<package id="Xamarin.Forms" version="1.4.4.6392" targetFramework="MonoAndroid50" />
14+
<package id="Xamarin.Forms" version="1.5.0.6446" targetFramework="MonoAndroid50" />
1515
</packages>

0 commit comments

Comments
 (0)