Update references to System.Reactive (it's been renamed, it seems)

src/SyncTrayzor/Pages/ConflictResolution/ConflictResolutionViewModel.cs

@@ -11,8 +11,8 @@ using System.Windows;
 using SyncTrayzor.Properties;
 using SyncTrayzor.Services;
 using SyncTrayzor.Services.Config;
-using System.Reactive.Linq;
 using System.Windows.Threading;
+using System.Reactive.Linq;
 
 namespace SyncTrayzor.Pages.ConflictResolution
 {

src/SyncTrayzor/Services/Conflicts/ConflictFileManager.cs

@@ -6,9 +6,9 @@ using System.Threading;
 using System.Threading.Tasks;
 using Pri.LongPath;
 using NLog;
-using System.Reactive.Linq;
 using SyncTrayzor.Syncthing.Devices;
 using SyncTrayzor.Syncthing;
+using System.Reactive.Linq;
 
 namespace SyncTrayzor.Services.Conflicts
 {

src/SyncTrayzor/SyncTrayzor.csproj

@@ -154,31 +154,27 @@
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Reactive.Core, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Reactive.Linq, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Reactive.PlatformServices, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.PlatformServices.3.1.1\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Windows.Threading, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-XAML.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Reactive.Windows.Threading, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
+    <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Xaml" />

src/SyncTrayzor/packages.config

@@ -15,15 +15,14 @@
   <package id="Pri.LongPath" version="2.0.42" targetFramework="net451" />
   <package id="PropertyChanged.Fody" version="1.52.1" targetFramework="net451" developmentDependency="true" />
   <package id="RestEase" version="1.4.3" targetFramework="net451" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="net451" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net451" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net451" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net451" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net451" />
-  <package id="Rx-WPF" version="2.2.5" targetFramework="net451" />
-  <package id="Rx-XAML" version="2.2.5" targetFramework="net451" />
   <package id="SmartFormat.NET" version="2.0.0.0" targetFramework="net451" />
   <package id="Stylet" version="1.1.19" targetFramework="net451" />
+  <package id="System.Reactive" version="3.1.1" targetFramework="net451" />
+  <package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" />
+  <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net451" />
+  <package id="System.Reactive.Linq" version="3.1.1" targetFramework="net451" />
+  <package id="System.Reactive.PlatformServices" version="3.1.1" targetFramework="net451" />
+  <package id="System.Reactive.Windows.Threading" version="3.1.1" targetFramework="net451" />
   <package id="System.ValueTuple" version="4.3.0" targetFramework="net451" />
   <package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net451" />
   <package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net451" />