Re-organize project structure

 * Tests now contained in their own directory.
 * Directory.Build.props files added to easier control settings.

Author: Sharparam

src/Colore.ruleset renamed to Colore.ruleset

@@ -8,9 +8,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Colore.ruleset = Colore.ruleset
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colore", "Colore\Colore.csproj", "{EA352740-5C39-4964-AFB4-749333FFB509}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colore", "src\Colore\Colore.csproj", "{EA352740-5C39-4964-AFB4-749333FFB509}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colore.Tests", "Colore.Tests\Colore.Tests.csproj", "{D9D36C7F-F9F4-4A0D-808E-B1699D51B532}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Colore.Tests", "tests\Colore.Tests\Colore.Tests.csproj", "{D9D36C7F-F9F4-4A0D-808E-B1699D51B532}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Colore.sln renamed to Colore.sln

@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
+    <LangVersion>latest</LangVersion>
+    <!-- <Nullable>enable</Nullable> -->
+    <Authors>Sharparam</Authors>
+    <Copyright>Copyright (c) 2015-2020 by Adam Hellberg and Brandon Scott.</Copyright>
+    <RepositoryUrl>https://github.com/chroma-sdk/Colore</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- <WarningsAsErrors>8600,8602,8603,8604,8614,8618,8619,8625,8632</WarningsAsErrors> -->
+  </PropertyGroup>
+</Project>

src/Colore.sln.DotSettings renamed to Colore.sln.DotSettings

@@ -45,18 +45,13 @@ IEnumerable<string> ReadCoverageFilters(string path)
     return System.IO.File.ReadLines(path).Where(l => !string.IsNullOrWhiteSpace(l) && !l.StartsWith("#"));
 }
 
-if (isTravis)
-{
-    Information("OpenCover does not work on Travis CI, disabling coverage generation");
-    cover = false;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // SETUP / TEARDOWN
 ///////////////////////////////////////////////////////////////////////////////
 
+var solution = "./Colore.sln";
 var mainProject = "./src/Colore/Colore.csproj";
-var testProject = "./src/Colore.Tests/Colore.Tests.csproj";
+var testProject = "./tests/Colore.Tests/Colore.Tests.csproj";
 var frameworks = new List<string>();
 
 GitVersion version = null;
@@ -102,8 +97,8 @@ Setup(ctx =>
 
 Teardown(ctx =>
 {
-	// Executed AFTER the last task.
-	Information("Finished running tasks.");
+    // Executed AFTER the last task.
+    Information("Finished running tasks.");
 });
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -154,7 +149,7 @@ Task("Clean")
         Information("Cleaning output directories");
         CleanDirectory("./artifacts");
         CleanDirectory("./publish");
-        DotNetCoreClean("src/");
+        DotNetCoreClean(solution);
         CleanDirectory("./src/Colore.Tests/TestResults");
         CreateDirectory("./artifacts/nuget");
     });
@@ -163,7 +158,7 @@ Task("Restore")
     .IsDependentOn("Clean")
     .Does(() =>
     {
-        DotNetCoreRestore("src/");
+        DotNetCoreRestore(solution);
     });
 
 Task("Build")
@@ -192,14 +187,14 @@ Task("Test")
     .IsDependentOn("Build")
     .Does(() =>
     {
-        var filters = ReadCoverageFilters("./src/coverage-filters.txt");
+        var filters = ReadCoverageFilters("./tests/coverage-filters.txt");
 
         var settings = new DotNetCoreTestSettings
         {
             Configuration = configuration,
             NoBuild = true,
             NoRestore = true,
-            Settings = "src/coverlet.runsettings",
+            Settings = "tests/coverlet.runsettings",
             ArgumentCustomization = args => args.Append("--collect:\"XPlat Code Coverage\"")
         };
 
@@ -214,7 +209,7 @@ Task("Test")
 
         DotNetCoreTest(testProject, settings);
 
-        var testResults = GetFiles("src/Colore.Tests/TestResults/*/coverage.cobertura.xml");
+        var testResults = GetFiles("tests/Colore.Tests/TestResults/*/coverage.cobertura.xml");
         CopyFiles(testResults, "./artifacts");
         MoveFile("./artifacts/coverage.cobertura.xml", "./artifacts/coverage.xml");
 

Directory.Build.props

@@ -8,9 +8,7 @@
     <DebugSymbols>true</DebugSymbols>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <CodeAnalysisRuleset>../Colore.ruleset</CodeAnalysisRuleset>
-    <Features>IOperation</Features>
-    <LangVersion>latest</LangVersion>
+    <CodeAnalysisRuleset>../../Colore.ruleset</CodeAnalysisRuleset>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -31,31 +29,23 @@
     <PackageVersion>$(NuGetVersion)</PackageVersion>
     <PackageId>Colore</PackageId>
     <Title>Colore</Title>
-    <Authors>Sharparam</Authors>
     <Description>A C#/.NET library for interacting with Razer's Chroma SDK.</Description>
-    <Copyright>Copyright (c) 2015-2020 by Adam Hellberg and Brandon Scott.</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/CoraleStudios/Colore</PackageProjectUrl>
     <PackageIcon>icon.png</PackageIcon>
     <PackageIconUrl>https://files.sharparam.com/2017/10/31/colore.png</PackageIconUrl>
     <PackageTags>razer;chroma;corale;led;light;peripheral;gaming;rgb;wrapper</PackageTags>
     <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <IncludeSource>true</IncludeSource>
-    <RepositoryUrl>https://github.com/chroma-sdk/Colore</RepositoryUrl>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <!-- <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder> -->
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="../../images/icon.png" Pack="true" PackagePath="/" />
   </ItemGroup>
 
   <ItemGroup>
-    <AdditionalFiles Include="../stylecop.json">
+    <AdditionalFiles Include="../../stylecop.json">
       <Link>stylecop.json</Link>
     </AdditionalFiles>
   </ItemGroup>
@@ -80,9 +70,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="System.Reflection" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions">
-      <Version>4.7.0</Version>
-    </PackageReference>
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
   </ItemGroup>
 
@@ -92,8 +80,6 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
     <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="Microsoft.Net.Http">
-      <Version>2.2.29</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Net.Http" Version="2.2.29" />
   </ItemGroup>
 </Project>

build.cake

@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+</Project>

src/Colore/Colore.csproj

@@ -3,13 +3,12 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Platforms>AnyCPU;x64;x86</Platforms>
-    <CodeAnalysisRuleset>../Colore.ruleset</CodeAnalysisRuleset>
-    <Features>IOperation</Features>
+    <CodeAnalysisRuleset>../../Colore.ruleset</CodeAnalysisRuleset>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <AdditionalFiles Include="../stylecop.json">
+    <AdditionalFiles Include="../../stylecop.json">
       <Link>stylecop.json</Link>
     </AdditionalFiles>
   </ItemGroup>
@@ -29,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Colore\Colore.csproj" />
+    <ProjectReference Include="..\..\src\Colore\Colore.csproj" />
   </ItemGroup>
 
 </Project>

src/Directory.Build.props

@@ -0,0 +1,7 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+</Project>