Skip to content

Commit 1fc0c92

Browse files
anaisbettsanaisbetts
committed
Merge pull request #790 from reactiveui/bump-to-xamforms-1.3
Upgrade to Xamarin.Forms 1.3.1
2 parents 6854ed6 + e33c142 commit 1fc0c92

File tree

18 files changed

+117
-76
lines changed

18 files changed

+117
-76
lines changed

‎NuGet/ReactiveUI-XamForms/ReactiveUI-XamForms.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<dependencies>
1414
<dependency id="reactiveui-core" version="[6.3.0]" />
15-
<dependency id="Xamarin.Forms" version="1.2.1.6229" />
15+
<dependency id="Xamarin.Forms" version="1.3.1.6296" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Playground-XamForms.Android/Playground-XamForms.Android.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@
4646
<Reference Include="System.Core" />
4747
<Reference Include="Mono.Android" />
4848
<Reference Include="Xamarin.Forms.Platform.Android">
49-
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
49+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Xamarin.Forms.Core">
52-
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
52+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
5353
</Reference>
5454
<Reference Include="Xamarin.Forms.Xaml">
55-
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
55+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Splat">
5858
<HintPath>..\packages\Splat.1.6.0\lib\monoandroid\Splat.dll</HintPath>
@@ -113,5 +113,5 @@
113113
<AndroidResource Include="Resources\drawable\Icon.png" />
114114
</ItemGroup>
115115
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
116-
<Import Project="../packages/Xamarin.Forms.1.2.1.6229/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.targets" />
116+
<Import Project="../packages/Xamarin.Forms.1.3.1.6296/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.targets" />
117117
</Project>

‎Playground-XamForms.Android/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="MonoAndroid403" />
88
<package id="Splat" version="1.6.0" targetFramework="MonoAndroid403" />
99
<package id="Xamarin.Android.Support.v4" version="19.0.2" targetFramework="MonoAndroid403" />
10-
<package id="Xamarin.Forms" version="1.2.1.6229" targetFramework="MonoAndroid403" />
10+
<package id="Xamarin.Forms" version="1.3.1.6296" targetFramework="MonoAndroid403" />
1111
</packages>

‎Playground-XamForms.iOS/AppDelegate.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
using System.Collections.Generic;
33
using System.Linq;
44

5-
using MonoTouch.Foundation;
6-
using MonoTouch.UIKit;
5+
using Foundation;
6+
using UIKit;
77
using ReactiveUI;
88

99
using Xamarin.Forms;

‎Playground-XamForms.iOS/Main.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.Linq;
44

5-
using MonoTouch.Foundation;
6-
using MonoTouch.UIKit;
5+
using Foundation;
6+
using UIKit;
77

88
namespace PlaygroundXamForms.iOS
99
{

‎Playground-XamForms.iOS/Playground-XamForms.iOS.csproj‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
6-
<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
6+
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
77
<ProjectGuid>{3844D000-B4DE-4539-A22D-F525723150F8}</ProjectGuid>
88
<OutputType>Exe</OutputType>
99
<RootNamespace>PlaygroundXamForms.iOS</RootNamespace>
1010
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
1111
<AssemblyName>PlaygroundXamFormsiOS</AssemblyName>
1212
<ProductVersion>8.0.30703</ProductVersion>
1313
<SchemaVersion>2.0</SchemaVersion>
14+
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
15+
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
1416
</PropertyGroup>
1517
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
1618
<DebugSymbols>true</DebugSymbols>
@@ -41,6 +43,7 @@
4143
<MtouchI18n>
4244
</MtouchI18n>
4345
<MtouchArch>ARMv7</MtouchArch>
46+
<CodesignKey>iPhone Developer</CodesignKey>
4447
</PropertyGroup>
4548
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
4649
<DebugSymbols>true</DebugSymbols>
@@ -54,6 +57,7 @@
5457
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
5558
<MtouchDebug>true</MtouchDebug>
5659
<CodesignKey>iPhone Developer</CodesignKey>
60+
<MtouchArch>ARMv7</MtouchArch>
5761
</PropertyGroup>
5862
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
5963
<DebugType>full</DebugType>
@@ -68,7 +72,7 @@
6872
<MtouchLink>None</MtouchLink>
6973
<MtouchI18n>
7074
</MtouchI18n>
71-
<MtouchArch>ARMv7</MtouchArch>
75+
<MtouchArch>ARMv7, ARM64</MtouchArch>
7276
</PropertyGroup>
7377
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
7478
<DebugType>full</DebugType>
@@ -82,6 +86,7 @@
8286
<BuildIpa>true</BuildIpa>
8387
<CodesignProvision>Automatic:AdHoc</CodesignProvision>
8488
<CodesignKey>iPhone Distribution</CodesignKey>
89+
<MtouchArch>ARMv7, ARM64</MtouchArch>
8590
</PropertyGroup>
8691
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
8792
<DebugType>full</DebugType>
@@ -94,21 +99,12 @@
9499
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
95100
<CodesignProvision>Automatic:AppStore</CodesignProvision>
96101
<CodesignKey>iPhone Distribution</CodesignKey>
102+
<MtouchArch>ARMv7, ARM64</MtouchArch>
97103
</PropertyGroup>
98104
<ItemGroup>
99105
<Reference Include="System" />
100106
<Reference Include="System.Xml" />
101107
<Reference Include="System.Core" />
102-
<Reference Include="monotouch" />
103-
<Reference Include="Xamarin.Forms.Platform.iOS">
104-
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoTouch10\Xamarin.Forms.Platform.iOS.dll</HintPath>
105-
</Reference>
106-
<Reference Include="Xamarin.Forms.Core">
107-
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
108-
</Reference>
109-
<Reference Include="Xamarin.Forms.Xaml">
110-
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
111-
</Reference>
112108
<Reference Include="System.Reactive.Interfaces">
113109
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
114110
</Reference>
@@ -121,7 +117,18 @@
121117
<Reference Include="System.Reactive.PlatformServices">
122118
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
123119
</Reference>
120+
<Reference Include="Xamarin.iOS" />
121+
<Reference Include="Xamarin.Forms.Core">
122+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
123+
</Reference>
124+
<Reference Include="Xamarin.Forms.Platform.iOS">
125+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
126+
</Reference>
127+
<Reference Include="Xamarin.Forms.Xaml">
128+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
129+
</Reference>
124130
<Reference Include="Splat">
131+
<HintPath>..\packages\Splat.1.6.0\lib\Xamarin.iOS10\Splat.dll</HintPath>
125132
<HintPath>..\packages\Splat.1.6.0\lib\monotouch\Splat.dll</HintPath>
126133
</Reference>
127134
</ItemGroup>
@@ -130,22 +137,22 @@
130137
<Project>{EE4BDA1D-EB01-4A45-8525-D996A0F0F6AC}</Project>
131138
<Name>Playground-XamForms</Name>
132139
</ProjectReference>
133-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_iOS.csproj">
134-
<Project>{9091337A-9E94-4DBD-801E-15E1FDA78FFC}</Project>
135-
<Name>ReactiveUI_iOS</Name>
136-
</ProjectReference>
137140
<ProjectReference Include="..\ReactiveUI.XamForms\ReactiveUI.XamForms.csproj">
138141
<Project>{864CB812-199F-401B-BE4C-E8F0515CD19D}</Project>
139142
<Name>ReactiveUI.XamForms</Name>
140143
</ProjectReference>
141-
<ProjectReference Include="..\ReactiveUI.Events\ReactiveUI.Events_iOS_XS.csproj">
142-
<Project>{334E6DAC-0D70-4CE0-80CB-DFD3147DBE18}</Project>
143-
<Name>ReactiveUI.Events_iOS_XS</Name>
144-
</ProjectReference>
145144
<ProjectReference Include="..\ReactiveUI.Events\ReactiveUI.Events_XamForms_XS.csproj">
146145
<Project>{864CBF13-F9AF-401B-BE4C-E8F0515CD19D}</Project>
147146
<Name>ReactiveUI.Events_XamForms_XS</Name>
148147
</ProjectReference>
148+
<ProjectReference Include="..\ReactiveUI\ReactiveUI_iOS64.csproj">
149+
<Project>{AF913370-A394-4DBD-801E-15E1FDA78FFC}</Project>
150+
<Name>ReactiveUI_iOS64</Name>
151+
</ProjectReference>
152+
<ProjectReference Include="..\ReactiveUI.Events\ReactiveUI.Events_iOS64.csproj">
153+
<Project>{334E6DAA-1D70-4CE0-80CB-DFD3147DBE18}</Project>
154+
<Name>ReactiveUI.Events_iOS64</Name>
155+
</ProjectReference>
149156
</ItemGroup>
150157
<ItemGroup>
151158
<BundleResource Include="Resources\Default-568h%402x.png" />
@@ -159,7 +166,6 @@
159166
<Compile Include="Main.cs" />
160167
<Compile Include="AppDelegate.cs" />
161168
</ItemGroup>
162-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
163-
<Import Project="../packages/Xamarin.Forms.1.2.1.6229/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.targets" />
164-
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
169+
<Import Project="../packages/Xamarin.Forms.1.3.1.6296/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.targets" />
170+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
165171
</Project>

‎Playground-XamForms.iOS/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<package id="Rx-Main" version="2.2.5" targetFramework="MonoTouch10" />
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="MonoTouch10" />
88
<package id="Splat" version="1.6.0" targetFramework="MonoTouch10" />
9-
<package id="Xamarin.Forms" version="1.2.1.6229" targetFramework="MonoTouch10" />
9+
<package id="Xamarin.Forms" version="1.3.1.6296" targetFramework="MonoTouch10" />
1010
</packages>

‎Playground-XamForms/Playground-XamForms.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,8 @@
4949
</Compile>
5050
</ItemGroup>
5151
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
52-
<Import Project="../packages/Xamarin.Forms.1.2.1.6229/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.targets" />
52+
<Import Project="../packages/Xamarin.Forms.1.3.1.6296/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.targets" />
5353
<ItemGroup>
54-
<Reference Include="Xamarin.Forms.Core">
55-
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
56-
</Reference>
57-
<Reference Include="Xamarin.Forms.Xaml">
58-
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
59-
</Reference>
6054
<Reference Include="Splat">
6155
<HintPath>..\packages\Splat.1.6.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
6256
</Reference>
@@ -72,6 +66,12 @@
7266
<Reference Include="System.Reactive.PlatformServices">
7367
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
7468
</Reference>
69+
<Reference Include="Xamarin.Forms.Core">
70+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
71+
</Reference>
72+
<Reference Include="Xamarin.Forms.Xaml">
73+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
74+
</Reference>
7575
</ItemGroup>
7676
<ItemGroup>
7777
<None Include="packages.config" />

‎Playground-XamForms/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
88
<package id="Splat" version="1.6.0" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
9-
<package id="Xamarin.Forms" version="1.2.1.6229" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
9+
<package id="Xamarin.Forms" version="1.3.1.6296" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
1010
</packages>

‎ReactiveUI.Events/ReactiveUI.Events_Mac.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<EnablePackageSigning>false</EnablePackageSigning>
4343
<IncludeMonoRuntime>false</IncludeMonoRuntime>
4444
<UseSGen>false</UseSGen>
45+
<UseRefCounting>false</UseRefCounting>
4546
</PropertyGroup>
4647
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4748
<Optimize>True</Optimize>
@@ -61,6 +62,7 @@
6162
<EnablePackageSigning>false</EnablePackageSigning>
6263
<IncludeMonoRuntime>false</IncludeMonoRuntime>
6364
<UseSGen>false</UseSGen>
65+
<UseRefCounting>false</UseRefCounting>
6466
</PropertyGroup>
6567
<ItemGroup>
6668
<Reference Include="System" />

0 commit comments

Comments
 (0)