update to new build script (#134)

Author: adamralph

build.cmd

@@ -1,4 +1,2 @@
 @echo off
-dotnet tool restore
-
-dotnet run --project build -- %*
+dotnet run --project build -- %*

build.ps1

@@ -1,4 +1,2 @@
 $ErrorActionPreference = "Stop";
-dotnet tool restore
-
-dotnet run --project build -- $args
+dotnet run --project build -- $args

build.sh

@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 set -euo pipefail
-dotnet tool restore
-
-dotnet run --project build -- "$@"
+dotnet run --project build -- "$@"

build/Program.cs

@@ -1,104 +1,99 @@
 using System;
 using System.IO;
-using System.Linq;
-using McMaster.Extensions.CommandLineUtils;
 using static Bullseye.Targets;
 using static SimpleExec.Command;
 
 namespace build
 {
-    class Program
+    internal static class Program
     {
+        private const string packOutput = "./artifacts";
+        private const string envVarMissing = " environment variable is missing. Aborting.";
+
         private static class Targets
         {
+            public const string RestoreTools = "restore-tools";
+            public const string CleanBuildOutput = "clean-build-output";
+            public const string CleanPackOutput = "clean-pack-output";
             public const string Build = "build";
             public const string Test = "test";
             public const string Pack = "pack";
+            public const string SignBinary = "sign-binary";
+            public const string SignPackage = "sign-package";
         }
 
-        static string BinaryToSign = "IdentityServer4.AccessTokenValidation.dll";
-
-        
-        static void Main(string[] args)
+        internal static void Main(string[] args)
         {
-            var app = new CommandLineApplication(throwOnUnexpectedArg: false);
-            var sign = app.Option<(bool hasValue, int theValue)>("--sign", "Sign binaries and nuget package", CommandOptionType.SingleOrNoValue);
+            Target(Targets.RestoreTools, () =>
+            {
+                Run("dotnet", "tool restore");
+            });
 
-            CleanArtifacts();
+            Target(Targets.CleanBuildOutput, () =>
+            {
+                Run("dotnet", "clean -c Release -v m --nologo");
+            });
 
-            app.OnExecute(() =>
+            Target(Targets.Build, DependsOn(Targets.CleanBuildOutput), () =>
             {
-                Target(Targets.Build, () => 
-                {
-                    Run("dotnet", $"build -c Release");
+                Run("dotnet", "build -c Release --nologo");
+            });
 
-                    if (sign.HasValue())
-                    {
-                        Sign(BinaryToSign, "./src/bin/release");
-                    }
-                });
+            Target(Targets.SignBinary, DependsOn(Targets.Build, Targets.RestoreTools), () =>
+            {
+                Sign("./src/bin/Release", "IdentityServer4.AccessTokenValidation.dll");
+            });
 
-                Target(Targets.Test, DependsOn(Targets.Build), () => 
-                {
-                    Run("dotnet", $"test -c Release --no-build");
-                });
-                
-                Target(Targets.Pack, DependsOn(Targets.Test), () => 
-                {
-                    var project = Directory.GetFiles("./src", "*.csproj", SearchOption.TopDirectoryOnly).First();
+            Target(Targets.Test, DependsOn(Targets.Build), () =>
+            {
+                Run("dotnet", "test -c Release --no-build --nologo");
+            });
 
-                    Run("dotnet", $"pack {project} -c Release -o ./artifacts --no-build");
-                    
-                    if (sign.HasValue())
-                    {
-                        Sign("*.nupkg", $"./artifacts");
-                    }
-                });
+            Target(Targets.CleanPackOutput, () =>
+            {
+                if (Directory.Exists(packOutput))
+                {
+                    Directory.Delete(packOutput, true);
+                }
+            });
 
+            Target(Targets.Pack, DependsOn(Targets.Build, Targets.CleanPackOutput), () =>
+            {
+                Run("dotnet", $"pack ./src/IdentityServer4.AccessTokenValidation.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
+            });
 
-                Target("default", DependsOn(Targets.Test, Targets.Pack));
-                RunTargetsAndExit(app.RemainingArguments);
+            Target(Targets.SignPackage, DependsOn(Targets.Pack, Targets.RestoreTools), () =>
+            {
+                Sign(packOutput, "*.nupkg");
             });
 
-            app.Execute(args);
+            Target("default", DependsOn(Targets.Test, Targets.Pack));
+
+            Target("sign", DependsOn(Targets.SignBinary, Targets.Test, Targets.SignPackage));
+
+            RunTargetsAndExit(args, ex => ex is SimpleExec.NonZeroExitCodeException || ex.Message.EndsWith(envVarMissing));
         }
 
-        private static void Sign(string extension, string directory)
+        private static void Sign(string path, string searchTerm)
         {
             var signClientConfig = Environment.GetEnvironmentVariable("SignClientConfig");
             var signClientSecret = Environment.GetEnvironmentVariable("SignClientSecret");
 
             if (string.IsNullOrWhiteSpace(signClientConfig))
             {
-                throw new Exception("SignClientConfig environment variable is missing. Aborting.");
+                throw new Exception($"SignClientConfig{envVarMissing}");
             }
 
             if (string.IsNullOrWhiteSpace(signClientSecret))
             {
-                throw new Exception("SignClientSecret environment variable is missing. Aborting.");
+                throw new Exception($"SignClientSecret{envVarMissing}");
             }
 
-            var files = Directory.GetFiles(directory, extension, SearchOption.AllDirectories);
-            if (files.Count() == 0)
+            foreach (var file in Directory.GetFiles(path, searchTerm, SearchOption.AllDirectories))
             {
-                throw new Exception($"File to sign not found: {extension}");
-            }
-
-            foreach (var file in files)
-            {
-                Console.WriteLine("  Signing " + file);
+                Console.WriteLine($"  Signing {file}");
                 Run("dotnet", $"SignClient sign -c {signClientConfig} -i {file} -r [email protected] -s \"{signClientSecret}\" -n 'IdentityServer4'", noEcho: true);
             }
         }
-
-        private static void CleanArtifacts()
-        {
-            Directory.CreateDirectory($"./artifacts");
-
-            foreach (var file in Directory.GetFiles($"./artifacts"))
-            {
-                File.Delete(file);
-            }
-        }
     }
-}
+}