Updated templates

RocketSurgeonsGuild · Jul 3, 2019 · 0233e3e · 0233e3e
1 parent cbc9353
commit 0233e3e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/cakefile.cake b/cakefile.cake
@@ -1,21 +1,21 @@
-#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.9.2";
+#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.10.0";
 
 Task("Default")
-    .IsDependentOn("dotnetcore");
+    .IsDependentOn("dotnetcore test");
 
 Task("template pack")
     .WithCriteria(() => Settings.Pack.Enabled)
     .IsDependeeOf("Default")
-    .DoesForEach(GetFiles("templates/*.csproj"), (solution) => {
+    .DoesForEach(GetFiles("*.sln"), (solution) => {
         DotNetCorePack(
             solution.FullPath,
             new DotNetCorePackSettings() {
                 Verbosity = Settings.DotNetCoreVerbosity,
                 Configuration = Settings.Configuration,
                 EnvironmentVariables = Settings.Environment,
                 OutputDirectory = ArtifactDirectoryPath("nuget").MakeAbsolute(Context.Environment).FullPath,
-                ArgumentCustomization = a => CreateBinLogger(a, "template-pacl"),
-                MSBuildSettings = CreateDotNetCoreMsBuildSettings("template-pacl")
+                ArgumentCustomization = a => CreateBinLogger(a, "template-pack"),
+                MSBuildSettings = CreateDotNetCoreMsBuildSettings("template-pack")
                     .WithProperty("RestoreNoCache", BuildSystem.IsLocalBuild.ToString()),
             }
         );

diff --git a/templates/Rocket.Surgery.Templates.csproj b/templates/Rocket.Surgery.Templates.csproj
@@ -10,16 +10,16 @@
     <TargetFramework>netstandard2.0</TargetFramework>
 
     <IncludeContentInPack>true</IncludeContentInPack>
-    <IncludeBuildOutput>False</IncludeBuildOutput>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
     <ContentTargetFolders>content</ContentTargetFolders>
     <EnableDefaultItems>false</EnableDefaultItems>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="**\*" Exclude="**\bin\**;**\obj\**;*.csproj" PackagePath="content\templates\" />
     <Compile Remove="**\*.cs" />
+    <Content Include="**\*" Exclude="**\bin\**;**\obj\**;*.csproj" PackagePath="content\templates\" />
   </ItemGroup>
 
 </Project>
diff --git a/templates/Web/Rocket.Surgery.Web.csproj b/templates/Web/Rocket.Surgery.Web.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <!--#if (no-version)