Skip to content

Commit d52c76d

Browse files
filipwfilipw
authored
Merge pull request OmniSharp#2143 from 333fred/signing
Strong-name sign OmniSharp assemblies
2 parents 2295073 + 770c1a6 commit d52c76d

15 files changed

Lines changed: 78 additions & 50 deletions

File tree

‎build/OmniSharpKey.snk‎

596 Bytes
Binary file not shown.

‎build/Packages.props‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Update="Cake.Scripting.Transport" Version="0.3.0" />
14+
<PackageReference Update="Cake.Scripting.Transport" Version="0.6.4" />
1515

16-
<PackageReference Update="Dotnet.Script.DependencyModel" Version="1.0.2" />
17-
<PackageReference Update="Dotnet.Script.DependencyModel.NuGet" Version="1.0.1" />
16+
<PackageReference Update="Dotnet.Script.DependencyModel" Version="1.1.0" />
17+
<PackageReference Update="Dotnet.Script.DependencyModel.NuGet" Version="1.1.0" />
1818
<PackageReference Update="ICSharpCode.Decompiler" Version="7.0.0.6488" />
19+
1920
<PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="2.2.4" />
2021

2122
<PackageReference Update="Microsoft.AspNetCore.Diagnostics" Version="$(AspNetCorePackageVersion)" />

‎build/Settings.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2828
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
2929
<AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.pdb</AllowedReferenceRelatedFileExtensions>
30+
<SignAssembly>true</SignAssembly>
31+
<DelaySign>false</DelaySign>
32+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\OmniSharpKey.snk</AssemblyOriginatorKeyFile>
3033
</PropertyGroup>
3134

3235
<ItemGroup>

‎src/OmniSharp.Abstractions/AssemblyInfo.cs‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
11
using System.Runtime.CompilerServices;
2+
using OmniSharp;
23

3-
[assembly: InternalsVisibleTo("OmniSharp")]
4-
[assembly: InternalsVisibleTo("OmniSharp.Host")]
5-
[assembly: InternalsVisibleTo("OmniSharp.MSBuild")]
6-
[assembly: InternalsVisibleTo("OmniSharp.Roslyn")]
7-
[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp")]
8-
[assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests")]
9-
[assembly: InternalsVisibleTo("OmniSharp.Tests")]
10-
[assembly: InternalsVisibleTo("OmniSharp.LanguageServerProtocol")]
4+
[assembly: InternalsVisibleTo("OmniSharp" + OmniSharpPublicKey.Key)]
5+
[assembly: InternalsVisibleTo("OmniSharp.Host" + OmniSharpPublicKey.Key)]
6+
[assembly: InternalsVisibleTo("OmniSharp.MSBuild" + OmniSharpPublicKey.Key)]
7+
[assembly: InternalsVisibleTo("OmniSharp.Roslyn" + OmniSharpPublicKey.Key)]
8+
[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp" + OmniSharpPublicKey.Key)]
9+
[assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests" + OmniSharpPublicKey.Key)]
10+
[assembly: InternalsVisibleTo("OmniSharp.Tests" + OmniSharpPublicKey.Key)]
11+
[assembly: InternalsVisibleTo("OmniSharp.LanguageServerProtocol" + OmniSharpPublicKey.Key)]
12+
13+
14+
namespace OmniSharp
15+
{
16+
public class OmniSharpPublicKey
17+
{
18+
public const string Key = ", PublicKey=" + "0024000004800000940000000602000000240000525341310004000001000100917302efc152e6" +
19+
"464679d4625bd9989e12d4662a9eaadf284d04992881c0e7b16e756e63ef200a02c4054d4d31e2" +
20+
"1b9aa0b0b873bcefca8cd42ec583a3db509665c9b22318ceceec581663fc07e2422bb2135539ba" +
21+
"8a517c209ac175fff07c5af10cef636e04cae91d28f51fcde5d14c1a9bfed06e096cf977fd0d60" +
22+
"002a3ea6";
23+
}
24+
}

‎src/OmniSharp.Cake/AssemblyInfo.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
using System.Runtime.CompilerServices;
1+
using OmniSharp;
2+
using System.Runtime.CompilerServices;
23

3-
[assembly: InternalsVisibleTo("OmniSharp.Cake.Tests")]
4+
[assembly: InternalsVisibleTo("OmniSharp.Cake.Tests" + OmniSharpPublicKey.Key)]

‎src/OmniSharp.Cake/OmniSharp.Cake.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
<PackageReference Include="Cake.Scripting.Transport" />
1919
</ItemGroup>
2020

21-
</Project>
21+
</Project>

‎src/OmniSharp.DotNetTest/AssemblyInfo.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
using System.Runtime.CompilerServices;
1+
using OmniSharp;
2+
using System.Runtime.CompilerServices;
23

3-
[assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests")]
4+
[assembly: InternalsVisibleTo("OmniSharp.DotNetTest.Tests" + OmniSharpPublicKey.Key)]

‎src/OmniSharp.Host/AssemblyInfo.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
using System.Runtime.CompilerServices;
1+
using OmniSharp;
2+
using System.Runtime.CompilerServices;
23

3-
[assembly: InternalsVisibleTo("OmniSharp.Http.Tests")]
4-
[assembly: InternalsVisibleTo("OmniSharp.MSBuild.Tests")]
5-
[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp.Tests")]
6-
[assembly: InternalsVisibleTo("OmniSharp.Stdio.Tests")]
7-
[assembly: InternalsVisibleTo("TestUtility")]
4+
[assembly: InternalsVisibleTo("OmniSharp.Http.Tests" + OmniSharpPublicKey.Key)]
5+
[assembly: InternalsVisibleTo("OmniSharp.MSBuild.Tests" + OmniSharpPublicKey.Key)]
6+
[assembly: InternalsVisibleTo("OmniSharp.Roslyn.CSharp.Tests" + OmniSharpPublicKey.Key)]
7+
[assembly: InternalsVisibleTo("OmniSharp.Stdio.Tests" + OmniSharpPublicKey.Key)]
8+
[assembly: InternalsVisibleTo("TestUtility" + OmniSharpPublicKey.Key)]

‎src/OmniSharp.Http/AssemblyInfo.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
using System.Runtime.CompilerServices;
1+
using OmniSharp;
2+
using System.Runtime.CompilerServices;
23

3-
[assembly: InternalsVisibleTo("OmniSharp")]
4-
[assembly: InternalsVisibleTo("TestUtility")]
5-
[assembly: InternalsVisibleTo("OmniSharp.Http.Tests")]
4+
[assembly: InternalsVisibleTo("OmniSharp" + OmniSharpPublicKey.Key)]
5+
[assembly: InternalsVisibleTo("TestUtility" + OmniSharpPublicKey.Key)]
6+
[assembly: InternalsVisibleTo("OmniSharp.Http.Tests" + OmniSharpPublicKey.Key)]

‎src/OmniSharp.LanguageServerProtocol/AssemblyInfo.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
using System.Runtime.CompilerServices;
1+
using OmniSharp;
2+
using System.Runtime.CompilerServices;
23

3-
[assembly: InternalsVisibleTo("TestUtility")]
4-
[assembly: InternalsVisibleTo("OmniSharp")]
5-
[assembly: InternalsVisibleTo("OmniSharp.Stdio.Tests")]
6-
[assembly: InternalsVisibleTo("OmniSharp.Lsp.Tests")]
4+
[assembly: InternalsVisibleTo("TestUtility" + OmniSharpPublicKey.Key)]
5+
[assembly: InternalsVisibleTo("OmniSharp" + OmniSharpPublicKey.Key)]
6+
[assembly: InternalsVisibleTo("OmniSharp.Stdio.Tests" + OmniSharpPublicKey.Key)]
7+
[assembly: InternalsVisibleTo("OmniSharp.Lsp.Tests" + OmniSharpPublicKey.Key)]

0 commit comments

Comments
 (0)