Skip to content

Upgrade to Xamarin.Forms 1.3.1 #790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 13, 2015
Merged

Upgrade to Xamarin.Forms 1.3.1 #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80d9913
Version bump Xamarin Forms to 1.3.1
anaisbetts Jan 3, 2015
8d9eaac
Version bump Splat to 1.6.0
anaisbetts Jan 13, 2015
8099657
Update some stuff
anaisbetts Jan 13, 2015
e33c142
Merge remote-tracking branch 'origin/master' into bump-to-xamforms-1.3
anaisbetts Jan 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NuGet/ReactiveUI-XamForms/ReactiveUI-XamForms.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<dependencies>
<dependency id="reactiveui-core" version="[6.3.0]" />
<dependency id="Xamarin.Forms" version="1.2.1.6229" />
<dependency id="Xamarin.Forms" version="1.3.1.6296" />
</dependencies>
</metadata>
</package>
8 changes: 4 additions & 4 deletions Playground-XamForms.Android/Playground-XamForms.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.6.0\lib\monoandroid\Splat.dll</HintPath>
Expand Down Expand Up @@ -113,5 +113,5 @@
<AndroidResource Include="Resources\drawable\Icon.png" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
<Import Project="../packages/Xamarin.Forms.1.2.1.6229/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.targets" />
<Import Project="../packages/Xamarin.Forms.1.3.1.6296/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.targets" />
</Project>
2 changes: 1 addition & 1 deletion Playground-XamForms.Android/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="MonoAndroid403" />
<package id="Splat" version="1.6.0" targetFramework="MonoAndroid403" />
<package id="Xamarin.Android.Support.v4" version="19.0.2" targetFramework="MonoAndroid403" />
<package id="Xamarin.Forms" version="1.2.1.6229" targetFramework="MonoAndroid403" />
<package id="Xamarin.Forms" version="1.3.1.6296" targetFramework="MonoAndroid403" />
</packages>
4 changes: 2 additions & 2 deletions Playground-XamForms.iOS/AppDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Linq;

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

using Xamarin.Forms;
Expand Down
6 changes: 3 additions & 3 deletions Playground-XamForms.iOS/Main.cs
View file
Open in desktop
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 PlaygroundXamForms.iOS
{
Expand Down
52 changes: 29 additions & 23 deletions Playground-XamForms.iOS/Playground-XamForms.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
<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>{3844D000-B4DE-4539-A22D-F525723150F8}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>PlaygroundXamForms.iOS</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>PlaygroundXamFormsiOS</AssemblyName>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -41,6 +43,7 @@
<MtouchI18n>
</MtouchI18n>
<MtouchArch>ARMv7</MtouchArch>
<CodesignKey>iPhone Developer</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -54,6 +57,7 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchArch>ARMv7</MtouchArch>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>full</DebugType>
Expand All @@ -68,7 +72,7 @@
<MtouchLink>None</MtouchLink>
<MtouchI18n>
</MtouchI18n>
<MtouchArch>ARMv7</MtouchArch>
<MtouchArch>ARMv7, ARM64</MtouchArch>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
<DebugType>full</DebugType>
Expand All @@ -82,6 +86,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 @@ -94,21 +99,12 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignProvision>Automatic:AppStore</CodesignProvision>
<CodesignKey>iPhone Distribution</CodesignKey>
<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">
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoTouch10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
</Reference>
Expand All @@ -121,7 +117,18 @@
<Reference Include="System.Reactive.PlatformServices">
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="Xamarin.iOS" />
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.6.0\lib\Xamarin.iOS10\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.6.0\lib\monotouch\Splat.dll</HintPath>
</Reference>
</ItemGroup>
Expand All @@ -130,22 +137,22 @@
<Project>{EE4BDA1D-EB01-4A45-8525-D996A0F0F6AC}</Project>
<Name>Playground-XamForms</Name>
</ProjectReference>
<ProjectReference Include="..\ReactiveUI\ReactiveUI_iOS.csproj">
<Project>{9091337A-9E94-4DBD-801E-15E1FDA78FFC}</Project>
<Name>ReactiveUI_iOS</Name>
</ProjectReference>
<ProjectReference Include="..\ReactiveUI.XamForms\ReactiveUI.XamForms.csproj">
<Project>{864CB812-199F-401B-BE4C-E8F0515CD19D}</Project>
<Name>ReactiveUI.XamForms</Name>
</ProjectReference>
<ProjectReference Include="..\ReactiveUI.Events\ReactiveUI.Events_iOS_XS.csproj">
<Project>{334E6DAC-0D70-4CE0-80CB-DFD3147DBE18}</Project>
<Name>ReactiveUI.Events_iOS_XS</Name>
</ProjectReference>
<ProjectReference Include="..\ReactiveUI.Events\ReactiveUI.Events_XamForms_XS.csproj">
<Project>{864CBF13-F9AF-401B-BE4C-E8F0515CD19D}</Project>
<Name>ReactiveUI.Events_XamForms_XS</Name>
</ProjectReference>
<ProjectReference Include="..\ReactiveUI\ReactiveUI_iOS64.csproj">
<Project>{AF913370-A394-4DBD-801E-15E1FDA78FFC}</Project>
<Name>ReactiveUI_iOS64</Name>
</ProjectReference>
<ProjectReference Include="..\ReactiveUI.Events\ReactiveUI.Events_iOS64.csproj">
<Project>{334E6DAA-1D70-4CE0-80CB-DFD3147DBE18}</Project>
<Name>ReactiveUI.Events_iOS64</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Default-568h%402x.png" />
Expand All @@ -159,7 +166,6 @@
<Compile Include="Main.cs" />
<Compile Include="AppDelegate.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="../packages/Xamarin.Forms.1.2.1.6229/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.targets" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
<Import Project="../packages/Xamarin.Forms.1.3.1.6296/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.targets" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
2 changes: 1 addition & 1 deletion Playground-XamForms.iOS/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
<package id="Rx-Main" version="2.2.5" targetFramework="MonoTouch10" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="MonoTouch10" />
<package id="Splat" version="1.6.0" targetFramework="MonoTouch10" />
<package id="Xamarin.Forms" version="1.2.1.6229" targetFramework="MonoTouch10" />
<package id="Xamarin.Forms" version="1.3.1.6296" targetFramework="MonoTouch10" />
</packages>
14 changes: 7 additions & 7 deletions Playground-XamForms/Playground-XamForms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,8 @@
</Compile>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="../packages/Xamarin.Forms.1.2.1.6229/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.targets" />
<Import Project="../packages/Xamarin.Forms.1.3.1.6296/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.targets" />
<ItemGroup>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.6.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
</Reference>
Expand All @@ -72,6 +66,12 @@
<Reference Include="System.Reactive.PlatformServices">
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
Expand Down
2 changes: 1 addition & 1 deletion Playground-XamForms/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
<package id="Splat" version="1.6.0" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
<package id="Xamarin.Forms" version="1.2.1.6229" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
<package id="Xamarin.Forms" version="1.3.1.6296" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
</packages>
2 changes: 2 additions & 0 deletions ReactiveUI.Events/ReactiveUI.Events_Mac.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<EnablePackageSigning>false</EnablePackageSigning>
<IncludeMonoRuntime>false</IncludeMonoRuntime>
<UseSGen>false</UseSGen>
<UseRefCounting>false</UseRefCounting>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>True</Optimize>
Expand All @@ -61,6 +62,7 @@
<EnablePackageSigning>false</EnablePackageSigning>
<IncludeMonoRuntime>false</IncludeMonoRuntime>
<UseSGen>false</UseSGen>
<UseRefCounting>false</UseRefCounting>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
7 changes: 3 additions & 4 deletions ReactiveUI.Events/ReactiveUI.Events_XamForms_XS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<SchemaVersion>2.0</SchemaVersion>
<CustomCommands>
<CustomCommands>
<Command type="BeforeBuild" command="/usr/bin/env ruby ${ProjectDir}/generate_events.rb ${ProjectDir}/../packages/Xamarin.Forms.1.2.1.6229/lib/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.Core.dll" workingdir="${ProjectDir}" />
<Command type="BeforeBuild" command="/usr/bin/env ruby ${ProjectDir}/generate_events.rb ${ProjectDir}/../packages/Xamarin.Forms.1.3.1.6296/lib/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.Core.dll" workingdir="${ProjectDir}" />
</CustomCommands>
</CustomCommands>
</PropertyGroup>
Expand Down Expand Up @@ -68,18 +68,17 @@
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Events.cs" />
<Compile Include="Shims.cs" />
<Compile Include="SingleAwaitSubject.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
Expand Down
3 changes: 0 additions & 3 deletions ReactiveUI.Events/ReactiveUI.Events_iOS64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@
<ItemGroup>
<None Include="packages.ReactiveUI.Events_iOS64.config" />
</ItemGroup>

<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

<!-- Visual Studio -->
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
<PreBuildEvent>%25SystemRoot%25\Microsoft.NET\Framework\v4.0.30319\msbuild.exe /p:Configuration=Release "$(ProjectDir)EventBuilder.csproj"
Expand All @@ -85,7 +83,6 @@ del "$(ProjectDir)Nustache.Core.dll"
del "$(ProjectDir)Mono.Cecil.dll"
del "$(ProjectDir)Mono.Cecil.pdb"</PreBuildEvent>
</PropertyGroup>

<!-- Xamarin Studio -->
<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
<PreBuildEvent>/usr/bin/env ruby "$(ProjectDir)/generate_events.rb" "/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/mono/Xamarin.iOS/Xamarin.iOS.dll" &amp;&amp; mv Events.cs ../../..</PreBuildEvent>
Expand Down
21 changes: 0 additions & 21 deletions ReactiveUI.Events/Shims.cs
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ReactiveUI.Tests/ReactiveUI.Tests_iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<DefineConstants>MONO</DefineConstants>
<AssemblyName>ReactiveUI_Tests_iOS</AssemblyName>
<CodesignKey>iPhone Developer</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
6 changes: 3 additions & 3 deletions ReactiveUI.XamForms/ReactiveUI.XamForms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -83,7 +83,7 @@
<Compile Include="XamForms\RoutedViewHost.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="..\packages\Xamarin.Forms.1.2.1.6229\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.2.1.6229\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Forms.1.3.1.6296\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.1.6296\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
2 changes: 1 addition & 1 deletion ReactiveUI.XamForms/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
<package id="Rx-Main" version="2.2.5" targetFramework="net45" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
<package id="Splat" version="1.6.0" targetFramework="net45" />
<package id="Xamarin.Forms" version="1.2.1.6229" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
<package id="Xamarin.Forms" version="1.3.1.6296" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
</packages>
2 changes: 2 additions & 0 deletions ReactiveUI/ReactiveUI_Mac.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<CreatePackage>False</CreatePackage>
<CodeSigningKey>Mac Developer</CodeSigningKey>
<UseSGen>False</UseSGen>
<UseRefCounting>false</UseRefCounting>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>True</Optimize>
Expand All @@ -47,6 +48,7 @@
<DebugSymbols>true</DebugSymbols>
<GenerateDocumentation>True</GenerateDocumentation>
<DocumentationFile>bin\Release\MonoMac\ReactiveUI.xml</DocumentationFile>
<UseRefCounting>false</UseRefCounting>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
Loading