From 8f7d2e41caf47e8b54d67cd9979efa2ede9ac1b2 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpar@microsoft.com>
Date: Mon, 15 Aug 2016 09:11:27 -0700
Subject: [PATCH] Move to using SignTool as a NuGet package

---
 NuGet.Config                       |   1 +
 build/Targets/Dependencies.props   |   1 +
 build/ToolsetPackages/project.json |   3 +-
 build/config/SignToolData.json     | 136 +++++++++++++++++++++++++++++
 src/Tools/MicroBuild/Build.proj    |   5 +-
 src/Tools/RepoUtil/RepoData.json   |   3 +-
 6 files changed, 146 insertions(+), 3 deletions(-)
 create mode 100644 build/config/SignToolData.json

diff --git a/NuGet.Config b/NuGet.Config
index befd326f194..c9724bb4d8e 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -27,6 +27,7 @@
     <add key="myget.org roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
     <add key="myget.org devcore" value="https://www.myget.org/F/vs-devcore/api/v3/index.json" />
     <add key="myget.org roslyn-build-tools" value = "https://dotnet.myget.org/F/roslyn-build-tools/api/v3/index.json" />
+    <add key="myget.org roslyn-tools" value = "https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 
diff --git a/build/Targets/Dependencies.props b/build/Targets/Dependencies.props
index 5648ca30a15..7510573849a 100644
--- a/build/Targets/Dependencies.props
+++ b/build/Targets/Dependencies.props
@@ -10,6 +10,7 @@
     <MicrosoftDiaSymReaderNativeVersion>1.5.0-beta1</MicrosoftDiaSymReaderNativeVersion>
     <MicrosoftDiaSymReaderPortablePdbVersion>1.2.0-beta1-60723-01</MicrosoftDiaSymReaderPortablePdbVersion>
     <MicrosoftVisualBasicVersion>10.0.1</MicrosoftVisualBasicVersion>
+    <RoslynToolsMicrosoftSignToolVersion>0.2.0-beta</RoslynToolsMicrosoftSignToolVersion>
     <SystemAppContextVersion>4.1.0</SystemAppContextVersion>
     <SystemCollectionsVersion>4.0.11</SystemCollectionsVersion>
     <SystemCollectionsConcurrentVersion>4.0.12</SystemCollectionsConcurrentVersion>
diff --git a/build/ToolsetPackages/project.json b/build/ToolsetPackages/project.json
index 597dc4a7cb9..9f62d2002a1 100644
--- a/build/ToolsetPackages/project.json
+++ b/build/ToolsetPackages/project.json
@@ -12,7 +12,8 @@
     "xunit.assert": "2.1.0",
     "xunit.runner.console": "2.2.0-beta1-build3239",
     "Roslyn.Build.Util": "0.9.4-portable",
-    "RoslynDependencies.OptimizationData": "1.3.0-beta5-60518-02"
+    "RoslynDependencies.OptimizationData": "1.3.0-beta5-60518-02",
+    "RoslynTools.Microsoft.SignTool": "0.2.0-beta"
   },
   "frameworks": {
     "net461": {}
diff --git a/build/config/SignToolData.json b/build/config/SignToolData.json
new file mode 100644
index 00000000000..87a7a8c4294
--- /dev/null
+++ b/build/config/SignToolData.json
@@ -0,0 +1,136 @@
+{
+    sign: [
+        {
+            "certificate": "Microsoft402",
+            "strongName": "MsSharedLib72",
+          "values": [
+            "csc.exe",
+            "csccore\\csc.exe",
+            "csi.exe",
+            "csicore\\csi.exe",
+            "InteractiveHost.exe",
+            "Microsoft.Build.Tasks.CodeAnalysis.dll",
+            "Microsoft.CodeAnalysis.CSharp.dll",
+            "Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll",
+            "Microsoft.CodeAnalysis.CSharp.Features.dll",
+            "Microsoft.CodeAnalysis.CSharp.InteractiveEditorFeatures.dll",
+            "Microsoft.CodeAnalysis.CSharp.Scripting.dll",
+            "Microsoft.CodeAnalysis.CSharp.Workspaces.dll",
+            "Microsoft.CodeAnalysis.dll",
+            "Microsoft.CodeAnalysis.EditorFeatures.dll",
+            "Microsoft.CodeAnalysis.EditorFeatures.Next.dll",
+            "Microsoft.CodeAnalysis.EditorFeatures.Text.dll",
+            "Microsoft.CodeAnalysis.Features.dll",
+            "Microsoft.CodeAnalysis.InteractiveEditorFeatures.dll",
+            "Microsoft.CodeAnalysis.InteractiveFeatures.dll",
+            "Microsoft.CodeAnalysis.Remote.ServiceHub.dll",
+            "Microsoft.CodeAnalysis.Remote.Workspaces.dll",
+            "Microsoft.CodeAnalysis.Scripting.dll",
+            "Microsoft.CodeAnalysis.VisualBasic.dll",
+            "Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.dll",
+            "Microsoft.CodeAnalysis.VisualBasic.Features.dll",
+            "Microsoft.CodeAnalysis.VisualBasic.InteractiveEditorFeatures.dll",
+            "Microsoft.CodeAnalysis.VisualBasic.Scripting.dll",
+            "Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll",
+            "Microsoft.CodeAnalysis.Workspaces.Desktop.dll",
+            "Microsoft.CodeAnalysis.Workspaces.dll",
+            "Microsoft.DiaSymReader.PortablePdb.dll",
+            "Microsoft.VisualStudio.CSharp.Repl.dll",
+            "Microsoft.VisualStudio.InteractiveServices.dll",
+            "Microsoft.VisualStudio.InteractiveWindow.dll",
+            "Microsoft.VisualStudio.LanguageServices.CSharp.dll",
+            "Microsoft.VisualStudio.LanguageServices.dll",
+            "Microsoft.VisualStudio.LanguageServices.Implementation.dll",
+            "Microsoft.VisualStudio.LanguageServices.Next.dll",
+            "Microsoft.VisualStudio.LanguageServices.SolutionExplorer.dll",
+            "Microsoft.VisualStudio.LanguageServices.VisualBasic.dll",
+            "Microsoft.VisualStudio.VisualBasic.Repl.dll",
+            "Microsoft.VisualStudio.VsInteractiveWindow.dll",
+            "Pdb2Xml.exe",
+            "Roslyn.Compilers.Extension.dll",
+            "Roslyn.Hosting.Diagnostics.dll",
+            "Roslyn.VisualStudio.DiagnosticsWindow.dll",
+            "Roslyn.VisualStudio.InteractiveComponents.dll",
+            "Roslyn.VisualStudio.Setup.Interactive.dll",
+            "SDK\\Roslyn.SyntaxVisualizer.DgmlHelper.dll",
+            "SDK\\Roslyn.SyntaxVisualizer.Control.dll",
+            "SDK\\Roslyn.SyntaxVisualizer.Extension.dll",
+            "SDK\\Roslyn.Templates.dll",
+            "vbc.exe",
+            "vbccore\\vbc.exe",
+            "VBCSCompiler.exe",
+            "vbi.exe",
+            "vbicore\\vbi.exe"
+          ]
+        },
+        {
+            "certificate": "WindowsPhone623",
+            "strongName": "MsSharedLib72",
+            "values": [
+                "Microsoft.CodeAnalysis.ExpressionEvaluator.ExpressionCompiler.dll",
+                "Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider.dll",
+                "Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.dll",
+                "Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.dll",
+                "Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler.dll",
+                "Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.dll"
+            ]
+        },
+        {
+            "certificate": "MicrosoftSHA1Win8WinBlue",
+            "strongName": "MsSharedLib72",
+            "values": [
+                "NetFX20\\Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider.dll",
+                "NetFX20\\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.dll",
+                "NetFX20\\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.dll"
+            ]
+        },
+        {
+            "certificate": "VsixSHA2",
+            "strongName": null,
+            "values": [
+                "ExpressionEvaluatorPackage.vsix",
+                "Microsoft.VisualStudio.VsInteractiveWindow.vsix",
+                "Roslyn.Compilers.Extension.vsix",
+                "Roslyn.Deployment.Full.vsix",
+                "Roslyn.Deployment.Full.Next.vsix",
+                "Roslyn.VisualStudio.DiagnosticsWindow.vsix",
+                "Roslyn.VisualStudio.InteractiveComponents.vsix",
+                "Roslyn.VisualStudio.Setup.Interactive.vsix",
+                "Roslyn.VisualStudio.Setup.Next.vsix",
+                "Roslyn.VisualStudio.Setup.vsix",
+                "RoslynDeployment.vsix",
+                "SDK\\Roslyn Templates\\Release\\Roslyn SDK.vsix"
+            ]
+        }
+    ],
+
+    // Binaries which are included in VSIX above which are not to be signed.
+    exclude: [
+        "Esent.Interop.dll",
+        "Microsoft.CodeAnalysis.Elfie.dll",
+        "Microsoft.DiaSymReader.dll",
+        "Microsoft.DiaSymReader.Native.amd64.dll",
+        "Microsoft.DiaSymReader.Native.x86.dll",
+        "Newtonsoft.Json.dll",
+        "StreamJsonRpc.dll",
+        "StreamJsonRpc.resources.dll",
+        "System.Reflection.Metadata.dll",
+        "System.Collections.Immutable.dll",
+        "System.Diagnostics.StackTrace.dll",
+        "System.IO.FileSystem.dll",
+        "System.IO.FileSystem.Primitives.dll",
+        "System.Composition.AttributedModel.dll",
+        "System.Composition.Convention.dll",
+        "System.Composition.Hosting.dll",
+        "System.Composition.TypedParts.dll",
+        "System.Composition.Runtime.dll",
+        "Microsoft.Build.Conversion.Core.dll",
+        "Microsoft.Build.dll",
+        "Microsoft.Build.Engine.dll",
+        "Microsoft.Build.Framework.dll",
+        "Microsoft.Build.Tasks.Core.dll",
+        "Microsoft.Build.Utilities.Core.dll",
+        "Microsoft.VisualStudio.Threading.dll",
+        "Microsoft.VisualStudio.Validation.dll"
+    ]
+}
diff --git a/src/Tools/MicroBuild/Build.proj b/src/Tools/MicroBuild/Build.proj
index 01a8fe7bf09..9b3c47c282d 100644
--- a/src/Tools/MicroBuild/Build.proj
+++ b/src/Tools/MicroBuild/Build.proj
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Targets\Settings.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Targets\Dependencies.props" />
+
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <ProjectDir>$(MSBuildThisFileDirectory)..\..\..\</ProjectDir>
@@ -24,7 +27,7 @@
     <MSBuild Projects="$(ProjectDir)src\Dependencies\Dependencies.sln" BuildInParallel="true" />
     <MSBuild Projects="$(ProjectDir)src\Setup\SetupStep1.proj" />
 
-    <Exec Command="$(ProjectDir)Binaries\$(Configuration)\SignRoslyn\SignRoslyn.exe $(SignRoslynArgs) -binariesPath &quot;$(BinariesPath)&quot;" WorkingDirectory="$(ProjectDir)" />
+    <Exec Command="$(NuGetPackageRoot)\RoslynTools.Microsoft.SignTool\$(RoslynToolsMicrosoftSignToolVersion)\tools\SignTool.exe $(SignRoslynArgs) &quot;$(BinariesPath)&quot;" WorkingDirectory="$(ProjectDir)" />
 
     <MSBuild Projects="$(ProjectDir)src\NuGet\NuGet.proj" />
     <MSBuild Projects="$(ProjectDir)src\Setup\SetupStep2.proj" Properties="$(SetupStep2Properties)" />
diff --git a/src/Tools/RepoUtil/RepoData.json b/src/Tools/RepoUtil/RepoData.json
index b9ebf6d2336..f265bf08a2d 100644
--- a/src/Tools/RepoUtil/RepoData.json
+++ b/src/Tools/RepoUtil/RepoData.json
@@ -21,7 +21,8 @@
                 "Microsoft.VisualBasic",
                 "Microsoft.Composition",
                 "ManagedEsent",
-                "xunit"
+                "xunit",
+                "RoslynTools.*"
             ]
         }
     },
-- 
GitLab