Merge pull request #2143 from 333fred/signing

Strong-name sign OmniSharp assemblies

build/Packages.props

@@ -11,11 +11,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Update="Cake.Scripting.Transport" Version="0.3.0" />
+        <PackageReference Update="Cake.Scripting.Transport" Version="0.6.4" />
 
-        <PackageReference Update="Dotnet.Script.DependencyModel" Version="1.0.2" />
-        <PackageReference Update="Dotnet.Script.DependencyModel.NuGet" Version="1.0.1" />
+        <PackageReference Update="Dotnet.Script.DependencyModel" Version="1.1.0" />
+        <PackageReference Update="Dotnet.Script.DependencyModel.NuGet" Version="1.1.0" />
         <PackageReference Update="ICSharpCode.Decompiler" Version="7.0.0.6488" />
+
         <PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="2.2.4" />
 
         <PackageReference Update="Microsoft.AspNetCore.Diagnostics" Version="$(AspNetCorePackageVersion)" />

build/Settings.props

@@ -27,6 +27,9 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.pdb</AllowedReferenceRelatedFileExtensions>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\OmniSharpKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>

src/OmniSharp.Abstractions/AssemblyInfo.cs

@@ -1,10 +1,24 @@
 using System.Runtime.CompilerServices;
+using OmniSharp;
 
-[assembly: InternalsVisibleTo("OmniSharp")]
-[assembly: InternalsVisibleTo("OmniSharp.Host")]
-[assembly: InternalsVisibleTo("OmniSharp.MSBuild")]
-[assembly: InternalsVisibleTo("OmniSharp.Roslyn")]
-[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp")]
-[assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests")]
-[assembly: InternalsVisibleTo("OmniSharp.Tests")]
-[assembly: InternalsVisibleTo("OmniSharp.LanguageServerProtocol")]
+[assembly: InternalsVisibleTo("OmniSharp" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Host" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.MSBuild" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Tests" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.LanguageServerProtocol" + OmniSharpPublicKey.Key)]
+
+
+namespace OmniSharp
+{
+    public class OmniSharpPublicKey
+    {
+        public const string Key = ", PublicKey=" + "0024000004800000940000000602000000240000525341310004000001000100917302efc152e6" +
+                                                   "464679d4625bd9989e12d4662a9eaadf284d04992881c0e7b16e756e63ef200a02c4054d4d31e2" +
+                                                   "1b9aa0b0b873bcefca8cd42ec583a3db509665c9b22318ceceec581663fc07e2422bb2135539ba" +
+                                                   "8a517c209ac175fff07c5af10cef636e04cae91d28f51fcde5d14c1a9bfed06e096cf977fd0d60" +
+                                                   "002a3ea6";
+    }
+}

src/OmniSharp.Cake/AssemblyInfo.cs

@@ -1,3 +1,4 @@
-using System.Runtime.CompilerServices;
+using OmniSharp;
+using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("OmniSharp.Cake.Tests")]
+[assembly: InternalsVisibleTo("OmniSharp.Cake.Tests" + OmniSharpPublicKey.Key)]

src/OmniSharp.Cake/OmniSharp.Cake.csproj

@@ -18,4 +18,4 @@
     <PackageReference Include="Cake.Scripting.Transport" />
   </ItemGroup>
 
-</Project>
+</Project>

src/OmniSharp.DotNetTest/AssemblyInfo.cs

@@ -1,3 +1,4 @@
-using System.Runtime.CompilerServices;
+using OmniSharp;
+using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests")]
+[assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests" + OmniSharpPublicKey.Key)]

src/OmniSharp.Host/AssemblyInfo.cs

@@ -1,7 +1,8 @@
-using System.Runtime.CompilerServices;
+using OmniSharp;
+using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("OmniSharp.Http.Tests")]
-[assembly: InternalsVisibleTo("OmniSharp.MSBuild.Tests")]
-[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp.Tests")]
-[assembly: InternalsVisibleTo("OmniSharp.Stdio.Tests")]
-[assembly: InternalsVisibleTo("TestUtility")]
+[assembly: InternalsVisibleTo("OmniSharp.Http.Tests" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.MSBuild.Tests" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp.Tests" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Stdio.Tests" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("TestUtility" + OmniSharpPublicKey.Key)]

src/OmniSharp.Http/AssemblyInfo.cs

@@ -1,5 +1,6 @@
-using System.Runtime.CompilerServices;
+using OmniSharp;
+using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("OmniSharp")]
-[assembly: InternalsVisibleTo("TestUtility")]
-[assembly: InternalsVisibleTo("OmniSharp.Http.Tests")]
+[assembly: InternalsVisibleTo("OmniSharp" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("TestUtility" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Http.Tests" + OmniSharpPublicKey.Key)]

src/OmniSharp.LanguageServerProtocol/AssemblyInfo.cs

@@ -1,6 +1,7 @@
-using System.Runtime.CompilerServices;
+using OmniSharp;
+using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("TestUtility")]
-[assembly: InternalsVisibleTo("OmniSharp")]
-[assembly: InternalsVisibleTo("OmniSharp.Stdio.Tests")]
-[assembly: InternalsVisibleTo("OmniSharp.Lsp.Tests")]
+[assembly: InternalsVisibleTo("TestUtility" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Stdio.Tests" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Lsp.Tests" + OmniSharpPublicKey.Key)]

src/OmniSharp.MSBuild/AssemblyInfo.cs

@@ -1,4 +1,5 @@
-using System.Runtime.CompilerServices;
+using OmniSharp;
+using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("OmniSharp.MSBuild.Tests")]
-[assembly: InternalsVisibleTo("TestUtility")]
+[assembly: InternalsVisibleTo("OmniSharp.MSBuild.Tests" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("TestUtility" + OmniSharpPublicKey.Key)]

src/OmniSharp.Roslyn/AssemblyInfo.cs

@@ -1,4 +1,5 @@
 using System.Runtime.CompilerServices;
+using OmniSharp;
 
-[assembly: InternalsVisibleTo("OmniSharp.Tests")]
-[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp")]
+[assembly: InternalsVisibleTo("OmniSharp.Tests" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp" + OmniSharpPublicKey.Key)]

src/OmniSharp.Roslyn/Properties/AssemblyInfo.cs

@@ -1,4 +1,5 @@
-using System.Runtime.CompilerServices;
+using OmniSharp;
+using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp.Tests")]
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp.Tests" + OmniSharpPublicKey.Key)]
 

src/OmniSharp.Shared/AssemblyInfo.cs

@@ -1,9 +1,10 @@
-using System.Runtime.CompilerServices;
+using OmniSharp;
+using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("OmniSharp")]
-[assembly: InternalsVisibleTo("OmniSharp.Host")]
-[assembly: InternalsVisibleTo("OmniSharp.MSBuild")]
-[assembly: InternalsVisibleTo("OmniSharp.Roslyn")]
-[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp")]
-[assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests")]
-[assembly: InternalsVisibleTo("OmniSharp.Tests")]
+[assembly: InternalsVisibleTo("OmniSharp" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Host" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.MSBuild" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Tests" + OmniSharpPublicKey.Key)]

src/OmniSharp.Stdio/AssemblyInfo.cs

@@ -1,5 +1,6 @@
-using System.Runtime.CompilerServices;
+using OmniSharp;
+using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("OmniSharp")]
-[assembly: InternalsVisibleTo("TestUtility")]
-[assembly: InternalsVisibleTo("OmniSharp.Stdio.Tests")]
+[assembly: InternalsVisibleTo("OmniSharp" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("TestUtility" + OmniSharpPublicKey.Key)]
+[assembly: InternalsVisibleTo("OmniSharp.Stdio.Tests" + OmniSharpPublicKey.Key)]