Skip to content

Commit 08dab7c

Browse files
anaisbettsanaisbetts
committed
Mono doesn't ship Rx anymore, switch back to NuGet for Xamarin.Mac
1 parent cd1c39f commit 08dab7c

File tree

7 files changed

+48
-47
lines changed

7 files changed

+48
-47
lines changed

‎Microsoft.Reactive.Testing/Microsoft.Reactive.Testing_Mac.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,17 @@
3131
</PropertyGroup>
3232
<ItemGroup>
3333
<Reference Include="System" />
34-
<Reference Include="System.Reactive.Core">
35-
<HintPath>..\ext\net45\System.Reactive.Core.dll</HintPath>
36-
</Reference>
3734
<Reference Include="System.Reactive.Interfaces">
38-
<HintPath>..\ext\net45\System.Reactive.Interfaces.dll</HintPath>
35+
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
36+
</Reference>
37+
<Reference Include="System.Reactive.Core">
38+
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
3939
</Reference>
4040
<Reference Include="System.Reactive.Linq">
41-
<HintPath>..\ext\net45\System.Reactive.Linq.dll</HintPath>
41+
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
4242
</Reference>
4343
<Reference Include="System.Reactive.PlatformServices">
44-
<HintPath>..\ext\net45\System.Reactive.PlatformServices.dll</HintPath>
45-
</Reference>
46-
<Reference Include="System.Reactive.Providers">
47-
<HintPath>..\ext\net45\System.Reactive.Providers.dll</HintPath>
44+
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
4845
</Reference>
4946
</ItemGroup>
5047
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -61,4 +58,7 @@
6158
<Compile Include="Subscription.cs" />
6259
<Compile Include="TestScheduler.cs" />
6360
</ItemGroup>
61+
<ItemGroup>
62+
<None Include="packages.Microsoft.Reactive.Testing_Mac.config" />
63+
</ItemGroup>
6464
</Project>

‎Microsoft.Reactive.Testing/packages.Microsoft.Reactive.Testing_Mac.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Rx-Core" version="2.2.5" targetFramework="net45" />
4+
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
5+
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
6+
<package id="Rx-Main" version="2.2.5" targetFramework="net45" />
7+
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
38
</packages>

‎ReactiveUI.Events/ReactiveUI.Events_Mac.csproj

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,24 +71,19 @@
7171
<Reference Include="System.ComponentModel.DataAnnotations" />
7272
<Reference Include="System.Drawing" />
7373
<Reference Include="XamMac, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065" />
74-
<Reference Include="System.Reactive.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
75-
<HintPath>..\ext\mono\System.Reactive.Core.dll</HintPath>
74+
<Reference Include="XamMac" />
75+
<Reference Include="System.Reactive.Core">
76+
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
7677
</Reference>
77-
<Reference Include="System.Reactive.Interfaces, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
78-
<HintPath>..\ext\mono\System.Reactive.Interfaces.dll</HintPath>
78+
<Reference Include="System.Reactive.Interfaces">
79+
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
7980
</Reference>
80-
<Reference Include="System.Reactive.Linq, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
81-
<HintPath>..\ext\mono\System.Reactive.Linq.dll</HintPath>
81+
<Reference Include="System.Reactive.Linq">
82+
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
8283
</Reference>
83-
<Reference Include="System.Reactive.PlatformServices, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
84-
<HintPath>..\ext\mono\System.Reactive.PlatformServices.dll</HintPath>
84+
<Reference Include="System.Reactive.PlatformServices">
85+
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
8586
</Reference>
86-
<Reference Include="System.Reactive.Core, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
87-
<Reference Include="System.Reactive.Interfaces, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
88-
<Reference Include="System.Reactive.Linq, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
89-
<Reference Include="System.Reactive.PlatformServices, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
90-
<Reference Include="System.Reactive.Debugger, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
91-
<Reference Include="XamMac" />
9287
</ItemGroup>
9388
<ItemGroup>
9489
<Compile Include="Properties\AssemblyInfo.cs" />

‎ReactiveUI.Testing/ReactiveUI.Testing_Mac.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,20 @@
5050
<Reference Include="System.Xml.Linq" />
5151
<Reference Include="Microsoft.CSharp" />
5252
<Reference Include="System.Xml" />
53+
<Reference Include="Splat">
54+
<HintPath>..\packages\Splat.1.3.3\lib\MonoMac\Splat.dll</HintPath>
55+
</Reference>
5356
<Reference Include="System.Reactive.Core">
54-
<HintPath>..\ext\net45\System.Reactive.Core.dll</HintPath>
57+
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
5558
</Reference>
5659
<Reference Include="System.Reactive.Interfaces">
57-
<HintPath>..\ext\net45\System.Reactive.Interfaces.dll</HintPath>
60+
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
5861
</Reference>
5962
<Reference Include="System.Reactive.Linq">
60-
<HintPath>..\ext\net45\System.Reactive.Linq.dll</HintPath>
63+
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
6164
</Reference>
6265
<Reference Include="System.Reactive.PlatformServices">
63-
<HintPath>..\ext\net45\System.Reactive.PlatformServices.dll</HintPath>
64-
</Reference>
65-
<Reference Include="Splat">
66-
<HintPath>..\packages\Splat.1.3.3\lib\MonoMac\Splat.dll</HintPath>
66+
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
6767
</Reference>
6868
</ItemGroup>
6969
<ItemGroup>

‎ReactiveUI.Tests/Resources/Resource.designer.cs

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ReactiveUI/ReactiveUI_Mac.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,20 @@
5656
<Reference Include="System.Drawing" />
5757
<Reference Include="XamMac" />
5858
<Reference Include="System.Runtime.Serialization" />
59+
<Reference Include="Splat">
60+
<HintPath>..\packages\Splat.1.3.3\lib\MonoMac\Splat.dll</HintPath>
61+
</Reference>
5962
<Reference Include="System.Reactive.Core">
60-
<HintPath>..\ext\Portable-Net45+WinRT45+WP8\System.Reactive.Core.dll</HintPath>
63+
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
6164
</Reference>
6265
<Reference Include="System.Reactive.Interfaces">
63-
<HintPath>..\ext\Portable-Net45+WinRT45+WP8\System.Reactive.Interfaces.dll</HintPath>
66+
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
6467
</Reference>
6568
<Reference Include="System.Reactive.Linq">
66-
<HintPath>..\ext\Portable-Net45+WinRT45+WP8\System.Reactive.Linq.dll</HintPath>
69+
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
6770
</Reference>
6871
<Reference Include="System.Reactive.PlatformServices">
69-
<HintPath>..\ext\Portable-Net45+WinRT45+WP8\System.Reactive.PlatformServices.dll</HintPath>
70-
</Reference>
71-
<Reference Include="Splat">
72-
<HintPath>..\packages\Splat.1.3.3\lib\MonoMac\Splat.dll</HintPath>
72+
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
7373
</Reference>
7474
</ItemGroup>
7575
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

‎packages/repositories.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<repositories>
33
<repository path="../Microsoft.Reactive.Testing/packages.Microsoft.Reactive.Testing_Android.config" />
44
<repository path="../Microsoft.Reactive.Testing/packages.Microsoft.Reactive.Testing_iOS.config" />
5+
<repository path="../Microsoft.Reactive.Testing/packages.Microsoft.Reactive.Testing_Mac.config" />
56
<repository path="../Playground-Android/packages.config" />
67
<repository path="../Playground-iOS/packages.config" />
78
<repository path="../Playground-XamForms.Android/packages.config" />

0 commit comments

Comments
 (0)