From 0233e3ee87d1c6c1da8979d7b61465ddb76abf33 Mon Sep 17 00:00:00 2001 From: David Driscoll Date: Wed, 3 Jul 2019 15:45:05 -0400 Subject: [PATCH] Updated templates --- cakefile.cake | 10 +++++----- templates/Rocket.Surgery.Templates.csproj | 4 ++-- templates/Web/Rocket.Surgery.Web.csproj | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cakefile.cake b/cakefile.cake index 709fb75e..658e8528 100644 --- a/cakefile.cake +++ b/cakefile.cake @@ -1,12 +1,12 @@ -#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() { @@ -14,8 +14,8 @@ Task("template pack") 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 index 5ef504a1..c8b8e8a1 100644 --- a/templates/Rocket.Surgery.Templates.csproj +++ b/templates/Rocket.Surgery.Templates.csproj @@ -10,7 +10,7 @@ netstandard2.0 true - False + false false content false @@ -18,8 +18,8 @@ - + diff --git a/templates/Web/Rocket.Surgery.Web.csproj b/templates/Web/Rocket.Surgery.Web.csproj index 0eba0503..f8632f55 100644 --- a/templates/Web/Rocket.Surgery.Web.csproj +++ b/templates/Web/Rocket.Surgery.Web.csproj @@ -2,6 +2,7 @@ netcoreapp3.0 + false