Skip to content

Commit f5ece8b

Browse files
anaisbettsanaisbetts
committed
Version bump Splat to 1.6.0
Conflicts: Playground-XamForms.iOS/packages.config Playground-XamForms/packages.config ReactiveUI.XamForms/packages.config
1 parent 704f43b commit f5ece8b

File tree

87 files changed

+109
-109
lines changed

Some content is hidden

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

87 files changed

+109
-109
lines changed

‎NuGet/ReactiveUI-Core/ReactiveUI-Core.nuspec‎

Lines changed: 5 additions & 5 deletions
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.1" />
15+
<dependency id="Splat" version="1.6.0" />
1616
</group>
1717
<group targetFramework="win8">
1818
<dependency id="Rx-Main" version="2.2.5" />
19-
<dependency id="Splat" version="1.5.1" />
19+
<dependency id="Splat" version="1.6.0" />
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.1" />
25+
<dependency id="Splat" version="1.6.0" />
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.1" />
31+
<dependency id="Splat" version="1.6.0" />
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.1" />
36+
<dependency id="Splat" version="1.6.0" />
3737
<dependency id="Rx-Xaml" version="2.2.5" />
3838
<dependency id="Rx-WinRT" version="2.2.5" />
3939
</group>

‎Playground-Android/Playground-Android.csproj‎

Lines changed: 2 additions & 2 deletions
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-761.5.1B86E5}</ProjectGuid>
8+
<ProjectGuid>{D444AA58-1C6B-4CEE-B5F5-761.6.0B86E5}</ProjectGuid>
99
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1010
<OutputType>Library</OutputType>
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -43,7 +43,7 @@
4343
<ItemGroup>
4444
<Reference Include="Splat">
4545
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\packages\Splat.1.5.1\lib\monoandroid\Splat.dll</HintPath>
46+
<HintPath>..\packages\Splat.1.6.0\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">

‎Playground-Android/packages.config‎

Lines changed: 1 addition & 1 deletion
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.5.1" targetFramework="MonoAndroid403" />
8+
<package id="Splat" version="1.6.0" targetFramework="MonoAndroid403" />
99
</packages>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@
130130
</Page>
131131
</ItemGroup>
132132
<ItemGroup>
133-
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
133+
<Reference Include="Splat, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
134134
<SpecificVersion>False</SpecificVersion>
135-
<HintPath>..\..\packages\Splat.1.5.1\lib\NetCore45\Splat.dll</HintPath>
135+
<HintPath>..\..\packages\Splat.1.6.0\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>

‎Playground-Wpa81/Playground-Wpa81.Windows/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="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.5.1" targetFramework="win81" />
10+
<package id="Splat" version="1.6.0" targetFramework="win81" />
1111
</packages>

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

Lines changed: 1 addition & 1 deletion
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.5.1\lib\Portable-Win81+Wpa81\Splat.dll</HintPath>
112+
<HintPath>..\..\packages\Splat.1.6.0\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>

‎Playground-Wpa81/Playground-Wpa81.WindowsPhone/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="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.5.1" targetFramework="wpa81" />
10+
<package id="Splat" version="1.6.0" targetFramework="wpa81" />
1111
</packages>

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

Lines changed: 1 addition & 1 deletion
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.5.1\lib\monoandroid\Splat.dll</HintPath>
58+
<HintPath>..\packages\Splat.1.6.0\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‎

Lines changed: 1 addition & 1 deletion
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.5.1" targetFramework="MonoAndroid403" />
8+
<package id="Splat" version="1.6.0" 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‎

Lines changed: 1 addition & 1 deletion
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.5.1\lib\monotouch\Splat.dll</HintPath>
125+
<HintPath>..\packages\Splat.1.6.0\lib\monotouch\Splat.dll</HintPath>
126126
</Reference>
127127
</ItemGroup>
128128
<ItemGroup>

0 commit comments

Comments
 (0)