From 58f8e871d97a15f8e41eb9abde8bd2afe5d86e0d Mon Sep 17 00:00:00 2001
From: RLittlesII <6969701+RLittlesII@users.noreply.github.com>
Date: Wed, 17 Jul 2019 22:00:28 -0500
Subject: [PATCH 1/4] refactored to create DotNetCore package

---
 .build/.build.csproj                          |  1 +
 .build/Build.cs                               |  3 +-
 Nuke.sln                                      | 15 ++++++
 Readme.md                                     |  7 +++
 src/{Nuke => Nuke.Core}/DotNetCoreBuild.cs    | 46 +++++++++----------
 .../MSBuildBinaryLogImports.cs                |  2 +-
 .../Rocket.Surgery.Nuke.DotNetCore.csproj     | 15 ++++++
 .../ToolSettingsExtensions.cs}                |  4 +-
 src/Nuke.DotNetCore/Class1.cs                 |  8 ++++
 .../Rocket.Surgery.Nuke.DotNetCore.csproj     |  7 +++
 .../Rocket.Surgery.Nuke.Tests.csproj          |  4 +-
 11 files changed, 83 insertions(+), 29 deletions(-)
 rename src/{Nuke => Nuke.Core}/DotNetCoreBuild.cs (77%)
 rename src/{Nuke => Nuke.Core}/MSBuildBinaryLogImports.cs (92%)
 create mode 100644 src/Nuke.Core/Rocket.Surgery.Nuke.DotNetCore.csproj
 rename src/{Nuke/CustomDotNetBuildExtensions.cs => Nuke.Core/ToolSettingsExtensions.cs} (96%)
 create mode 100644 src/Nuke.DotNetCore/Class1.cs
 create mode 100644 src/Nuke.DotNetCore/Rocket.Surgery.Nuke.DotNetCore.csproj

diff --git a/.build/.build.csproj b/.build/.build.csproj
index f0226de5..1a31dc33 100644
--- a/.build/.build.csproj
+++ b/.build/.build.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="GitVersion.CommandLine.DotNetCore" />
     <PackageReference Include="ReportGenerator" />
     <ProjectReference Include="../src/Nuke/Rocket.Surgery.Nuke.csproj" />
+    <ProjectReference Include="..\src\Nuke.Core\Rocket.Surgery.Nuke.DotNetCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/.build/Build.cs b/.build/Build.cs
index 76508184..5233da49 100644
--- a/.build/Build.cs
+++ b/.build/Build.cs
@@ -1,6 +1,7 @@
 using Nuke.Common;
 using Nuke.Common.Execution;
 using Rocket.Surgery.Nuke;
+using Rocket.Surgery.Nuke.DotNetCore;
 
 [CheckBuildProjectConfigurations]
 [UnsetVisualStudioEnvironmentVariables]
@@ -16,5 +17,5 @@ class Program : DotNetCoreBuild
 
     public static int Main() => Execute<Program>(x => x.Default);
 
-    Target Default => _ => _.DependsOn(Core);
+    Target Default => _ => _.DependsOn(DotNetCore);
 }
diff --git a/Nuke.sln b/Nuke.sln
index 22fd8ffd..e4b95b44 100644
--- a/Nuke.sln
+++ b/Nuke.sln
@@ -23,6 +23,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rocket.Surgery.Nuke", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rocket.Surgery.Nuke.Tests", "test\Nuke.Tests\Rocket.Surgery.Nuke.Tests.csproj", "{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rocket.Surgery.Nuke.DotNetCore", "src\Nuke.Core\Rocket.Surgery.Nuke.DotNetCore.csproj", "{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +69,18 @@ Global
 		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Release|x64.Build.0 = Release|Any CPU
 		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Release|x86.ActiveCfg = Release|Any CPU
 		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Release|x86.Build.0 = Release|Any CPU
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}.Debug|x64.Build.0 = Debug|Any CPU
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}.Debug|x86.Build.0 = Debug|Any CPU
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}.Release|x64.ActiveCfg = Release|Any CPU
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}.Release|x64.Build.0 = Release|Any CPU
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}.Release|x86.ActiveCfg = Release|Any CPU
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -75,6 +89,7 @@ Global
 		{55EFAE2F-A7CA-4917-A381-4A6EF5E79610} = {E3DCB78E-EE06-4EA3-88AC-762D8910387C}
 		{C33C63CF-8760-4305-B9AC-14456930C867} = {8FFDF555-DB50-45F9-9A2D-6410F39151C3}
 		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67} = {DF33E0FB-9790-4654-B60F-8AB22E0CC3D1}
+		{2D88A441-0EF9-40EF-8A1A-CE5E12F62660} = {8FFDF555-DB50-45F9-9A2D-6410F39151C3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {439897C2-CCBD-44FE-B2DC-A3E4670ADA59}
diff --git a/Readme.md b/Readme.md
index 85e40ef4..93723c7a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -21,6 +21,7 @@ Every good Rocket Surgeon needs multiple choices of build systems to pick from t
 | Package | NuGet | MyGet |
 | ------- | ----- | ----- |
 | Rocket.Surgery.Nuke | [![nuget-version-6plqb7nwtdoa-badge]![nuget-downloads-6plqb7nwtdoa-badge]][nuget-6plqb7nwtdoa] | [![myget-version-6plqb7nwtdoa-badge]![myget-downloads-6plqb7nwtdoa-badge]][myget-6plqb7nwtdoa] |
+| Rocket.Surgery.Nuke.DotNetCore | [![nuget-version-75gp65y/nhyw-badge]![nuget-downloads-75gp65y/nhyw-badge]][nuget-75gp65y/nhyw] | [![myget-version-75gp65y/nhyw-badge]![myget-downloads-75gp65y/nhyw-badge]][myget-75gp65y/nhyw] |
 <!-- nuget packages -->
 
 <!-- generated references -->
@@ -46,6 +47,12 @@ Every good Rocket Surgeon needs multiple choices of build systems to pick from t
 [myget-6plqb7nwtdoa]: https://www.myget.org/feed/rocket-surgeons-guild/package/nuget/Rocket.Surgery.Nuke
 [myget-version-6plqb7nwtdoa-badge]: https://img.shields.io/myget/rocket-surgeons-guild/vpre/Rocket.Surgery.Nuke.svg?label=myget&color=004880&logo=nuget&style=flat-square "MyGet Pre-Release Version"
 [myget-downloads-6plqb7nwtdoa-badge]: https://img.shields.io/myget/rocket-surgeons-guild/dt/Rocket.Surgery.Nuke.svg?color=004880&logo=nuget&style=flat-square "MyGet Downloads"
+[nuget-75gp65y/nhyw]: https://www.nuget.org/packages/Rocket.Surgery.Nuke.DotNetCore/
+[nuget-version-75gp65y/nhyw-badge]: https://img.shields.io/nuget/v/Rocket.Surgery.Nuke.DotNetCore.svg?color=004880&logo=nuget&style=flat-square "NuGet Version"
+[nuget-downloads-75gp65y/nhyw-badge]: https://img.shields.io/nuget/dt/Rocket.Surgery.Nuke.DotNetCore.svg?color=004880&logo=nuget&style=flat-square "NuGet Downloads"
+[myget-75gp65y/nhyw]: https://www.myget.org/feed/rocket-surgeons-guild/package/nuget/Rocket.Surgery.Nuke.DotNetCore
+[myget-version-75gp65y/nhyw-badge]: https://img.shields.io/myget/rocket-surgeons-guild/vpre/Rocket.Surgery.Nuke.DotNetCore.svg?label=myget&color=004880&logo=nuget&style=flat-square "MyGet Pre-Release Version"
+[myget-downloads-75gp65y/nhyw-badge]: https://img.shields.io/myget/rocket-surgeons-guild/dt/Rocket.Surgery.Nuke.DotNetCore.svg?color=004880&logo=nuget&style=flat-square "MyGet Downloads"
 <!-- generated references -->
 
 <!-- nuke-data
diff --git a/src/Nuke/DotNetCoreBuild.cs b/src/Nuke.Core/DotNetCoreBuild.cs
similarity index 77%
rename from src/Nuke/DotNetCoreBuild.cs
rename to src/Nuke.Core/DotNetCoreBuild.cs
index a10aa9d9..67544f48 100644
--- a/src/Nuke/DotNetCoreBuild.cs
+++ b/src/Nuke.Core/DotNetCoreBuild.cs
@@ -7,7 +7,7 @@
 using Nuke.Common.Tools.VSTest;
 using Nuke.Common.Tools.VSWhere;
 
-namespace Rocket.Surgery.Nuke
+namespace Rocket.Surgery.Nuke.DotNetCore
 {
     /// <summary>
     /// Base build plan for .NET Core based applications
@@ -17,23 +17,23 @@ public abstract class DotNetCoreBuild : RocketBoosterBuild
         /// <summary>
         /// Core target that can be used to trigger all targets for this build
         /// </summary>
-        public Target Core => _ => _;
+        public Target DotNetCore => _ => _;
 
         /// <summary>
         /// This will ensure that all local dotnet tools are installed
         /// </summary>
-        public Target DotnetToolRestore => _ => _
-            .DependsOn(Clean)
-            .DependentFor(Core)
-            .Unlisted()
-            .Executes(() => DotNet("tool restore"));
+        //public Target DotnetToolRestore => _ => _
+        //    .DependsOn(Clean)
+        //    .DependentFor(Core)
+        //    .Unlisted()
+        //    .Executes(() => DotNet("tool restore"));
 
         /// <summary>
         /// dotnet restore
         /// </summary>
         public Target Restore => _ => _
-            .DependentFor(Core)
-            .DependsOn(DotnetToolRestore)
+            .DependentFor(DotNetCore)
+            // .DependsOn(DotnetToolRestore)
             .Executes(() =>
             {
                 DotNetRestore(s => s
@@ -50,7 +50,7 @@ public abstract class DotNetCoreBuild : RocketBoosterBuild
         /// </summary>
         public Target Build => _ => _
             .DependsOn(Restore)
-            .DependentFor(Core)
+            .DependentFor(DotNetCore)
             .Executes(() =>
             {
                 DotNetBuild(s => s
@@ -67,7 +67,7 @@ public abstract class DotNetCoreBuild : RocketBoosterBuild
         /// </summary>
         public Target Test => _ => _
             .DependsOn(Build)
-            .DependentFor(Core)
+            .DependentFor(DotNetCore)
             .DependentFor(Pack)
             .Triggers(Generate_Code_Coverage_Reports)
             .OnlyWhenDynamic(() => TestDirectory.GlobFiles("test/**/*.csproj").Count > 0)
@@ -92,17 +92,17 @@ public abstract class DotNetCoreBuild : RocketBoosterBuild
             //             .SetProperty("VSTestResultsDirectory", TestResultsDirectory));
             //     });
 
-            DotNetTest(s => s
-                    .SetProjectFile(Solution)
-                    .SetBinaryLogger(LogsDirectory / "test.binlog", IsLocalBuild ? MSBuildBinaryLogImports.None : MSBuildBinaryLogImports.Embed)
-                    .SetFileLogger(LogsDirectory / "test.log", Verbosity)
-                    .SetGitVersionEnvironment(GitVersion)
-                    .SetConfiguration(Configuration)
-                    .EnableNoRestore()
-                    .SetLogger($"trx")
-                    .SetProperty("CollectCoverage", true)
-                    .SetProperty("CoverageDirectory", CoverageDirectory)
-                    .SetProperty("VSTestResultsDirectory", TestResultsDirectory));
+                DotNetTest(s => s
+                        .SetProjectFile(Solution)
+                        .SetBinaryLogger(LogsDirectory / "test.binlog", IsLocalBuild ? MSBuildBinaryLogImports.None : MSBuildBinaryLogImports.Embed)
+                        .SetFileLogger(LogsDirectory / "test.log", Verbosity)
+                        .SetGitVersionEnvironment(GitVersion)
+                        .SetConfiguration(Configuration)
+                        .EnableNoRestore()
+                        .SetLogger($"trx")
+                        .SetProperty("CollectCoverage", true)
+                        .SetProperty("CoverageDirectory", CoverageDirectory)
+                        .SetProperty("VSTestResultsDirectory", TestResultsDirectory));
             });
 
         /// <summary>
@@ -110,7 +110,7 @@ public abstract class DotNetCoreBuild : RocketBoosterBuild
         /// </summary>
         public Target Pack => _ => _
             .DependsOn(Build)
-            .DependentFor(Core)
+            .DependentFor(DotNetCore)
             .Executes(() =>
             {
                 DotNetPack(s => s
diff --git a/src/Nuke/MSBuildBinaryLogImports.cs b/src/Nuke.Core/MSBuildBinaryLogImports.cs
similarity index 92%
rename from src/Nuke/MSBuildBinaryLogImports.cs
rename to src/Nuke.Core/MSBuildBinaryLogImports.cs
index b56e1433..20a7b65b 100644
--- a/src/Nuke/MSBuildBinaryLogImports.cs
+++ b/src/Nuke.Core/MSBuildBinaryLogImports.cs
@@ -1,4 +1,4 @@
-namespace Rocket.Surgery.Nuke
+namespace Rocket.Surgery.Nuke.DotNetCore
 {
     /// <summary>
     /// What files to include in the binary log
diff --git a/src/Nuke.Core/Rocket.Surgery.Nuke.DotNetCore.csproj b/src/Nuke.Core/Rocket.Surgery.Nuke.DotNetCore.csproj
new file mode 100644
index 00000000..7c69e439
--- /dev/null
+++ b/src/Nuke.Core/Rocket.Surgery.Nuke.DotNetCore.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nuke.Common" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Nuke\Rocket.Surgery.Nuke.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Nuke/CustomDotNetBuildExtensions.cs b/src/Nuke.Core/ToolSettingsExtensions.cs
similarity index 96%
rename from src/Nuke/CustomDotNetBuildExtensions.cs
rename to src/Nuke.Core/ToolSettingsExtensions.cs
index f29882aa..4e9fb8bc 100644
--- a/src/Nuke/CustomDotNetBuildExtensions.cs
+++ b/src/Nuke.Core/ToolSettingsExtensions.cs
@@ -4,12 +4,12 @@
 using Nuke.Common.Tooling;
 using Newtonsoft.Json.Linq;
 
-namespace Rocket.Surgery.Nuke
+namespace Rocket.Surgery.Nuke.DotNetCore
 {
     /// <summary>
     /// Custom msbuild helper extensions
     /// </summary>
-    public static class CustomDotNetBuildExtensions
+    public static class ToolSettingsExtensions
     {
         /// <summary>
         /// Configures binary logging for MSBuild
diff --git a/src/Nuke.DotNetCore/Class1.cs b/src/Nuke.DotNetCore/Class1.cs
new file mode 100644
index 00000000..32e629ac
--- /dev/null
+++ b/src/Nuke.DotNetCore/Class1.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace Rocket.Surgery.Nuke.Core
+{
+    public class Class1
+    {
+    }
+}
diff --git a/src/Nuke.DotNetCore/Rocket.Surgery.Nuke.DotNetCore.csproj b/src/Nuke.DotNetCore/Rocket.Surgery.Nuke.DotNetCore.csproj
new file mode 100644
index 00000000..9f5c4f4a
--- /dev/null
+++ b/src/Nuke.DotNetCore/Rocket.Surgery.Nuke.DotNetCore.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/test/Nuke.Tests/Rocket.Surgery.Nuke.Tests.csproj b/test/Nuke.Tests/Rocket.Surgery.Nuke.Tests.csproj
index 9e076d94..7292ac4f 100644
--- a/test/Nuke.Tests/Rocket.Surgery.Nuke.Tests.csproj
+++ b/test/Nuke.Tests/Rocket.Surgery.Nuke.Tests.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\src\Nuke\Rocket.Surgery.Nuke.csproj" />

From c22582ffff14ce66e70de32c7f85e54b3b1a35d2 Mon Sep 17 00:00:00 2001
From: RLittlesII <6969701+RLittlesII@users.noreply.github.com>
Date: Wed, 17 Jul 2019 22:24:28 -0500
Subject: [PATCH 2/4] fixing my broke.

---
 .build/.build.csproj                              |  2 +-
 Nuke.sln                                          |  2 +-
 .../Rocket.Surgery.Nuke.DotNetCore.csproj         | 15 ---------------
 src/Nuke.DotNetCore/Class1.cs                     |  8 --------
 .../DotNetCoreBuild.cs                            |  0
 .../MSBuildBinaryLogImports.cs                    |  0
 .../Rocket.Surgery.Nuke.DotNetCore.csproj         | 11 ++++++++++-
 .../ToolSettingsExtensions.cs                     |  0
 8 files changed, 12 insertions(+), 26 deletions(-)
 delete mode 100644 src/Nuke.Core/Rocket.Surgery.Nuke.DotNetCore.csproj
 delete mode 100644 src/Nuke.DotNetCore/Class1.cs
 rename src/{Nuke.Core => Nuke.DotNetCore}/DotNetCoreBuild.cs (100%)
 rename src/{Nuke.Core => Nuke.DotNetCore}/MSBuildBinaryLogImports.cs (100%)
 rename src/{Nuke.Core => Nuke.DotNetCore}/ToolSettingsExtensions.cs (100%)

diff --git a/.build/.build.csproj b/.build/.build.csproj
index 1a31dc33..5e4520ba 100644
--- a/.build/.build.csproj
+++ b/.build/.build.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="GitVersion.CommandLine.DotNetCore" />
     <PackageReference Include="ReportGenerator" />
     <ProjectReference Include="../src/Nuke/Rocket.Surgery.Nuke.csproj" />
-    <ProjectReference Include="..\src\Nuke.Core\Rocket.Surgery.Nuke.DotNetCore.csproj" />
+    <ProjectReference Include="../src/Nuke.DotNetCore/Rocket.Surgery.Nuke.DotNetCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Nuke.sln b/Nuke.sln
index e4b95b44..7ed8e628 100644
--- a/Nuke.sln
+++ b/Nuke.sln
@@ -23,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rocket.Surgery.Nuke", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rocket.Surgery.Nuke.Tests", "test\Nuke.Tests\Rocket.Surgery.Nuke.Tests.csproj", "{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rocket.Surgery.Nuke.DotNetCore", "src\Nuke.Core\Rocket.Surgery.Nuke.DotNetCore.csproj", "{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rocket.Surgery.Nuke.DotNetCore", "src\Nuke.DotNetCore\Rocket.Surgery.Nuke.DotNetCore.csproj", "{2D88A441-0EF9-40EF-8A1A-CE5E12F62660}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Nuke.Core/Rocket.Surgery.Nuke.DotNetCore.csproj b/src/Nuke.Core/Rocket.Surgery.Nuke.DotNetCore.csproj
deleted file mode 100644
index 7c69e439..00000000
--- a/src/Nuke.Core/Rocket.Surgery.Nuke.DotNetCore.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Nuke.Common" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Nuke\Rocket.Surgery.Nuke.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Nuke.DotNetCore/Class1.cs b/src/Nuke.DotNetCore/Class1.cs
deleted file mode 100644
index 32e629ac..00000000
--- a/src/Nuke.DotNetCore/Class1.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace Rocket.Surgery.Nuke.Core
-{
-    public class Class1
-    {
-    }
-}
diff --git a/src/Nuke.Core/DotNetCoreBuild.cs b/src/Nuke.DotNetCore/DotNetCoreBuild.cs
similarity index 100%
rename from src/Nuke.Core/DotNetCoreBuild.cs
rename to src/Nuke.DotNetCore/DotNetCoreBuild.cs
diff --git a/src/Nuke.Core/MSBuildBinaryLogImports.cs b/src/Nuke.DotNetCore/MSBuildBinaryLogImports.cs
similarity index 100%
rename from src/Nuke.Core/MSBuildBinaryLogImports.cs
rename to src/Nuke.DotNetCore/MSBuildBinaryLogImports.cs
diff --git a/src/Nuke.DotNetCore/Rocket.Surgery.Nuke.DotNetCore.csproj b/src/Nuke.DotNetCore/Rocket.Surgery.Nuke.DotNetCore.csproj
index 9f5c4f4a..10cfcf5f 100644
--- a/src/Nuke.DotNetCore/Rocket.Surgery.Nuke.DotNetCore.csproj
+++ b/src/Nuke.DotNetCore/Rocket.Surgery.Nuke.DotNetCore.csproj
@@ -1,7 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>$(NoWarn);CS0436</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Nuke.Common" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Nuke\Rocket.Surgery.Nuke.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Nuke.Core/ToolSettingsExtensions.cs b/src/Nuke.DotNetCore/ToolSettingsExtensions.cs
similarity index 100%
rename from src/Nuke.Core/ToolSettingsExtensions.cs
rename to src/Nuke.DotNetCore/ToolSettingsExtensions.cs

From e74a6b01c9d1b459f6ac7bf4329e7a354086686c Mon Sep 17 00:00:00 2001
From: RLittlesII <6969701+RLittlesII@users.noreply.github.com>
Date: Wed, 17 Jul 2019 22:41:23 -0500
Subject: [PATCH 3/4] fixed DotNetCoreBuild.cs

---
 src/Nuke.DotNetCore/DotNetCoreBuild.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Nuke.DotNetCore/DotNetCoreBuild.cs b/src/Nuke.DotNetCore/DotNetCoreBuild.cs
index 67544f48..5bca3a07 100644
--- a/src/Nuke.DotNetCore/DotNetCoreBuild.cs
+++ b/src/Nuke.DotNetCore/DotNetCoreBuild.cs
@@ -69,7 +69,7 @@ public abstract class DotNetCoreBuild : RocketBoosterBuild
             .DependsOn(Build)
             .DependentFor(DotNetCore)
             .DependentFor(Pack)
-            .Triggers(Generate_Code_Coverage_Reports)
+            .DependentFor(Generate_Code_Coverage_Reports)
             .OnlyWhenDynamic(() => TestDirectory.GlobFiles("test/**/*.csproj").Count > 0)
             .WhenSkipped(DependencyBehavior.Execute)
             .Executes(() =>

From 17297f1f03e7e6dba96b3ee922952605fcf73af6 Mon Sep 17 00:00:00 2001
From: David Driscoll <david.driscoll@gmail.com>
Date: Thu, 18 Jul 2019 15:14:26 -0400
Subject: [PATCH 4/4] fixed tests no running properly

---
 src/Nuke.DotNetCore/DotNetCoreBuild.cs | 13 +++++++------
 src/Nuke/RocketBoosterBuild.cs         |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Nuke.DotNetCore/DotNetCoreBuild.cs b/src/Nuke.DotNetCore/DotNetCoreBuild.cs
index 5bca3a07..9c63ebb1 100644
--- a/src/Nuke.DotNetCore/DotNetCoreBuild.cs
+++ b/src/Nuke.DotNetCore/DotNetCoreBuild.cs
@@ -19,12 +19,12 @@ public abstract class DotNetCoreBuild : RocketBoosterBuild
         /// </summary>
         public Target DotNetCore => _ => _;
 
-        /// <summary>
-        /// This will ensure that all local dotnet tools are installed
-        /// </summary>
-        //public Target DotnetToolRestore => _ => _
+        // /// <summary>
+        // /// This will ensure that all local dotnet tools are installed
+        // /// </summary>
+        // public Target DotnetToolRestore => _ => _
         //    .DependsOn(Clean)
-        //    .DependentFor(Core)
+        //    .DependentFor(DotNetCore)
         //    .Unlisted()
         //    .Executes(() => DotNet("tool restore"));
 
@@ -34,6 +34,7 @@ public abstract class DotNetCoreBuild : RocketBoosterBuild
         public Target Restore => _ => _
             .DependentFor(DotNetCore)
             // .DependsOn(DotnetToolRestore)
+            .DependsOn(Clean)
             .Executes(() =>
             {
                 DotNetRestore(s => s
@@ -70,7 +71,7 @@ public abstract class DotNetCoreBuild : RocketBoosterBuild
             .DependentFor(DotNetCore)
             .DependentFor(Pack)
             .DependentFor(Generate_Code_Coverage_Reports)
-            .OnlyWhenDynamic(() => TestDirectory.GlobFiles("test/**/*.csproj").Count > 0)
+            .OnlyWhenDynamic(() => TestDirectory.GlobFiles("**/*.csproj").Count > 0)
             .WhenSkipped(DependencyBehavior.Execute)
             .Executes(() =>
             {
diff --git a/src/Nuke/RocketBoosterBuild.cs b/src/Nuke/RocketBoosterBuild.cs
index d856b3b4..3828d1ae 100644
--- a/src/Nuke/RocketBoosterBuild.cs
+++ b/src/Nuke/RocketBoosterBuild.cs
@@ -178,7 +178,7 @@ public abstract class RocketBoosterBuild : NukeBuild
         public Target GenerateReadme => _ => _
             .Unlisted()
             .TriggeredBy(Clean)
-            .OnlyWhenDynamic(() => IsLocalBuild)
+            .OnlyWhenDynamic(() => IsLocalBuild && Force)
             .Executes(() =>
             {
                 var readmeContent = File.ReadAllText(RootDirectory / "Readme.md");