Skip to content

Commit 362ce5d

Browse files
committed
Merge pull request reactiveui#747 from reactiveui/xam-ios-64bit
Xamarin.iOS 64bit-support
2 parents 53ced8e + 05c92fc commit 362ce5d

File tree

135 files changed

+1024
-239
lines changed

Some content is hidden

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

135 files changed

+1024
-239
lines changed

MakeRelease.ps1

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Param([string]$version = $null)
22

3-
$Archs = {"Portable-Net45+WinRT45+WP8+MonoAndroid10+MonoTouch10", "Portable-Net45+Win8+WP8+WPA81", "Net45", "WP8", "WP81", "Win8", "Win81", "Mono", "Monoandroid", "Monotouch", "Monomac", "Portable-Win81+Wpa81", "WPA81"}
3+
$Archs = {"Portable-Net45+WinRT45+WP8+MonoAndroid10+MonoTouch10", "Portable-Net45+Win8+WP8+WPA81", "Net45", "WP8",
4+
"WP81", "Win8", "Win81", "Mono", "Monoandroid", "Monotouch", "Monomac", "Portable-Win81+Wpa81", "WPA81",
5+
"Xamarin.iOS10"}
46

57
$Projects = {
68
"ReactiveUI", "ReactiveUI.Testing", "ReactiveUI.Blend", "ReactiveUI.Winforms",
@@ -33,10 +35,12 @@ foreach-object $Archs | %{
3335
$currentArch = $_
3436

3537
foreach-object $Projects | %{cp -r -fo ".\$_\bin\Release\$currentArch\*" ".\Release\$currentArch"}
36-
# WinRT projects need to have the Themes folder in a special sub folder named as the project name
37-
foreach-object $Projects | %{cp -r -fo ".\$_\bin\Release\$currentArch\Themes" ".\Release\$currentArch\$_\Themes"}
38-
# WinRT projects need this .xr.xml file in a special sub folder named as the project name
39-
foreach-object $Projects | %{cp -r -fo ".\$_\bin\Release\$currentArch\$_.xr.xml" ".\Release\$currentArch\$_"}
38+
39+
# WinRT projects need to have the Themes folder in a special sub folder named as the project name
40+
foreach-object $Projects | %{cp -r -fo ".\$_\bin\Release\$currentArch\Themes" ".\Release\$currentArch\$_\Themes"}
41+
42+
# WinRT projects need this .xr.xml file in a special sub folder named as the project name
43+
foreach-object $Projects | %{cp -r -fo ".\$_\bin\Release\$currentArch\$_.xr.xml" ".\Release\$currentArch\$_"}
4044

4145
#ls -r | ?{$_.FullName.Contains("bin\Release\$currentArch") -and $_.Length} | %{echo cp $_.FullName ".\Release\$currentArch"}
4246
}
@@ -86,8 +90,8 @@ $nugetReleaseDir = Resolve-Path ".\NuGet-Release"
8690

8791
# copy binaries
8892
foreach ($dir in $libDirs) {
89-
# only copy binaries which have a matching file in the destination folder
90-
robocopy ".\Release" $dir.FullName /S /XL
93+
# only copy binaries which have a matching file in the destination folder
94+
robocopy ".\Release" $dir.FullName /S /XL
9195
}
9296

9397
# copy tools
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{A4BA5B4E-257A-42A7-BDAB-1FB40A903909}</ProjectGuid>
9+
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10+
<OutputType>Library</OutputType>
11+
<RootNamespace>Microsoft.Reactive.Testing</RootNamespace>
12+
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
13+
<AssemblyName>Microsoft.Reactive.Testing</AssemblyName>
14+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15+
<RestorePackages>true</RestorePackages>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18+
<DebugSymbols>true</DebugSymbols>
19+
<DebugType>full</DebugType>
20+
<Optimize>false</Optimize>
21+
<OutputPath>bin\Debug\Xamarin.iOS10</OutputPath>
22+
<IntermediateOutputPath>obj\Debug\Xamarin.iOS10</IntermediateOutputPath>
23+
<DefineConstants>DEBUG;UNIFIED</DefineConstants>
24+
<ErrorReport>prompt</ErrorReport>
25+
<WarningLevel>4</WarningLevel>
26+
<ConsolePause>false</ConsolePause>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<DebugType>none</DebugType>
30+
<Optimize>true</Optimize>
31+
<OutputPath>bin\Release\Xamarin.iOS10</OutputPath>
32+
<IntermediateOutputPath>obj\Release\Xamarin.iOS10</IntermediateOutputPath>
33+
<DefineConstants>UNIFIED</DefineConstants>
34+
<ErrorReport>prompt</ErrorReport>
35+
<WarningLevel>4</WarningLevel>
36+
<ConsolePause>false</ConsolePause>
37+
<CodesignKey>iPhone Developer</CodesignKey>
38+
</PropertyGroup>
39+
<ItemGroup>
40+
<Reference Include="System" />
41+
<Reference Include="System.Xml" />
42+
<Reference Include="System.Core" />
43+
<Reference Include="Xamarin.iOS" />
44+
<Reference Include="System.Reactive.Core">
45+
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
46+
</Reference>
47+
<Reference Include="System.Reactive.Interfaces">
48+
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
49+
</Reference>
50+
<Reference Include="System.Reactive.Linq">
51+
<HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
52+
</Reference>
53+
<Reference Include="System.Reactive.PlatformServices">
54+
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
55+
</Reference>
56+
</ItemGroup>
57+
<ItemGroup>
58+
<Folder Include="Resources\" />
59+
</ItemGroup>
60+
<ItemGroup>
61+
<Compile Include="ColdObservable.cs" />
62+
<Compile Include="GlobalSuppressions.cs" />
63+
<Compile Include="HotObservable.cs" />
64+
<Compile Include="ITestObservable.cs" />
65+
<Compile Include="ITestObserver.cs" />
66+
<Compile Include="MockObserver.cs" />
67+
<Compile Include="NamespaceDoc.cs" />
68+
<Compile Include="ReactiveTest.cs" />
69+
<Compile Include="Recorded.cs" />
70+
<Compile Include="Subscription.cs" />
71+
<Compile Include="TestScheduler.cs" />
72+
</ItemGroup>
73+
<ItemGroup>
74+
<None Include="packages.Microsoft.Reactive.Testing_iOS.config" />
75+
</ItemGroup>
76+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
77+
</Project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Rx-Core" version="2.2.5" targetFramework="Xamarin.iOS10" />
4+
<package id="Rx-Interfaces" version="2.2.5" targetFramework="Xamarin.iOS10" />
5+
<package id="Rx-Linq" version="2.2.5" targetFramework="Xamarin.iOS10" />
6+
<package id="Rx-Main" version="2.2.5" targetFramework="Xamarin.iOS10" />
7+
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="Xamarin.iOS10" />
8+
</packages>

NuGet/ReactiveUI-Core/ReactiveUI-Core.nuspec

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,28 @@
1212
<dependencies>
1313
<group>
1414
<dependency id="Rx-Main" version="2.2.5" />
15-
<dependency id="Splat" version="1.5.0" />
15+
<dependency id="Splat" version="1.5.1" />
1616
</group>
1717
<group targetFramework="win8">
1818
<dependency id="Rx-Main" version="2.2.5" />
19-
<dependency id="Splat" version="1.5.0" />
19+
<dependency id="Splat" version="1.5.1" />
2020
<dependency id="Rx-Xaml" version="2.2.5" />
2121
<dependency id="Rx-WinRT" version="2.2.5" />
2222
</group>
2323
<group targetFramework="wp8">
2424
<dependency id="Rx-Main" version="2.2.5" />
25-
<dependency id="Splat" version="1.5.0" />
25+
<dependency id="Splat" version="1.5.1" />
2626
<dependency id="Rx-Xaml" version="2.2.5" />
2727
<dependency id="Rx-WinRT" version="2.2.5" />
2828
</group>
2929
<group targetFramework="net45">
3030
<dependency id="Rx-Main" version="2.2.5" />
31-
<dependency id="Splat" version="1.5.0" />
31+
<dependency id="Splat" version="1.5.1" />
3232
<dependency id="Rx-Xaml" version="2.2.5" />
3333
</group>
3434
<group targetFramework="Portable-Win81+Wpa81">
3535
<dependency id="Rx-Main" version="2.2.5" />
36-
<dependency id="Splat" version="1.5.0" />
36+
<dependency id="Splat" version="1.5.1" />
3737
<dependency id="Rx-Xaml" version="2.2.5" />
3838
<dependency id="Rx-WinRT" version="2.2.5" />
3939
</group>

NuGet/ReactiveUI-Core/lib/Xamarin.iOS10/ReactiveUI.dll

Whitespace-only changes.

NuGet/ReactiveUI-Core/lib/Xamarin.iOS10/ReactiveUI.dll.mdb

Whitespace-only changes.

NuGet/ReactiveUI-Core/lib/Xamarin.iOS10/ReactiveUI.xml

Whitespace-only changes.

NuGet/ReactiveUI-Events/lib/Xamarin.iOS10/ReactiveUI.Events.dll

Whitespace-only changes.

NuGet/ReactiveUI-Events/lib/Xamarin.iOS10/ReactiveUI.Events.dll.mdb

Whitespace-only changes.

NuGet/ReactiveUI-Events/lib/Xamarin.iOS10/ReactiveUI.Events.xml

Whitespace-only changes.

NuGet/ReactiveUI-Testing/lib/Xamarin.iOS10/ReactiveUI.Testing.dll

Whitespace-only changes.

NuGet/ReactiveUI-Testing/lib/Xamarin.iOS10/ReactiveUI.Testing.dll.mdb

Whitespace-only changes.

NuGet/ReactiveUI-Testing/lib/Xamarin.iOS10/ReactiveUI.Testing.xml

Whitespace-only changes.

Playground-Android/Playground-Android.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>8.0.30703</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{D444AA58-1C6B-4CEE-B5F5-76145E0B86E5}</ProjectGuid>
8+
<ProjectGuid>{D444AA58-1C6B-4CEE-B5F5-761.5.1B86E5}</ProjectGuid>
99
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1010
<OutputType>Library</OutputType>
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -41,9 +41,9 @@
4141
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="Splat, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44+
<Reference Include="Splat">
4545
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\packages\Splat.1.3.3\lib\monoandroid\Splat.dll</HintPath>
46+
<HintPath>..\packages\Splat.1.5.1\lib\monoandroid\Splat.dll</HintPath>
4747
</Reference>
4848
<Reference Include="System" />
4949
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -111,4 +111,4 @@
111111
<Target Name="AfterBuild">
112112
</Target>
113113
-->
114-
</Project>
114+
</Project>

Playground-Android/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
<package id="Rx-Linq" version="2.2.5" targetFramework="MonoAndroid403" />
66
<package id="Rx-Main" version="2.2.5" targetFramework="MonoAndroid403" />
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="MonoAndroid403" />
8-
<package id="Splat" version="1.3.3" targetFramework="MonoAndroid403" />
9-
</packages>
8+
<package id="Splat" version="1.5.1" targetFramework="MonoAndroid403" />
9+
</packages>

Playground-Wpa81/Playground-Wpa81.Windows/Playground-Wpa81.Windows.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@
130130
</Page>
131131
</ItemGroup>
132132
<ItemGroup>
133-
<Reference Include="Splat, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
133+
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
134134
<SpecificVersion>False</SpecificVersion>
135-
<HintPath>..\..\packages\Splat.1.3.3\lib\NetCore45\Splat.dll</HintPath>
135+
<HintPath>..\..\packages\Splat.1.5.1\lib\NetCore45\Splat.dll</HintPath>
136136
</Reference>
137137
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
138138
<SpecificVersion>False</SpecificVersion>
@@ -177,4 +177,4 @@
177177
<Target Name="AfterBuild">
178178
</Target>
179179
-->
180-
</Project>
180+
</Project>

Playground-Wpa81/Playground-Wpa81.Windows/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="win81" />
88
<package id="Rx-WinRT" version="2.2.5" targetFramework="win81" />
99
<package id="Rx-Xaml" version="2.2.5" targetFramework="win81" />
10-
<package id="Splat" version="1.3.3" targetFramework="win81" />
11-
</packages>
10+
<package id="Splat" version="1.5.1" targetFramework="win81" />
11+
</packages>

Playground-Wpa81/Playground-Wpa81.WindowsPhone/Playground-Wpa81.WindowsPhone.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<ItemGroup>
110110
<Reference Include="Splat, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
111111
<SpecificVersion>False</SpecificVersion>
112-
<HintPath>..\..\packages\Splat.1.3.3\lib\Portable-Win81+Wpa81\Splat.dll</HintPath>
112+
<HintPath>..\..\packages\Splat.1.5.1\lib\Portable-Win81+Wpa81\Splat.dll</HintPath>
113113
</Reference>
114114
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115115
<SpecificVersion>False</SpecificVersion>
@@ -160,4 +160,4 @@
160160
<Target Name="AfterBuild">
161161
</Target>
162162
-->
163-
</Project>
163+
</Project>

Playground-Wpa81/Playground-Wpa81.WindowsPhone/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="wpa81" />
88
<package id="Rx-WinRT" version="2.2.5" targetFramework="wpa81" />
99
<package id="Rx-Xaml" version="2.2.5" targetFramework="wpa81" />
10-
<package id="Splat" version="1.3.3" targetFramework="wpa81" />
11-
</packages>
10+
<package id="Splat" version="1.5.1" targetFramework="wpa81" />
11+
</packages>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Splat">
58-
<HintPath>..\packages\Splat.1.3.3\lib\monoandroid\Splat.dll</HintPath>
58+
<HintPath>..\packages\Splat.1.5.1\lib\monoandroid\Splat.dll</HintPath>
5959
</Reference>
6060
<Reference Include="System.Reactive.Interfaces">
6161
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>

Playground-XamForms.Android/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Rx-Linq" version="2.2.5" targetFramework="MonoAndroid403" />
66
<package id="Rx-Main" version="2.2.5" targetFramework="MonoAndroid403" />
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="MonoAndroid403" />
8-
<package id="Splat" version="1.3.3" targetFramework="MonoAndroid403" />
8+
<package id="Splat" version="1.5.1" targetFramework="MonoAndroid403" />
99
<package id="Xamarin.Android.Support.v4" version="19.0.2" targetFramework="MonoAndroid403" />
1010
<package id="Xamarin.Forms" version="1.2.1.6229" targetFramework="MonoAndroid403" />
1111
</packages>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
123123
</Reference>
124124
<Reference Include="Splat">
125-
<HintPath>..\packages\Splat.1.3.3\lib\monotouch\Splat.dll</HintPath>
125+
<HintPath>..\packages\Splat.1.5.1\lib\monotouch\Splat.dll</HintPath>
126126
</Reference>
127127
</ItemGroup>
128128
<ItemGroup>

Playground-XamForms.iOS/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<package id="Rx-Linq" version="2.2.5" targetFramework="MonoTouch10" />
66
<package id="Rx-Main" version="2.2.5" targetFramework="MonoTouch10" />
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="MonoTouch10" />
8-
<package id="Splat" version="1.3.3" targetFramework="MonoTouch10" />
8+
<package id="Splat" version="1.5.1" targetFramework="MonoTouch10" />
99
<package id="Xamarin.Forms" version="1.2.1.6229" targetFramework="MonoTouch10" />
1010
</packages>

Playground-XamForms/Playground-XamForms.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<HintPath>..\packages\Xamarin.Forms.1.2.1.6229\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.Xaml.dll</HintPath>
5959
</Reference>
6060
<Reference Include="Splat">
61-
<HintPath>..\packages\Splat.1.3.3\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
61+
<HintPath>..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
6262
</Reference>
6363
<Reference Include="System.Reactive.Interfaces">
6464
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>

Playground-XamForms/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
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" />
8-
<package id="Splat" version="1.3.3" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
8+
<package id="Splat" version="1.5.1" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
99
<package id="Xamarin.Forms" version="1.2.1.6229" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
1010
</packages>

Playground-iOS/Playground-iOS.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<ItemGroup>
9191
<Reference Include="Splat, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
9292
<SpecificVersion>False</SpecificVersion>
93-
<HintPath>..\packages\Splat.1.3.3\lib\monotouch\Splat.dll</HintPath>
93+
<HintPath>..\packages\Splat.1.5.1\lib\monotouch\Splat.dll</HintPath>
9494
</Reference>
9595
<Reference Include="System" />
9696
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -141,4 +141,4 @@
141141
<Name>ReactiveUI_iOS</Name>
142142
</ProjectReference>
143143
</ItemGroup>
144-
</Project>
144+
</Project>

Playground-iOS/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
<package id="Rx-Linq" version="2.2.5" targetFramework="MonoTouch10" />
66
<package id="Rx-Main" version="2.2.5" targetFramework="MonoTouch10" />
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="MonoTouch10" />
8-
<package id="Splat" version="1.3.3" targetFramework="MonoTouch10" />
9-
</packages>
8+
<package id="Splat" version="1.5.1" targetFramework="MonoTouch10" />
9+
</packages>

ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<Reference Include="Mono.Android" />
5050
<Reference Include="System.Runtime.Serialization" />
5151
<Reference Include="Splat">
52-
<HintPath>..\packages\Splat.1.3.3\lib\monoandroid\Splat.dll</HintPath>
52+
<HintPath>..\packages\Splat.1.5.1\lib\monoandroid\Splat.dll</HintPath>
5353
</Reference>
5454
<Reference Include="System.Reactive.Core">
5555
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
@@ -92,4 +92,4 @@
9292
<Name>ReactiveUI_Android</Name>
9393
</ProjectReference>
9494
</ItemGroup>
95-
</Project>
95+
</Project>

ReactiveUI.AndroidSupport/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<package id="Rx-Linq" version="2.2.5" targetFramework="MonoAndroid403" />
66
<package id="Rx-Main" version="2.2.5" targetFramework="MonoAndroid403" />
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="MonoAndroid403" />
8-
<package id="Splat" version="1.3.3" targetFramework="MonoAndroid403" />
8+
<package id="Splat" version="1.5.1" targetFramework="MonoAndroid403" />
99
<package id="Xamarin.Android.Support.v4" version="20.0.0.2" targetFramework="MonoAndroid403" />
10-
</packages>
10+
</packages>

ReactiveUI.Blend/ReactiveUI.Blend_Net45.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
<Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
5050
<Reference Include="PresentationCore" />
5151
<Reference Include="PresentationFramework" />
52-
<Reference Include="Splat, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
52+
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
5353
<SpecificVersion>False</SpecificVersion>
54-
<HintPath>..\packages\Splat.1.3.3\lib\Net45\Splat.dll</HintPath>
54+
<HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
5555
</Reference>
5656
<Reference Include="System" />
5757
<Reference Include="System.Core" />
@@ -108,4 +108,4 @@
108108
<Target Name="AfterBuild">
109109
</Target>
110110
-->
111-
</Project>
111+
</Project>

ReactiveUI.Blend/ReactiveUI.Blend_WP8.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@
9191
</PropertyGroup>
9292
<ItemGroup>
9393
<Reference Include="mscorlib.Extensions" />
94-
<Reference Include="Splat, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
94+
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
9595
<SpecificVersion>False</SpecificVersion>
96-
<HintPath>..\packages\Splat.1.3.3\lib\wp8\Splat.dll</HintPath>
96+
<HintPath>..\packages\Splat.1.5.1\lib\wp8\Splat.dll</HintPath>
9797
</Reference>
9898
<Reference Include="System.Observable" />
9999
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -154,4 +154,4 @@
154154
<Target Name="AfterBuild">
155155
</Target>
156156
-->
157-
</Project>
157+
</Project>

0 commit comments

Comments
 (0)