Improved solution structure to better fit the nuget stuff

CUE.NET.csproj

@@ -14,7 +14,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\</OutputPath>
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>TRACE;DEBUG;WIN64</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -22,7 +22,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\</OutputPath>
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>TRACE;WIN64</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\</OutputPath>
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>TRACE;DEBUG;WIN32</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -40,7 +40,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\</OutputPath>
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>TRACE;WIN32</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -107,12 +107,6 @@
     <Compile Include="CueSDK.cs" />
     <Compile Include="Devices\ICueDevice.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="libs\CUESDK.x64_2013.dll" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="libs\CUESDK_2013.dll" />
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildProjectDirectory)\CUE.NET.targets" />

CUE.NET.nuspec

@@ -2,22 +2,22 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>CUE.NET</id>
+        <title>CUE.NET</title>
         <version>0.1.0</version>
-        <title>C# Wrapper library around the Corsair CUE SDK</title>
+        <authors>Darth Affe</authors>
-        <authors>DarthAffe</authors>
+        <owners>Darth Affe</owners>
-        <owners>DarthAffe</owners>
+        <projectUrl>https://github.com/DarthAffe/CUE.NET</projectUrl>
         <licenseUrl>https://raw.githubusercontent.com/DarthAffe/CUE.NET/master/LICENSE</licenseUrl>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
         <description>Corsair HID SDK Wrapper</description>
-        <summary>C# (.NET) Wrapper library around the Corsair CUE-SDK
+        <summary>C# (.NET) Wrapper library around the Corsair CUE-SDK</summary>
-
+        <copyright>Copyright © Wyrez 2015</copyright>
-I'm currently working on this library and it's far from being finished. Please be patient (or drop me a message) if something is missing, behave</summary>
-        <copyright>2015 DarthAffe</copyright>
         <language>en-US</language>
     </metadata>
     <files>
-        <file src="bin\x64\CUE.NET.dll" target="lib\net46\CUE.NET.dll" />
+        <file src="bin\CUE.NET.dll" target="lib\net46\CUE.NET.dll" />
-        <file src="bin\x64\CUESDK.x64_2013.dll" target="build\net46\x64" />
+        <file src="bin\CUESDK.x64_2013.dll" target="build\net46\" />
-        <file src="CUE.NET.targets" target="build\net46\x64\CUE.NET.targets" />
+        <file src="bin\CUESDK.x86_2013.dll" target="build\net46\" />
+        <file src="CUE.NET.targets" target="build\net46\CUE.NET.targets" />
     </files>
 </package>

CUE.NET.sln

@@ -13,6 +13,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		CUE.NET.nuspec = CUE.NET.nuspec
 		CUE.NET.targets = CUE.NET.targets
+		nuget.exe = nuget.exe
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{D69EF6D8-68FF-4C56-B5CB-253971B1DF91}"
+	ProjectSection(SolutionItems) = preProject
+		libs\CUESDK.x64_2013.dll = libs\CUESDK.x64_2013.dll
+		libs\CUESDK.x86_2013.dll = libs\CUESDK.x86_2013.dll
 	EndProjectSection
 EndProject
 Global
@@ -45,5 +52,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{7FD88256-5E14-4D7C-862B-7BC2CD04081A} = {1F52DDC9-E9D0-4A7B-8E78-930528203EE6}
+		{D69EF6D8-68FF-4C56-B5CB-253971B1DF91} = {FF50AF6A-D2AC-4772-B013-C10D127DBE29}
 	EndGlobalSection
 EndGlobal

CUE.NET.targets

@@ -1,37 +1,35 @@
 <!--
- * Build targets hacked from SQLite (thanks!), please rename all of this when you're feeling brave
+ * Build targets hacked from SQLite (thanks!)
  * System.Data.SQLite.Core.targets -
- *
- *
 -->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <!--
   ******************************************************************************
-  **                    SQLite Interop Library Build Items                    **
+  **                                Build Items                               **
   ******************************************************************************
   -->
 
   <ItemGroup>
-    <SQLiteInteropFiles Condition="'$(MSBuildThisFileDirectory)' != '' And
+    <CueNETSDKFiles Condition="'$(MSBuildThisFileDirectory)' != '' And
                                    HasTrailingSlash('$(MSBuildThisFileDirectory)')"
                         Include="$(MSBuildThisFileDirectory)\libs\*.dll" />
-    <SQLiteInteropFiles Condition="'$(MSBuildThisFileDirectory)' != '' And
+    <CueNETSDKFiles Condition="'$(MSBuildThisFileDirectory)' != '' And
                                    HasTrailingSlash('$(MSBuildThisFileDirectory)')"
                         Include="$(MSBuildThisFileDirectory)\*.dll" />
   </ItemGroup>
 
   <!--
   ******************************************************************************
-  **                   SQLite Interop Library Content Items                   **
+  **                               Content Items                              **
   ******************************************************************************
   -->
 
-  <ItemGroup Condition="'$(ContentSQLiteInteropFiles)' != '' And
+  <ItemGroup Condition="'$(ContentCueNETSDKFiles)' != '' And
-                        '$(ContentSQLiteInteropFiles)' != 'false' And
+                        '$(ContentCueNETSDKFiles)' != 'false' And
-                        '@(SQLiteInteropFiles)' != ''">
+                        '@(CueNETSDKFiles)' != ''">
-    <Content Include="@(SQLiteInteropFiles)">
+    <Content Include="@(CueNETSDKFiles)">
       <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -39,55 +37,55 @@
 
   <!--
   ******************************************************************************
-  **                   SQLite Interop Library Build Targets                   **
+  **                              Build Targets*                              **
   ******************************************************************************
   -->
 
-  <Target Name="CopySQLiteInteropFiles"
+  <Target Name="CopyCueNETSDKFiles"
-          Condition="'$(CopySQLiteInteropFiles)' != 'false' And
+          Condition="'$(CopyCueNETSDKFiles)' != 'false' And
                      '$(OutDir)' != '' And
                      HasTrailingSlash('$(OutDir)') And
                      Exists('$(OutDir)')"
-          Inputs="@(SQLiteInteropFiles)"
+          Inputs="@(CueNETSDKFiles)"
-          Outputs="@(SQLiteInteropFiles -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')">
+          Outputs="@(CueNETSDKFiles -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')">
     <!--
-        NOTE: Copy "SQLite.Interop.dll" and all related files, for every
+        NOTE: Copy "CUESDK*.dll" and all related files, for every
               architecture that we support, to the build output directory.
     -->
-	<Message Text="Copying Interop files..." Importance="high" />
+  <Message Text="Copying SDK files..." Importance="high" />
-    <Copy SourceFiles="@(SQLiteInteropFiles)"
+    <Copy SourceFiles="@(CueNETSDKFiles)"
-          DestinationFiles="@(SQLiteInteropFiles -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" />
+          DestinationFiles="@(CueNETSDKFiles -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 
   <!--
   ******************************************************************************
   -->
 
-  <Target Name="CleanSQLiteInteropFiles"
+  <Target Name="CleanCueNETSDKFiles"
-          Condition="'$(CleanSQLiteInteropFiles)' != 'false' And
+          Condition="'$(CleanCueNETSDKFiles)' != 'false' And
                      '$(OutDir)' != '' And
                      HasTrailingSlash('$(OutDir)') And
                      Exists('$(OutDir)')">
 
     <!--
-        NOTE: Delete "SQLite.Interop.dll" and all related files, for every
+        NOTE: Delete "CUESDK*.dll" and all related files, for every
               architecture that we support, from the build output directory.
     -->
-	<Message Text="this file $(MSBuildThisFileDirectory)" Importance="high"/>
+  <Message Text="this file $(MSBuildThisFileDirectory)" Importance="high"/>
-	<Message Text="Cleaning Interop files..." Importance="high" />
+  <Message Text="Cleaning SDK files..." Importance="high" />
   
-    <Delete Files="@(SQLiteInteropFiles -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Delete Files="@(CueNETSDKFiles -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 
   <!--
   ******************************************************************************
   -->
 
-  <Target Name="CollectSQLiteInteropFiles"
+  <Target Name="CollectCueNETSDKFiles"
-          Condition="'$(CollectSQLiteInteropFiles)' != 'false'">
+          Condition="'$(CollectCueNETSDKFiles)' != 'false'">
-		  <Message Text="Collecting Interop files..." Importance="high" />
+      <Message Text="Collecting SDK files..." Importance="high" />
     <ItemGroup>
-      <FilesForPackagingFromProject Include="@(SQLiteInteropFiles)">
+      <FilesForPackagingFromProject Include="@(CueNETSDKFiles)">
         <DestinationRelativePath>bin\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
       </FilesForPackagingFromProject>
     </ItemGroup>
@@ -95,28 +93,28 @@
 
   <!--
   ******************************************************************************
-  **                 SQLite Interop Library Build Properties                  **
+  **                            Build Properties                              **
   ******************************************************************************
   -->
 
   <PropertyGroup>
     <PostBuildEventDependsOn>
       $(PostBuildEventDependsOn);
-      CopySQLiteInteropFiles;
+      CopyCueNETSDKFiles;
     </PostBuildEventDependsOn>
     <BuildDependsOn>
       $(BuildDependsOn);
-      CopySQLiteInteropFiles;
+      CopyCueNETSDKFiles;
     </BuildDependsOn>
     <CleanDependsOn>
       $(CleanDependsOn);
-      CleanSQLiteInteropFiles;
+      CleanCueNETSDKFiles;
     </CleanDependsOn>
   </PropertyGroup>
 
   <!--
   ******************************************************************************
-  **     SQLite Interop Library Publish Properties for Visual Studio 201x     **
+  **                 Publish Properties for Visual Studio 201x                **
   ******************************************************************************
   -->
 
@@ -125,7 +123,7 @@
                             '$(VisualStudioVersion)' == '11.0' Or
                             '$(VisualStudioVersion)' == '12.0'">
     <PipelineCollectFilesPhaseDependsOn>
-      CollectSQLiteInteropFiles;
+      CollectCueNETSDKFiles;
       $(PipelineCollectFilesPhaseDependsOn);
     </PipelineCollectFilesPhaseDependsOn>
   </PropertyGroup>