Skip to content

Commit 24ac93a

Browse files
objorkeobjorke
committed
Merge pull request #5 from scastria/XF2.2
Update to Xamarin.Forms 2.2
2 parents b0a10aa + e1e8213 commit 24ac93a

File tree

46 files changed

+16882
-17453
lines changed

Some content is hidden

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

46 files changed

+16882
-17453
lines changed

‎Source/Examples/Xamarin.Forms/IssueDemos/IssueDemos.Droid/IssueDemos.Droid.csproj

Lines changed: 36 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -48,59 +48,53 @@
4848
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
4949
</PropertyGroup>
5050
<ItemGroup>
51-
<Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.0.0.6490\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
53-
<Private>True</Private>
54-
</Reference>
5551
<Reference Include="Mono.Android" />
5652
<Reference Include="mscorlib" />
57-
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
58-
<HintPath>..\..\..\..\packages\OxyPlot.Core.1.0.0-unstable2146\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
59-
<Private>True</Private>
60-
</Reference>
6153
<Reference Include="System" />
6254
<Reference Include="System.Core" />
6355
<Reference Include="System.Xml.Linq" />
6456
<Reference Include="System.Xml" />
65-
<Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
66-
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.Design.23.0.1.3\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll</HintPath>
67-
<Private>True</Private>
57+
<Reference Include="OxyPlot">
58+
<HintPath>..\..\..\..\packages\OxyPlot.Core.1.0.0-unstable2156\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
59+
</Reference>
60+
<Reference Include="Xamarin.Android.Support.v4">
61+
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
62+
</Reference>
63+
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
64+
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
65+
</Reference>
66+
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
67+
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
68+
</Reference>
69+
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
70+
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
6871
</Reference>
69-
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.v4.23.0.1.3\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
71-
<Private>True</Private>
72+
<Reference Include="Xamarin.Android.Support.v7.RecyclerView">
73+
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
7274
</Reference>
73-
<Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.3\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
75-
<Private>True</Private>
75+
<Reference Include="Xamarin.Android.Support.Design">
76+
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
7677
</Reference>
77-
<Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
78-
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.CardView.23.0.1.3\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
79-
<Private>True</Private>
78+
<Reference Include="Xamarin.Android.Support.v7.CardView">
79+
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
8080
</Reference>
81-
<Reference Include="Xamarin.Android.Support.v7.MediaRouter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
82-
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.0.1.3\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
83-
<Private>True</Private>
81+
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
82+
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
8483
</Reference>
85-
<Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
86-
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.0.1.3\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
87-
<Private>True</Private>
84+
<Reference Include="Xamarin.Forms.Platform.Android">
85+
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.2.0.31\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
8886
</Reference>
89-
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
90-
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.0.0.6490\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
91-
<Private>True</Private>
87+
<Reference Include="FormsViewGroup">
88+
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.2.0.31\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
9289
</Reference>
93-
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
94-
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.0.0.6490\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
95-
<Private>True</Private>
90+
<Reference Include="Xamarin.Forms.Core">
91+
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.2.0.31\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
9692
</Reference>
97-
<Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
98-
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.0.0.6490\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
99-
<Private>True</Private>
93+
<Reference Include="Xamarin.Forms.Xaml">
94+
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.2.0.31\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
10095
</Reference>
101-
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
102-
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.0.0.6490\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
103-
<Private>True</Private>
96+
<Reference Include="Xamarin.Forms.Platform">
97+
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.2.0.31\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
10498
</Reference>
10599
</ItemGroup>
106100
<ItemGroup>
@@ -129,7 +123,7 @@
129123
<Name>OxyPlot.Xamarin.Android</Name>
130124
</ProjectReference>
131125
<ProjectReference Include="..\..\..\..\OxyPlot.Xamarin.Forms.Platform.Android\OxyPlot.Xamarin.Forms.Platform.Android.csproj">
132-
<Project>{8d30d955-f027-4d19-9f71-c197bb665070}</Project>
126+
<Project>{A40AD708-3FF5-42FC-92B0-8D93FF1DB58F}</Project>
133127
<Name>OxyPlot.Xamarin.Forms.Platform.Android</Name>
134128
</ProjectReference>
135129
<ProjectReference Include="..\..\..\..\OxyPlot.Xamarin.Forms\OxyPlot.Xamarin.Forms.csproj">
@@ -138,21 +132,10 @@
138132
</ProjectReference>
139133
<ProjectReference Include="..\IssueDemos\IssueDemos.csproj">
140134
<Name>IssueDemos</Name>
135+
<Project>{65038B31-B6EA-444B-8CE1-741461796632}</Project>
141136
</ProjectReference>
142137
</ItemGroup>
143138
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
144-
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.0.0.6490\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.0.0.6490\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
145-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
146-
<PropertyGroup>
147-
<ErrorText>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}.</ErrorText>
148-
</PropertyGroup>
149-
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.0.0.6490\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.0.0.6490\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
150-
</Target>
151-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
152-
Other similar extension points exist, see Microsoft.Common.targets.
153-
<Target Name="BeforeBuild">
154-
</Target>
155-
<Target Name="AfterBuild">
156-
</Target>
157-
-->
139+
<Import Project="..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
140+
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.2.0.31\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.2.0.31\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
158141
</Project>

0 commit comments

Comments
 (0)