Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Strong-name sign OmniSharp assemblies #2143

Merged
merged 9 commits into from May 1, 2021
Merged

Strong-name sign OmniSharp assemblies #2143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ad55f1b
Strong-name sign OmniSharp assemblies
333fred Apr 30, 2021
69e8220
Merge branch 'master' into signing
333fred Apr 30, 2021
04cd484
Add missing assembly keys.
333fred Apr 30, 2021
6bfca91
Add StrongNamer to handle unsigned dependencies.
333fred Apr 30, 2021
12689c0
Remove strongnamer, bump the version of Cake.
333fred May 1, 2021
9c31186
updated to signed dotnet.script
filipw May 1, 2021
09ba644
Merge pull request #2 from filipw/signing
333fred May 1, 2021
5431d29
Merge branch 'master' into signing
333fred May 1, 2021
770c1a6
Remove strongnamer version.
333fred May 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added build/OmniSharpKey.snk
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions build/Packages.props
View file
Open in desktop
Expand Up @@ -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)" />
Expand Down
3 changes: 3 additions & 0 deletions build/Settings.props
View file
Open in desktop
Expand Up @@ -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>
Expand Down
30 changes: 22 additions & 8 deletions src/OmniSharp.Abstractions/AssemblyInfo.cs
View file
Open in desktop
@@ -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";
}
}
5 changes: 3 additions & 2 deletions src/OmniSharp.Cake/AssemblyInfo.cs
View file
Open in desktop
@@ -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)]
2 changes: 1 addition & 1 deletion src/OmniSharp.Cake/OmniSharp.Cake.csproj
View file
Open in desktop
Expand Up @@ -18,4 +18,4 @@
<PackageReference Include="Cake.Scripting.Transport" />
</ItemGroup>

</Project>
</Project>
5 changes: 3 additions & 2 deletions src/OmniSharp.DotNetTest/AssemblyInfo.cs
View file
Open in desktop
@@ -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)]
13 changes: 7 additions & 6 deletions src/OmniSharp.Host/AssemblyInfo.cs
View file
Open in desktop
@@ -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)]
9 changes: 5 additions & 4 deletions src/OmniSharp.Http/AssemblyInfo.cs
View file
Open in desktop
@@ -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)]
11 changes: 6 additions & 5 deletions src/OmniSharp.LanguageServerProtocol/AssemblyInfo.cs
View file
Open in desktop
@@ -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)]
7 changes: 4 additions & 3 deletions src/OmniSharp.MSBuild/AssemblyInfo.cs
View file
Open in desktop
@@ -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)]
5 changes: 3 additions & 2 deletions src/OmniSharp.Roslyn/AssemblyInfo.cs
View file
Open in desktop
@@ -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)]
5 changes: 3 additions & 2 deletions src/OmniSharp.Roslyn/Properties/AssemblyInfo.cs
View file
Open in desktop
@@ -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)]

17 changes: 9 additions & 8 deletions src/OmniSharp.Shared/AssemblyInfo.cs
View file
Open in desktop
@@ -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)]
9 changes: 5 additions & 4 deletions src/OmniSharp.Stdio/AssemblyInfo.cs
View file
Open in desktop
@@ -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)]