diff --git a/appveyor.yml b/appveyor.yml index 3e8f855..530c9a8 100644 --- a/appveyor.yml +++ b/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 \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index e66c3c7..f691b99 100644 --- a/build.ps1 +++ b/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" diff --git a/build/global.json b/build/global.json index b354da9..3789e80 100644 --- a/build/global.json +++ b/build/global.json @@ -1,5 +1,6 @@ { "sdk": { - "version": "2.1.802" + "version": "2.1.807", + "rollForward": "latestMajor" } } diff --git a/cake-medium.png b/cake-medium.png new file mode 100644 index 0000000..3093eb2 Binary files /dev/null and b/cake-medium.png differ diff --git a/global.json b/global.json index 653895f..3c913e7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { - "projects": [ "src", "build" ], "sdk": { - "version": "2.1.803" + "version": "2.1.807", + "rollForward": "latestMajor" } } diff --git a/src/Cake.Frosting.Tests/Fakes/NullConsole.cs b/src/Cake.Frosting.Tests/Fakes/NullConsole.cs index 671f111..bc70b42 100644 --- a/src/Cake.Frosting.Tests/Fakes/NullConsole.cs +++ b/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; } } diff --git a/src/Cake.Frosting.sln b/src/Cake.Frosting.sln index cf63224..aece9a6 100644 --- a/src/Cake.Frosting.sln +++ b/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,6 +58,18 @@ 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 @@ -63,4 +77,7 @@ Global 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 diff --git a/src/Cake.Frosting/Cake.Frosting.csproj b/src/Cake.Frosting/Cake.Frosting.csproj index f5d4bfc..af499f5 100644 --- a/src/Cake.Frosting/Cake.Frosting.csproj +++ b/src/Cake.Frosting/Cake.Frosting.csproj @@ -5,7 +5,7 @@ Copyright (c) .NET Foundation and contributors Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström and contributors Cake;Build;Build automation - https://raw.githubusercontent.com/cake-build/graphics/master/png/cake-medium.png + cake-medium.png MIT git https://github.com/cake-build/frosting @@ -23,9 +23,13 @@ portable - - - + + + + + + + true diff --git a/src/Cake.Frosting/Internal/DefaultConsole.cs b/src/Cake.Frosting/Internal/DefaultConsole.cs index ba5bca1..161e78c 100644 --- a/src/Cake.Frosting/Internal/DefaultConsole.cs +++ b/src/Cake.Frosting/Internal/DefaultConsole.cs @@ -29,6 +29,11 @@ public ConsoleColor BackgroundColor set => Console.BackgroundColor = value; } + /// + /// Gets if console supports ANSI escape codes. + /// + public bool SupportAnsiEscapeCodes => false; + /// /// Writes the text representation of the specified array of objects to the /// console output using the specified format information. diff --git a/template/Cake.Frosting.Template.nuspec b/template/Cake.Frosting.Template.nuspec index ce1c2f4..a5adb17 100644 --- a/template/Cake.Frosting.Template.nuspec +++ b/template/Cake.Frosting.Template.nuspec @@ -5,8 +5,9 @@ Cake.Frosting templates for the .NET SDK. 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. Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström and contributors - https://github.com/cake-build/frosting/blob/develop/LICENSE + MIT https://github.com/cake-build/frosting + cake-medium.png https://raw.githubusercontent.com/cake-build/graphics/master/png/cake-medium.png false Copyright (c) .NET Foundation and contributors @@ -16,6 +17,8 @@ + +