Merge branch 'feature/0.38.2'

* feature/0.38.2:
  (GH-68) Update to Cake 0.38.2 * fixes #68
  Can't cache on build.cake
  Update SDK to latest 2.1
  Fixed NuGet package icon and license
  Update global.json to also allow newer versions
  Add the build project to the main solution

appveyor.yml

@@ -1,3 +1,6 @@
+# Image used
+image: Visual Studio 2019
+
 # Build script
 init:
   - git config --global core.autocrlf true
@@ -21,4 +24,5 @@ branches:
 
 # Build cache
 cache:
-- tools -> build.cake
+- build.ps1
+- global.json

build.ps1

@@ -31,7 +31,7 @@ Param(
     [string[]]$ScriptArgs
 )
 
-$DotNetVersion = "2.1.803";
+$DotNetVersion = "2.1.807";
 $DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
 $NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
 

build/global.json

@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "version": "2.1.802"
+    "version": "2.1.807",
+    "rollForward": "latestMajor"
   }
 }

global.json

@@ -1,6 +1,6 @@
 {
-  "projects": [ "src", "build" ],
   "sdk": {
-    "version": "2.1.803"
+    "version": "2.1.807",
+    "rollForward": "latestMajor"
   }
 }

src/Cake.Frosting.Tests/Fakes/NullConsole.cs

@@ -31,5 +31,6 @@ public void ResetColor()
 
         public ConsoleColor ForegroundColor { get; set; }
         public ConsoleColor BackgroundColor { get; set; }
+        public bool SupportAnsiEscapeCodes => false;
     }
 }

src/Cake.Frosting.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26403.7
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30204.135
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Frosting", "Cake.Frosting\Cake.Frosting.csproj", "{A608FD39-2B71-4B6E-B238-AE80BB2794F8}"
 EndProject
@@ -10,6 +10,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Example", "Example", "{8BFA
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cake.Frosting.Tests", "Cake.Frosting.Tests\Cake.Frosting.Tests.csproj", "{F6A8095C-E2B6-4D8B-88A1-213376387FD5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "..\build\Build.csproj", "{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -56,11 +58,26 @@ Global
 		{F6A8095C-E2B6-4D8B-88A1-213376387FD5}.Release|x64.Build.0 = Release|Any CPU
 		{F6A8095C-E2B6-4D8B-88A1-213376387FD5}.Release|x86.ActiveCfg = Release|Any CPU
 		{F6A8095C-E2B6-4D8B-88A1-213376387FD5}.Release|x86.Build.0 = Release|Any CPU
+		{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}.Debug|x64.Build.0 = Debug|Any CPU
+		{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}.Debug|x86.Build.0 = Debug|Any CPU
+		{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}.Release|x64.ActiveCfg = Release|Any CPU
+		{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}.Release|x64.Build.0 = Release|Any CPU
+		{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}.Release|x86.ActiveCfg = Release|Any CPU
+		{A117400E-6E1A-4FB0-9BD8-E298ED331FAC}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{ED379398-DA69-4D1E-B712-27DC0D67ABC3} = {8BFACDC8-8BBF-4751-BB54-85B0D28A61A2}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {34EDB4FC-F467-4967-9101-D7027C4EC6CE}
+	EndGlobalSection
 EndGlobal

src/Cake.Frosting/Cake.Frosting.csproj

@@ -5,7 +5,7 @@
     <Copyright>Copyright (c) .NET Foundation and contributors</Copyright>
     <Authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström and contributors</Authors>
     <PackageTags>Cake;Build;Build automation</PackageTags>
-    <PackageIconUrl>https://raw.githubusercontent.com/cake-build/graphics/master/png/cake-medium.png</PackageIconUrl>
+    <PackageIcon>cake-medium.png</PackageIcon>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/cake-build/frosting</RepositoryUrl>
@@ -23,9 +23,13 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.37.0" />
-    <PackageReference Include="Cake.Common" Version="0.37.0" />
-    <None Include="../../LICENSE" Pack="true" PackagePath="$(PackageLicenseFile)"/>
+    <PackageReference Include="Cake.Core" Version="0.38.2" />
+    <PackageReference Include="Cake.Common" Version="0.38.2" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="images\" />
+    <None Include="../../cake-medium.png" Link="images\cake-medium.png" Pack="true" PackagePath="/" />
+    <None Include="../../LICENSE" Pack="true" PackagePath="/" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

src/Cake.Frosting/Internal/DefaultConsole.cs

@@ -29,6 +29,11 @@ public ConsoleColor BackgroundColor
             set => Console.BackgroundColor = value;
         }
 
+        /// <summary>
+        /// Gets if console supports ANSI escape codes.
+        /// </summary>
+        public bool SupportAnsiEscapeCodes => false;
+
         /// <summary>
         /// Writes the text representation of the specified array of objects to the
         /// console output using the specified format information.

template/Cake.Frosting.Template.nuspec

@@ -5,8 +5,9 @@
         <description>Cake.Frosting templates for the .NET SDK.</description>
         <summary>Cake (C# Make) is a build automation system with a C# DSL to do things like compiling code, copy files/folders, running unit tests, compress files and build NuGet packages.</summary>
         <authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström and contributors</authors>
-        <licenseUrl>https://github.com/cake-build/frosting/blob/develop/LICENSE</licenseUrl>
+        <license type="expression">MIT</license>
         <projectUrl>https://github.com/cake-build/frosting</projectUrl>
+        <icon>cake-medium.png</icon>
         <iconUrl>https://raw.githubusercontent.com/cake-build/graphics/master/png/cake-medium.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <copyright>Copyright (c) .NET Foundation and contributors</copyright>
@@ -16,6 +17,8 @@
         </packageTypes>
     </metadata>
     <files>
+        <file src="..\cake-medium.png" target="cake-medium.png" />
+        <file src="..\LICENSE" target="LICENSE" />
         <file src=".template.config/template.json" target="content/.template.config" />
         <file src="build.ps1" target="content/build.ps1" />
         <file src="Build.csproj" target="content/build" />