diff --git a/build.cake b/build.cake index df5529f..67adadf 100644 --- a/build.cake +++ b/build.cake @@ -4,7 +4,14 @@ var configuration = Argument("configuration", "Release"); //////////////////////////////////////////////////////////////// // Tasks +Task("Clean") + .Does(context => +{ + context.CleanDirectory("./.artifacts"); +}); + Task("Build") + .IsDependentOn("Clean") .Does(context => { DotNetCoreBuild("./src/Spectre.Console.sln", new DotNetCoreBuildSettings { @@ -15,7 +22,20 @@ Task("Build") }); }); +Task("Build-Analyzer") + .IsDependentOn("Build") + .Does(context => +{ + DotNetCoreBuild("./src/Spectre.Console.Analyzer.sln", new DotNetCoreBuildSettings { + Configuration = configuration, + NoIncremental = context.HasArgument("rebuild"), + MSBuildSettings = new DotNetCoreMSBuildSettings() + .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) + }); +}); + Task("Build-Examples") + .IsDependentOn("Build") .Does(context => { DotNetCoreBuild("./examples/Examples.sln", new DotNetCoreBuildSettings { @@ -28,6 +48,7 @@ Task("Build-Examples") Task("Test") .IsDependentOn("Build") + .IsDependentOn("Build-Analyzer") .IsDependentOn("Build-Examples") .Does(context => { @@ -48,8 +69,6 @@ Task("Package") .IsDependentOn("Test") .Does(context => { - context.CleanDirectory("./.artifacts"); - context.DotNetCorePack($"./src/Spectre.Console.sln", new DotNetCorePackSettings { Configuration = configuration, NoRestore = true, @@ -58,6 +77,15 @@ Task("Package") MSBuildSettings = new DotNetCoreMSBuildSettings() .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) }); + + context.DotNetCorePack($"./src/Spectre.Console.Analyzer.sln", new DotNetCorePackSettings { + Configuration = configuration, + NoRestore = true, + NoBuild = true, + OutputDirectory = "./.artifacts", + MSBuildSettings = new DotNetCoreMSBuildSettings() + .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) + }); }); Task("Publish-GitHub") diff --git a/src/Spectre.Console.Analyzer.sln b/src/Spectre.Console.Analyzer.sln new file mode 100644 index 0000000..0d2c821 --- /dev/null +++ b/src/Spectre.Console.Analyzer.sln @@ -0,0 +1,79 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30114.105 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Analyzer", "Spectre.Console.Analyzer\Spectre.Console.Analyzer.csproj", "{18178142-A80D-424F-882D-DB0F787210BD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Analyzer.Sandbox", "Spectre.Console.Analyzer.Sandbox\Spectre.Console.Analyzer.Sandbox.csproj", "{44D2E280-8FCD-4FC1-9133-F61E344FD6A6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Analyzer.Tests", "..\test\Spectre.Console.Analyzer.Tests\Spectre.Console.Analyzer.Tests.csproj", "{609D5D1B-D904-4A31-B237-A04B49910166}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console", "Spectre.Console\Spectre.Console.csproj", "{6BFF310F-9601-4E5D-BC80-118AC708D72A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {18178142-A80D-424F-882D-DB0F787210BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {18178142-A80D-424F-882D-DB0F787210BD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {18178142-A80D-424F-882D-DB0F787210BD}.Debug|x64.ActiveCfg = Debug|Any CPU + {18178142-A80D-424F-882D-DB0F787210BD}.Debug|x64.Build.0 = Debug|Any CPU + {18178142-A80D-424F-882D-DB0F787210BD}.Debug|x86.ActiveCfg = Debug|Any CPU + {18178142-A80D-424F-882D-DB0F787210BD}.Debug|x86.Build.0 = Debug|Any CPU + {18178142-A80D-424F-882D-DB0F787210BD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {18178142-A80D-424F-882D-DB0F787210BD}.Release|Any CPU.Build.0 = Release|Any CPU + {18178142-A80D-424F-882D-DB0F787210BD}.Release|x64.ActiveCfg = Release|Any CPU + {18178142-A80D-424F-882D-DB0F787210BD}.Release|x64.Build.0 = Release|Any CPU + {18178142-A80D-424F-882D-DB0F787210BD}.Release|x86.ActiveCfg = Release|Any CPU + {18178142-A80D-424F-882D-DB0F787210BD}.Release|x86.Build.0 = Release|Any CPU + {44D2E280-8FCD-4FC1-9133-F61E344FD6A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44D2E280-8FCD-4FC1-9133-F61E344FD6A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44D2E280-8FCD-4FC1-9133-F61E344FD6A6}.Debug|x64.ActiveCfg = Debug|Any CPU + {44D2E280-8FCD-4FC1-9133-F61E344FD6A6}.Debug|x64.Build.0 = Debug|Any CPU + {44D2E280-8FCD-4FC1-9133-F61E344FD6A6}.Debug|x86.ActiveCfg = Debug|Any CPU + {44D2E280-8FCD-4FC1-9133-F61E344FD6A6}.Debug|x86.Build.0 = Debug|Any CPU + {44D2E280-8FCD-4FC1-9133-F61E344FD6A6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44D2E280-8FCD-4FC1-9133-F61E344FD6A6}.Release|Any CPU.Build.0 = Release|Any CPU + {44D2E280-8FCD-4FC1-9133-F61E344FD6A6}.Release|x64.ActiveCfg = Release|Any CPU + {44D2E280-8FCD-4FC1-9133-F61E344FD6A6}.Release|x64.Build.0 = Release|Any CPU + {44D2E280-8FCD-4FC1-9133-F61E344FD6A6}.Release|x86.ActiveCfg = Release|Any CPU + {44D2E280-8FCD-4FC1-9133-F61E344FD6A6}.Release|x86.Build.0 = Release|Any CPU + {609D5D1B-D904-4A31-B237-A04B49910166}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {609D5D1B-D904-4A31-B237-A04B49910166}.Debug|Any CPU.Build.0 = Debug|Any CPU + {609D5D1B-D904-4A31-B237-A04B49910166}.Debug|x64.ActiveCfg = Debug|Any CPU + {609D5D1B-D904-4A31-B237-A04B49910166}.Debug|x64.Build.0 = Debug|Any CPU + {609D5D1B-D904-4A31-B237-A04B49910166}.Debug|x86.ActiveCfg = Debug|Any CPU + {609D5D1B-D904-4A31-B237-A04B49910166}.Debug|x86.Build.0 = Debug|Any CPU + {609D5D1B-D904-4A31-B237-A04B49910166}.Release|Any CPU.ActiveCfg = Release|Any CPU + {609D5D1B-D904-4A31-B237-A04B49910166}.Release|Any CPU.Build.0 = Release|Any CPU + {609D5D1B-D904-4A31-B237-A04B49910166}.Release|x64.ActiveCfg = Release|Any CPU + {609D5D1B-D904-4A31-B237-A04B49910166}.Release|x64.Build.0 = Release|Any CPU + {609D5D1B-D904-4A31-B237-A04B49910166}.Release|x86.ActiveCfg = Release|Any CPU + {609D5D1B-D904-4A31-B237-A04B49910166}.Release|x86.Build.0 = Release|Any CPU + {6BFF310F-9601-4E5D-BC80-118AC708D72A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6BFF310F-9601-4E5D-BC80-118AC708D72A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6BFF310F-9601-4E5D-BC80-118AC708D72A}.Debug|x64.ActiveCfg = Debug|Any CPU + {6BFF310F-9601-4E5D-BC80-118AC708D72A}.Debug|x64.Build.0 = Debug|Any CPU + {6BFF310F-9601-4E5D-BC80-118AC708D72A}.Debug|x86.ActiveCfg = Debug|Any CPU + {6BFF310F-9601-4E5D-BC80-118AC708D72A}.Debug|x86.Build.0 = Debug|Any CPU + {6BFF310F-9601-4E5D-BC80-118AC708D72A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6BFF310F-9601-4E5D-BC80-118AC708D72A}.Release|Any CPU.Build.0 = Release|Any CPU + {6BFF310F-9601-4E5D-BC80-118AC708D72A}.Release|x64.ActiveCfg = Release|Any CPU + {6BFF310F-9601-4E5D-BC80-118AC708D72A}.Release|x64.Build.0 = Release|Any CPU + {6BFF310F-9601-4E5D-BC80-118AC708D72A}.Release|x86.ActiveCfg = Release|Any CPU + {6BFF310F-9601-4E5D-BC80-118AC708D72A}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3BABBA82-B60D-45CE-9C56-8B833474DD3C} + EndGlobalSection +EndGlobal diff --git a/src/Spectre.Console.sln b/src/Spectre.Console.sln index 44a3622..e738a56 100644 --- a/src/Spectre.Console.sln +++ b/src/Spectre.Console.sln @@ -28,16 +28,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Testing", " EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{E0E45070-123C-4A4D-AA98-2A780308876C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Analyzer", "Spectre.Console.Analyzer\Spectre.Console.Analyzer.csproj", "{26006ACD-F19D-4C2A-8864-FE0D6C15B58C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Analyzer.Sandbox", "Spectre.Console.Analyzer.Sandbox\Spectre.Console.Analyzer.Sandbox.csproj", "{241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analyzer", "Analyzer", "{EEB25BA6-F77C-41A8-9464-64BB621D1019}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Tests", "..\test\Spectre.Console.Tests\Spectre.Console.Tests.csproj", "{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Analyzer.Tests", "..\test\Spectre.Console.Analyzer.Tests\Spectre.Console.Analyzer.Tests.csproj", "{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -84,30 +76,6 @@ Global {7D5F6704-8249-46DD-906C-9E66419F215F}.Release|x64.Build.0 = Release|Any CPU {7D5F6704-8249-46DD-906C-9E66419F215F}.Release|x86.ActiveCfg = Release|Any CPU {7D5F6704-8249-46DD-906C-9E66419F215F}.Release|x86.Build.0 = Release|Any CPU - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C}.Debug|x64.ActiveCfg = Debug|Any CPU - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C}.Debug|x64.Build.0 = Debug|Any CPU - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C}.Debug|x86.ActiveCfg = Debug|Any CPU - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C}.Debug|x86.Build.0 = Debug|Any CPU - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C}.Release|Any CPU.Build.0 = Release|Any CPU - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C}.Release|x64.ActiveCfg = Release|Any CPU - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C}.Release|x64.Build.0 = Release|Any CPU - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C}.Release|x86.ActiveCfg = Release|Any CPU - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C}.Release|x86.Build.0 = Release|Any CPU - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Debug|x64.ActiveCfg = Debug|Any CPU - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Debug|x64.Build.0 = Debug|Any CPU - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Debug|x86.ActiveCfg = Debug|Any CPU - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Debug|x86.Build.0 = Debug|Any CPU - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Release|Any CPU.Build.0 = Release|Any CPU - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Release|x64.ActiveCfg = Release|Any CPU - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Release|x64.Build.0 = Release|Any CPU - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Release|x86.ActiveCfg = Release|Any CPU - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Release|x86.Build.0 = Release|Any CPU {60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Debug|Any CPU.Build.0 = Debug|Any CPU {60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -120,18 +88,6 @@ Global {60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Release|x64.Build.0 = Release|Any CPU {60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Release|x86.ActiveCfg = Release|Any CPU {60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Release|x86.Build.0 = Release|Any CPU - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Debug|x64.ActiveCfg = Debug|Any CPU - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Debug|x64.Build.0 = Debug|Any CPU - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Debug|x86.ActiveCfg = Debug|Any CPU - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Debug|x86.Build.0 = Debug|Any CPU - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Release|Any CPU.Build.0 = Release|Any CPU - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Release|x64.ActiveCfg = Release|Any CPU - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Release|x64.Build.0 = Release|Any CPU - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Release|x86.ActiveCfg = Release|Any CPU - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -139,9 +95,6 @@ Global GlobalSection(NestedProjects) = preSolution {C3E2CB5C-1517-4C75-B59A-93D4E22BEC8D} = {20595AD4-8D75-4AF8-B6BC-9C38C160423F} {0EFE694D-0770-4E71-BF4E-EC2B41362F79} = {E0E45070-123C-4A4D-AA98-2A780308876C} - {26006ACD-F19D-4C2A-8864-FE0D6C15B58C} = {EEB25BA6-F77C-41A8-9464-64BB621D1019} - {241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11} = {EEB25BA6-F77C-41A8-9464-64BB621D1019} - {F78E47DF-8235-4EAC-9A01-C513AB7C7D13} = {EEB25BA6-F77C-41A8-9464-64BB621D1019} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5729B071-67A0-48FB-8B1B-275E6822086C} diff --git a/test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj b/test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj index 987bebd..c48f3c7 100644 --- a/test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj +++ b/test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj @@ -15,10 +15,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - diff --git a/test/Spectre.Console.Tests/Spectre.Console.Tests.csproj b/test/Spectre.Console.Tests/Spectre.Console.Tests.csproj index 99780b9..3bf7cea 100644 --- a/test/Spectre.Console.Tests/Spectre.Console.Tests.csproj +++ b/test/Spectre.Console.Tests/Spectre.Console.Tests.csproj @@ -32,7 +32,6 @@ -