Move SignTool to tools/cert

refs: #42
elastic · Nov 25, 2019 · 271a40a · 271a40a
1 parent 255f131
commit 271a40a
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 1 deletion.
diff --git a/src/build/BullseyeTargets/SignProductBinariesTarget.cs b/src/build/BullseyeTargets/SignProductBinariesTarget.cs
@@ -12,7 +12,11 @@ public class SignProductBinariesTarget : SignToolTargetBase<SignProductBinariesT
     {
         public static async Task RunAsync(IElastiBuildCommand cmd, BuildContext ctx, string target)
         {
-            var SignToolExePath = Path.Combine(ctx.ToolsDir, MagicStrings.Files.SignToolExe);
+            var SignToolExePath = Path.Combine(
+                ctx.ToolsDir,
+                MagicStrings.Dirs.Cert,
+                MagicStrings.Files.SignToolExe);
+
             var (certPass, SignToolArgs) = MakeSignToolArgs(ctx, target);
 
             var ap = ctx.GetArtifactPackage();

diff --git a/src/shared/MagicStrings.cs b/src/shared/MagicStrings.cs
@@ -58,6 +58,7 @@ public static class Dirs
             public static readonly string Resources = "resources";
             public static readonly string Config = "config";
             public static readonly string Compiler = "compiler";
+            public static readonly string Cert = "cert";
         }
 
         public static class Services

diff --git a/...ows.Build.Appx.AppxPackaging.dll.manifest → ...ows.Build.Appx.AppxPackaging.dll.manifest b/...ows.Build.Appx.AppxPackaging.dll.manifest → ...ows.Build.Appx.AppxPackaging.dll.manifest
diff --git a/...t.Windows.Build.Appx.AppxSip.dll.manifest → ...t.Windows.Build.Appx.AppxSip.dll.manifest b/...t.Windows.Build.Appx.AppxSip.dll.manifest → ...t.Windows.Build.Appx.AppxSip.dll.manifest
diff --git a/...ndows.Build.Appx.OpcServices.dll.manifest → ...ndows.Build.Appx.OpcServices.dll.manifest b/...ndows.Build.Appx.OpcServices.dll.manifest → ...ndows.Build.Appx.OpcServices.dll.manifest
diff --git a/...ndows.Build.Signing.mssign32.dll.manifest → ...ndows.Build.Signing.mssign32.dll.manifest b/...ndows.Build.Signing.mssign32.dll.manifest → ...ndows.Build.Signing.mssign32.dll.manifest
diff --git a/...ndows.Build.Signing.wintrust.dll.manifest → ...ndows.Build.Signing.wintrust.dll.manifest b/...ndows.Build.Signing.wintrust.dll.manifest → ...ndows.Build.Signing.wintrust.dll.manifest
diff --git a/tools/appxpackaging.dll → tools/cert/appxpackaging.dll b/tools/appxpackaging.dll → tools/cert/appxpackaging.dll
diff --git a/tools/appxsip.dll → tools/cert/appxsip.dll b/tools/appxsip.dll → tools/cert/appxsip.dll
diff --git a/tools/mssign32.dll → tools/cert/mssign32.dll b/tools/mssign32.dll → tools/cert/mssign32.dll
diff --git a/tools/opcservices.dll → tools/cert/opcservices.dll b/tools/opcservices.dll → tools/cert/opcservices.dll
diff --git a/tools/signtool.exe → tools/cert/signtool.exe b/tools/signtool.exe → tools/cert/signtool.exe
diff --git a/tools/signtool.exe.manifest → tools/cert/signtool.exe.manifest b/tools/signtool.exe.manifest → tools/cert/signtool.exe.manifest
diff --git a/tools/wintrust.dll → tools/cert/wintrust.dll b/tools/wintrust.dll → tools/cert/wintrust.dll