Updated with a few other types of directories

RocketSurgeonsGuild · Jul 4, 2019 · 3bd7e2d · 3bd7e2d
1 parent b2efeba
commit 3bd7e2d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 35 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -11,7 +11,5 @@ after_build:
   - codecov -f "./coverage/solution.cobertura"
 artifacts:
   - path: ./artifacts/nuget/*.nupkg
-cache:
-  - tools -> build.cake, tools/packages.config
 nuget:
   project_feed: true
diff --git a/Packages.props b/Packages.props
@@ -8,17 +8,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Update="Nuke.Common" Version="0.20.1" />
-    <PackageReference Update="Rocket.Surgery.Nuke" Version="0.1.0-beta.7" />
+    <PackageReference Update="Rocket.Surgery.Nuke" Version="0.1.0-beta.8" />
     <PackageReference Update="GitVersion.CommandLine.DotNetCore" Version="5.0.0-beta4-9" />
     <PackageReference Update="ReportGenerator" Version="4.2.5" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="Cake.Common" Version="0.33.0" PrivateAssets="All" />
-    <PackageReference Update="Cake.Core" Version="0.33.0" PrivateAssets="All" />
-    <PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Update="Rocket.Surgery.Extensions.Testing" Version="1.1.9" />
+    <PackageReference Update="Rocket.Surgery.Extensions.Testing" Version="1.1.10" />
     <PackageReference Update="Autofac.Extras.FakeItEasy" Version="5.0.1" />
     <PackageReference Update="Bogus" Version="28.0.1" />
     <PackageReference Update="coverlet.collector" Version="1.0.1" />

diff --git a/Readme.md b/Readme.md
@@ -1,11 +1,11 @@
-# Rocket Surgeons Guild Cake
+# Rocket Surgeons Guild Nuke
 
 | Build | Test | Release |
 |---|---|---|
 |  |
-| [![Cake Pipelines Build Status](https://img.shields.io/vso/build/RocketSurgeonsGuild/Libraries/RSG.Cake.svg?logo=visualstudiocode&style=flat-square)](https://rocketsurgeonsguild.visualstudio.com/Libraries/_build?definitionId=3)  |  |
-|   |   | ![MyGet Pre Release](https://img.shields.io/myget/rocket-surgeons-guild/vpre/Cake.svg?logo=nuget&style=flat-square&label=myget) |
+| [![Nuke Pipelines Build Status](https://img.shields.io/vso/build/RocketSurgeonsGuild/Libraries/RSG.Nuke.svg?logo=visualstudiocode&style=flat-square)](https://rocketsurgeonsguild.visualstudio.com/Libraries/_build?definitionId=3)  |  |
+|   |   | ![MyGet Pre Release](https://img.shields.io/myget/rocket-surgeons-guild/vpre/Nuke.svg?logo=nuget&style=flat-square&label=myget) |
 
-[![Cake Pipelines Build History](https://buildstats.info/azurepipelines/chart/RocketSurgeonsGuild/Libraries/3)](https://rocketsurgeonsguild.visualstudio.com/Libraries/_build?definitionId=3)
+[![Nuke Pipelines Build History](https://buildstats.info/azurepipelines/chart/RocketSurgeonsGuild/Libraries/3)](https://rocketsurgeonsguild.visualstudio.com/Libraries/_build?definitionId=3)
 
 ## More info to come...
diff --git a/src/Nuke/DotNetCoreBuild.cs b/src/Nuke/DotNetCoreBuild.cs
@@ -52,7 +52,7 @@ public abstract class DotNetCoreBuild : RocketBoosterBuild
             .DependentFor(Core)
             .DependentFor(Pack)
             .Triggers(Generate_Code_Coverage_Reports)
-            .OnlyWhenStatic(() => TestDirectory.GlobFiles("**/*.csproj").Count > 0)
+            .OnlyWhenDynamic(() => TestDirectory.GlobFiles("test/**/*.csproj").Count > 0)
             .WhenSkipped(DependencyBehavior.Execute)
             .Executes(() =>
             {
@@ -94,9 +94,6 @@ public abstract class DotNetCoreBuild : RocketBoosterBuild
             {
                 DotNetPack(s => s
                     .SetProject(Solution)
-                    .SetVersion(GitVersion.FullSemVer)
-                    .SetIncludeSource(IncludeSource)
-                    .SetIncludeSymbols(IncludeSymbols)
                     .SetBinaryLogger(LogsDirectory / "pack.binlog", IsLocalBuild ? MSBuildBinaryLogImports.None : MSBuildBinaryLogImports.Embed)
                     .SetFileLogger(LogsDirectory / "pack.log", Verbosity)
                     .SetGitVersionEnvironment(GitVersion)

diff --git a/src/Nuke/RocketBoosterBuild.cs b/src/Nuke/RocketBoosterBuild.cs
@@ -25,33 +25,33 @@ public abstract class RocketBoosterBuild : NukeBuild
         [GitRepository] public readonly GitRepository GitRepository;
         [ComputedGitVersion] public readonly GitVersion GitVersion;
 
+        public AbsolutePath SampleDirectory => RootDirectory / "sample";
         public AbsolutePath SourceDirectory => RootDirectory / "src";
+        public AbsolutePath TemplatesDirectory => RootDirectory / "templates";
         public AbsolutePath TestDirectory => RootDirectory / "test";
         public AbsolutePath ArtifactsDirectory => Variable("Artifacts") != null ? (AbsolutePath)Variable("Artifacts") : RootDirectory / "artifacts";
         public AbsolutePath LogsDirectory => ArtifactsDirectory / "logs";
         public AbsolutePath TestResultsDirectory => ArtifactsDirectory / "test";
         public AbsolutePath NuGetPackageDirectory => ArtifactsDirectory / "nuget";
         public AbsolutePath CoverageDirectory => Variable("Coverage") != null ? (AbsolutePath)Variable("Coverage") : RootDirectory / "coverage";
 
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [include symbols].
-        /// </summary>
-        /// <value><c>true</c> if [include symbols]; otherwise, <c>false</c>.</value>
-        public bool IncludeSymbols { get; set; } = true;
-        /// <summary>
-        /// Gets or sets a value indicating whether [include source].
-        /// </summary>
-        /// <value><c>true</c> if [include source]; otherwise, <c>false</c>.</value>
-        public bool IncludeSource { get; set; } = true;
-
         public Target Clean => _ => _
             .Executes(() =>
             {
-                SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
-                TestDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
                 EnsureCleanDirectory(ArtifactsDirectory);
                 EnsureCleanDirectory(CoverageDirectory);
+
+                EnsureExistingDirectory(SampleDirectory);
+                SampleDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
+
+                EnsureExistingDirectory(SourceDirectory);
+                SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
+
+                EnsureExistingDirectory(TemplatesDirectory);
+                TemplatesDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
+
+                EnsureExistingDirectory(TestDirectory);
+                TestDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
             });
 
         public Target Generate_Code_Coverage_Reports => _ => _

diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
@@ -15,9 +15,5 @@
         <PackageReference Include="xunit.runner.visualstudio" />
         <PackageReference Include="XunitXml.TestLogger" />
     </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Cake.Common" />
-        <PackageReference Include="Cake.Core" />
-    </ItemGroup>
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 </Project>