diff --git a/.gitmodules b/.gitmodules index 30a0d83a0..91cdca34c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ -[submodule "Wooting.NET"] - path = Wooting.NET - url = https://github.com/simon-wh/Wooting.NET.git [submodule "SBAuroraR.NET"] path = SBAuroraR.NET url = https://github.com/rajkosto/SBAuroraR.NET.git [submodule "NZXTSharp"] path = NZXTSharp - url = https://github.com/akmadian/NZXTSharp.git + url = https://github.com/akmadian/NZXTSharp.git \ No newline at end of file diff --git a/Project-Aurora/Project-Aurora.sln b/Project-Aurora/Project-Aurora.sln index 852f01181..458bbfc09 100644 --- a/Project-Aurora/Project-Aurora.sln +++ b/Project-Aurora/Project-Aurora.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26228.4 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29418.71 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Project-Aurora", "Project-Aurora\Project-Aurora.csproj", "{18D2D471-3F57-4ECE-9C62-836A801473D8}" ProjectSection(ProjectDependencies) = postProject @@ -31,8 +30,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorBox", "ColorBox\ColorB EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin-Example", "Plugin-Example\Plugin-Example.csproj", "{DAE33996-53E3-46A3-8F06-CBAF0AFE3708}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wooting.NET", "..\Wooting.NET\Wooting.NET\Wooting.NET.csproj", "{FEA699AE-DB83-43DC-AB85-99F2E90C328F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SBAuroraReactive", "..\SBAuroraR.NET\SBAuroraReactive\SBAuroraReactive.vcxproj", "{053A704B-5C79-4CDE-B1FC-B952051ACAA0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NZXTSharp", "..\NZXTSharp\NZXTSharp\NZXTSharp.csproj", "{62094023-0479-4DD4-8A74-4321CC0F08DD}" @@ -105,14 +102,6 @@ Global {DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Release|Any CPU.Build.0 = Release|Any CPU {DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Release|x64.ActiveCfg = Release|Any CPU {DAE33996-53E3-46A3-8F06-CBAF0AFE3708}.Release|x64.Build.0 = Release|Any CPU - {FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Debug|x64.ActiveCfg = Debug|Any CPU - {FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Debug|x64.Build.0 = Debug|Any CPU - {FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Release|Any CPU.Build.0 = Release|Any CPU - {FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Release|x64.ActiveCfg = Release|Any CPU - {FEA699AE-DB83-43DC-AB85-99F2E90C328F}.Release|x64.Build.0 = Release|Any CPU {053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Debug|Any CPU.ActiveCfg = Debug|Win32 {053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Debug|x64.ActiveCfg = Debug|x64 {053A704B-5C79-4CDE-B1FC-B952051ACAA0}.Debug|x64.Build.0 = Debug|x64 diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj index 3d0569110..08a1cb963 100644 --- a/Project-Aurora/Project-Aurora/Project-Aurora.csproj +++ b/Project-Aurora/Project-Aurora/Project-Aurora.csproj @@ -326,6 +326,9 @@ True + + ..\packages\Wooting.NET.1.0.0\lib\netstandard2.0\Wooting.NET.dll + ..\packages\Infragistics.Themes.MetroDark.Wpf.1.0.0\lib\net40\WPFToolkit.dll True @@ -2517,10 +2520,6 @@ SBAuroraReactive False - - {fea699ae-db83-43dc-ab85-99f2e90c328f} - Wooting.NET - {40085232-aced-4cbe-945b-90ba8153c151} ColorBox diff --git a/Project-Aurora/Project-Aurora/packages.config b/Project-Aurora/Project-Aurora/packages.config index 13ae1dcea..e34ffa3e2 100755 --- a/Project-Aurora/Project-Aurora/packages.config +++ b/Project-Aurora/Project-Aurora/packages.config @@ -79,6 +79,7 @@ + \ No newline at end of file diff --git a/Wooting.NET b/Wooting.NET deleted file mode 160000 index 6d4a78abc..000000000 --- a/Wooting.NET +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6d4a78abc838698b8c43e242cce9348deea9b587