From 708982ad99b87f26d56697a716472f5d01f038ec Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpparsons@gmail.com>
Date: Sat, 18 Nov 2017 13:24:57 -0800
Subject: [PATCH] Move VS insertion item after signing

The VS insertion items require a bit more work to be a part of batch
signing. In particular the VSMAN files because they contain checksums of
many of our other assets. These need to be rewritten during batch
signing to have the new correct values.

These assets though aren't actually required to be signed though. Hence
for now just moving the building of them till after signing completes.
---
 build/config/SignToolData.json |  3 +--
 build/scripts/build.ps1        | 27 +++++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/build/config/SignToolData.json b/build/config/SignToolData.json
index de02296648d..e06fdf1934f 100644
--- a/build/config/SignToolData.json
+++ b/build/config/SignToolData.json
@@ -109,8 +109,7 @@
         "Vsix\\VisualStudioSetup.Next\\Roslyn.VisualStudio.Setup.Next.vsix",
         "Vsix\\VisualStudioSetup\\Roslyn.VisualStudio.Setup.vsix",
         "Vsix\\Roslyn\\RoslynDeployment.vsix",
-        "Vsix\\Templates\\Roslyn SDK.vsix",
-        "Vsix\\CodeAnalysisCompilers\\Microsoft.CodeAnalysis.Compilers.vsix"
+        "Vsix\\Templates\\Roslyn SDK.vsix"
       ]
     },
     {
diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1
index eb2ea6fa208..3a1739a12e5 100644
--- a/build/scripts/build.ps1
+++ b/build/scripts/build.ps1
@@ -179,6 +179,21 @@ function Build-Artifacts() {
 
     if ($buildAll) {
         Build-ExtraSignArtifacts
+    }
+
+    if ($pack) {
+        Build-NuGetPackages
+
+        if ($cibuild -or $official) { 
+            Build-DeployToSymStore
+        }
+    }
+
+    if ($sign) {
+        Run-SignTool
+    }
+
+    if ($buildAll) {
         Build-InsertionItems
     }
 }
@@ -636,18 +651,6 @@ try {
         Build-Artifacts
     }
 
-    if ($pack) {
-        Build-NuGetPackages
-
-        if ($cibuild -or $official) { 
-            Build-DeployToSymStore
-        }
-    }
-
-    if ($sign) {
-        Run-SignTool
-    }
-
     if ($testDesktop -or $testCoreClr -or $testVsi -or $testVsiNetCore) {
         Test-XUnit
     } 
-- 
GitLab