Merge branch 'feature/#29' into develop

tym32167 · Dec 4, 2016 · b9d16c7 · b9d16c7
2 parents 02c2397 + 0eb9ade
commit b9d16c7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/src/Arma3BE.Client.Infrastructure/Arma3BE.Client.Infrastructure.csproj b/src/Arma3BE.Client.Infrastructure/Arma3BE.Client.Infrastructure.csproj
@@ -59,18 +59,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <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>
-      <Private>True</Private>
-    </Reference>
-    <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>
-      <Private>True</Private>
-    </Reference>
-    <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>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Prism.Wpf.6.2.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>

diff --git a/src/Arma3BE.Client.Infrastructure/packages.config b/src/Arma3BE.Client.Infrastructure/packages.config
@@ -4,8 +4,5 @@
   <package id="Extended.Wpf.Toolkit" version="2.9" targetFramework="net452" />
   <package id="Prism.Core" version="6.2.0" targetFramework="net452" />
   <package id="Prism.Wpf" version="6.2.0" targetFramework="net452" />
-  <package id="System.Reactive.Core" version="3.1.1" targetFramework="net452" />
-  <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net452" />
-  <package id="System.Reactive.Linq" version="3.1.1" targetFramework="net452" />
   <package id="Unity" version="4.0.1" targetFramework="net452" />
 </packages>