updated build

Author: leastprivilege

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "signclient": {
+      "version": "1.2.17",
+      "commands": [
+        "SignClient"
+      ]
+    }
+  }
+}

build.cmd

@@ -1,3 +1,4 @@
 @echo off
-dotnet tool install --tool-path tools SignClient
+dotnet tool restore
+
 dotnet run --project build -- %*

build.ps1

@@ -1,4 +1,4 @@
-dotnet tool install --tool-path tools SignClient
-
 $ErrorActionPreference = "Stop";
+dotnet tool restore
+
 dotnet run --project build -- $args

build.sh

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

build/Program.cs

@@ -9,12 +9,15 @@ namespace build
 {
     class Program
     {
-        private const bool RequireTests = true;
+        private static class Targets
+        {
+            public const string Build = "build";
+            public const string Test = "test";
+            public const string Pack = "pack";
+        }
+
+        static string BinaryToSign = "IdentityServer4.AccessTokenValidation.dll";
 
-        private const string ArtifactsDir = "artifacts";
-        private const string Build = "build";
-        private const string Test = "test";
-        private const string Pack = "pack";
 
         static void Main(string[] args)
         {
@@ -25,52 +28,35 @@ static void Main(string[] args)
 
             app.OnExecute(() =>
             {
-                Target(Build, () => 
+                Target(Targets.Build, () => 
                 {
-                    var solution = Directory.GetFiles(".", "*.sln", SearchOption.TopDirectoryOnly).First();
-
-                    Run("dotnet", $"build {solution} -c Release");
+                    Run("dotnet", $"build -c Release");
 
                     if (sign.HasValue())
                     {
-                        Sign("IdentityServer4.AccessTokenValidation.dll", "./src/bin/release");
+                        Sign(BinaryToSign, "./src/bin/release");
                     }
                 });
 
-                Target(Test, DependsOn(Build), () => 
+                Target(Targets.Test, DependsOn(Targets.Build), () => 
                 {
-                    try
-                    {
-                        var tests = Directory.GetFiles("./test", "*.csproj", SearchOption.AllDirectories);
-
-                        foreach (var test in tests)
-                        {
-                            Run("dotnet", $"test {test} -c Release --no-build");
-                        }    
-                    }
-                    catch (System.IO.DirectoryNotFoundException ex)
-                    {
-                        if (RequireTests)
-                        {
-                            throw new Exception($"No tests found: {ex.Message}");
-                        };
-                    }
+                    Run("dotnet", $"test -c Release --no-build");
                 });
 
-                Target(Pack, DependsOn(Build), () => 
+                Target(Targets.Pack, DependsOn(Targets.Test), () => 
                 {
                     var project = Directory.GetFiles("./src", "*.csproj", SearchOption.TopDirectoryOnly).First();
 
-                    Run("dotnet", $"pack {project} -c Release -o ./{ArtifactsDir} --no-build");
+                    Run("dotnet", $"pack {project} -c Release -o ./artifacts --no-build");
 
                     if (sign.HasValue())
                     {
-                        Sign("*.nupkg", $"./{ArtifactsDir}");
+                        Sign("*.nupkg", $"./artifacts");
                     }
                 });
 
 
-                Target("default", DependsOn(Test, Pack));
+                Target("default", DependsOn(Targets.Test, Targets.Pack));
                 RunTargetsAndExit(app.RemainingArguments);
             });
 
@@ -93,19 +79,23 @@ private static void Sign(string extension, string directory)
             }
 
             var files = Directory.GetFiles(directory, extension, SearchOption.AllDirectories);
+            if (files.Count() == 0)
+            {
+                throw new Exception($"File to sign not found: {extension}");
+            }
 
             foreach (var file in files)
             {
                 Console.WriteLine("  Signing " + file);
-                Run("./tools/signclient", $"sign -c {signClientConfig} -i {file} -r [email protected] -s \"{signClientSecret}\" -n 'IdentityServer4'", noEcho: true);
+                Run("dotnet", $"SignClient sign -c {signClientConfig} -i {file} -r [email protected] -s \"{signClientSecret}\" -n 'IdentityServer4'", noEcho: true);
             }
         }
 
         private static void CleanArtifacts()
         {
-            Directory.CreateDirectory($"./{ArtifactsDir}");
+            Directory.CreateDirectory($"./artifacts");
 
-            foreach (var file in Directory.GetFiles($"./{ArtifactsDir}"))
+            foreach (var file in Directory.GetFiles($"./artifacts"))
             {
                 File.Delete(file);
             }

build/build.csproj

@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bullseye" Version="3.0.0-rc.1" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.4.1" />
-    <PackageReference Include="SimpleExec" Version="6.0.0" />
+    <PackageReference Include="Bullseye" Version="3.0.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.4.4" />
+    <PackageReference Include="SimpleExec" Version="6.1.0" />
   </ItemGroup>
 
 </Project>

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0.100"
+    "version": "3.1.100"
   }
 }