#3 Using modern version of Reactive Extensions

LogoFX · Jan 8, 2018 · 616c47c · 616c47c
1 parent 688f9c8
commit 616c47c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/...oFX.Client.Mvvm.Commanding.Platform/net/LogoFX.Client.Mvvm.Commanding.Platform.NET.csproj b/...oFX.Client.Mvvm.Commanding.Platform/net/LogoFX.Client.Mvvm.Commanding.Platform.NET.csproj
@@ -48,17 +48,14 @@
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <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.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Reactive.Core.3.1.1\lib\net46\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.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Xaml" />

diff --git a/src/LogoFX.Client.Mvvm.Commanding.Platform/net/packages.config b/src/LogoFX.Client.Mvvm.Commanding.Platform/net/packages.config
@@ -4,7 +4,7 @@
   <package id="LogoFX.Client.Core.Core" version="1.2.1-rc2" targetFramework="net461" />
   <package id="LogoFX.Client.Mvvm.Core" version="1.1.1-rc2" targetFramework="net461" />
   <package id="LogoFX.Core" version="1.1.1-rc2" targetFramework="net461" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="net461" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net461" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net461" />
+  <package id="System.Reactive.Core" version="3.1.1" targetFramework="net461" />
+  <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net461" />
+  <package id="System.Reactive.Linq" version="3.1.1" targetFramework="net461" />
 </packages>
diff --git a/...oFX.Client.Mvvm.Commanding.Platform/uwp/LogoFX.Client.Mvvm.Commanding.Platform.UWP.csproj b/...oFX.Client.Mvvm.Commanding.Platform/uwp/LogoFX.Client.Mvvm.Commanding.Platform.UWP.csproj
@@ -156,8 +156,8 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.0.5</Version>
     </PackageReference>
-    <PackageReference Include="Rx-Linq">
-      <Version>2.2.5</Version>
+    <PackageReference Include="System.Reactive.Linq">
+      <Version>3.1.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>