Skip to content

Commit

Permalink
Version bump Xamarin.Forms to 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
anaisbetts committed Apr 6, 2015
1 parent 3f45bdf commit e6a9fcb
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion NuGet/ReactiveUI-XamForms/ReactiveUI-XamForms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<dependencies>
<dependency id="reactiveui-core" version="[6.4.0.1]" />
<dependency id="Xamarin.Forms" version="1.3.1.6296" />
<dependency id="Xamarin.Forms" version="1.4.0.6341" />
</dependencies>
</metadata>
</package>
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.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.4.0.6341\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.4.0.6341\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.4.0.6341\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.3.1.6296/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.targets" />
<Import Project="../packages/Xamarin.Forms.1.4.0.6341/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.targets" />
</Project>
2 changes: 1 addition & 1 deletion Playground-XamForms.Android/packages.config
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.3.1.6296" targetFramework="MonoAndroid403" />
<package id="Xamarin.Forms" version="1.4.0.6341" targetFramework="MonoAndroid403" />
</packages>
8 changes: 4 additions & 4 deletions Playground-XamForms.iOS/Playground-XamForms.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@
</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>
<HintPath>..\packages\Xamarin.Forms.1.4.0.6341\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>
<HintPath>..\packages\Xamarin.Forms.1.4.0.6341\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>
<HintPath>..\packages\Xamarin.Forms.1.4.0.6341\lib\MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.6.0\lib\Xamarin.iOS10\Splat.dll</HintPath>
Expand Down Expand Up @@ -165,6 +165,6 @@
<Compile Include="Main.cs" />
<Compile Include="AppDelegate.cs" />
</ItemGroup>
<Import Project="../packages/Xamarin.Forms.1.3.1.6296/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.targets" />
<Import Project="../packages/Xamarin.Forms.1.4.0.6341/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
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.3.1.6296" targetFramework="MonoTouch10" />
<package id="Xamarin.Forms" version="1.4.0.6341" targetFramework="MonoTouch10" />
</packages>
6 changes: 3 additions & 3 deletions Playground-XamForms/Playground-XamForms.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</Compile>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.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="../packages/Xamarin.Forms.1.4.0.6341/build/portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.targets" />
<ItemGroup>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.6.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
Expand All @@ -67,10 +67,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.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.4.0.6341\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>
<HintPath>..\packages\Xamarin.Forms.1.4.0.6341\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Playground-XamForms/packages.config
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.3.1.6296" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
<package id="Xamarin.Forms" version="1.4.0.6341" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
</packages>
6 changes: 3 additions & 3 deletions ReactiveUI.Events/ReactiveUI.Events_XamForms_XS.csproj
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.3.1.6296/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.4.0.6341/lib/portable-win+net45+wp80+MonoAndroid10+MonoTouch10/Xamarin.Forms.Core.dll" workingdir="${ProjectDir}" />
</CustomCommands>
</CustomCommands>
</PropertyGroup>
Expand Down Expand Up @@ -68,10 +68,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.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.4.0.6341\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\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.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.4.0.6341\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions ReactiveUI.XamForms/ReactiveUI.XamForms.csproj
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.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.1.4.0.6341\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>
<HintPath>..\packages\Xamarin.Forms.1.4.0.6341\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.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')" />
<Import Project="..\packages\Xamarin.Forms.1.4.0.6341\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.4.0.6341\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
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.3.1.6296" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
<package id="Xamarin.Forms" version="1.4.0.6341" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
</packages>

0 comments on commit e6a9fcb

Please sign in to comment.