Merge branch 'dev' into Gurjot95-patch-1

antonpup · Aug 30, 2019 · 62c3a2d · 62c3a2d
2 parents d876722 + 38527ab
commit 62c3a2d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -188,17 +188,17 @@
       <HintPath>.\Roccat-Talk.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
+    <Reference Include="SharpDX, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.Direct3D11, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll</HintPath>
+    <Reference Include="SharpDX.Direct3D11, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.Direct3D11.4.0.1\lib\net45\SharpDX.Direct3D11.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.DXGI, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll</HintPath>
+    <Reference Include="SharpDX.DXGI, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.DXGI.4.0.1\lib\net45\SharpDX.DXGI.dll</HintPath>
     </Reference>
-    <Reference Include="SharpDX.RawInput, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpDX.RawInput.4.2.0\lib\net45\SharpDX.RawInput.dll</HintPath>
+    <Reference Include="SharpDX.RawInput, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpDX.RawInput.4.0.1\lib\net45\SharpDX.RawInput.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

diff --git a/Project-Aurora/Project-Aurora/packages.config b/Project-Aurora/Project-Aurora/packages.config
@@ -27,16 +27,16 @@
   <package id="RGB.NET.Core" version="0.1.26" targetFramework="net461" />
   <package id="RGB.NET.Devices.Asus" version="0.1.23" targetFramework="net461" />
   <package id="RGB.NET.Devices.Corsair" version="0.1.26" targetFramework="net461" />
-  <package id="RGB.NET.Groups" version="0.1.23" targetFramework="net461" />
-  <package id="RGB.NET.Resources.Asus" version="0.1.0" targetFramework="net461" />
-  <package id="RGB.NET.Resources.Corsair" version="0.3.0.234" targetFramework="net461" />
-  <package id="SharpDX" version="4.2.0" targetFramework="net461" />
-  <package id="SharpDX.Direct3D11" version="4.2.0" targetFramework="net461" />
-  <package id="SharpDX.DXGI" version="4.2.0" targetFramework="net461" />
-  <package id="SharpDX.RawInput" version="4.2.0" targetFramework="net461" />
-  <package id="SignedBuild-Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net45" />
-  <package id="System.AppContext" version="4.3.0" targetFramework="net461" />
-  <package id="System.Collections" version="4.3.0" targetFramework="net461" />
+  <package id="RGB.NET.Groups" version="0.1.23" targetFramework="net461" />
+  <package id="RGB.NET.Resources.Asus" version="0.1.0" targetFramework="net461" />
+  <package id="RGB.NET.Resources.Corsair" version="0.3.0.234" targetFramework="net461" />
+  <package id="SharpDX" version="4.0.1" targetFramework="net461" />
+  <package id="SharpDX.Direct3D11" version="4.0.1" targetFramework="net461" />
+  <package id="SharpDX.DXGI" version="4.0.1" targetFramework="net461" />
+  <package id="SharpDX.RawInput" version="4.0.1" targetFramework="net461" />
+  <package id="SignedBuild-Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net45" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net461" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net461" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
   <package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
   <package id="System.Console" version="4.3.1" targetFramework="net461" />