Skip to content

Add assembly strong name. #82

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

Merged
tmds merged 2 commits into from
Aug 28, 2020
Merged

Add assembly strong name. #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44e6108
Add assembly strong name.
mfilippov Jun 25, 2020
6a28045
Formatting
tmds Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added sign.snk
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions src/Tmds.DBus.Tool/Tmds.DBus.Tool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Copyright>Tom Deseyn</Copyright>
<Description>Tmds.DBus CLI Tool</Description>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\sign.snk</AssemblyOriginatorKeyFile>
<PublicSign>true</PublicSign>
</PropertyGroup>

<ItemGroup>
Expand Down
21 changes: 19 additions & 2 deletions src/Tmds.DBus/CodeGen/DynamicAssembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
Expand All @@ -24,8 +25,24 @@ internal class DynamicAssembly

private DynamicAssembly()
{
_assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName(Tmds.DBus.Connection.DynamicAssemblyName), AssemblyBuilderAccess.Run);
_moduleBuilder = _assemblyBuilder.DefineDynamicModule(Tmds.DBus.Connection.DynamicAssemblyName);
byte[] keyBuffer;
using (Stream keyStream = typeof(DynamicAssembly).GetTypeInfo().Assembly.GetManifestResourceStream("Tmds.DBus.sign.snk"))
{
if (keyStream == null)
{
throw new InvalidOperationException("'Tmds.DBus.sign.snk' not found in resources");
}
keyBuffer = new byte[keyStream.Length];
keyStream.Read(keyBuffer, 0, keyBuffer.Length);
}

var dynamicAssemblyName = "Tmds.DBus.Emit";
var assemblyName = new AssemblyName(dynamicAssemblyName);
assemblyName.Version = new Version(1, 0, 0);
assemblyName.Flags = AssemblyNameFlags.PublicKey;
assemblyName.SetPublicKey(keyBuffer);
_assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);
_moduleBuilder = _assemblyBuilder.DefineDynamicModule(dynamicAssemblyName);
_proxyTypeMap = new Dictionary<Type, TypeInfo>();
_adapterTypeMap = new Dictionary<Type, TypeInfo>();
}
Expand Down
2 changes: 1 addition & 1 deletion src/Tmds.DBus/Connection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ private enum ConnectionType
/// <summary>
/// Assembly name where the dynamically generated code resides.
/// </summary>
public const string DynamicAssemblyName = "Tmds.DBus.Emit";
public const string DynamicAssemblyName = "Tmds.DBus.Emit, PublicKey=002400000480000094000000060200000024000052534131000400000100010071a8770f460cce31df0feb6f94b328aebd55bffeb5c69504593df097fdd9b29586dbd155419031834411c8919516cc565dee6b813c033676218496edcbe7939c0dd1f919f3d1a228ebe83b05a3bbdbae53ce11bcf4c04a42d8df1a83c2d06cb4ebb0b447e3963f48a1ca968996f3f0db8ab0e840a89d0a5d5a237e2f09189ed3";

private static Connection s_systemConnection;
private static Connection s_sessionConnection;
Expand Down
2 changes: 1 addition & 1 deletion src/Tmds.DBus/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

[assembly: InternalsVisibleTo("Tmds.DBus.Tests")]
[assembly: InternalsVisibleTo("Tmds.DBus.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010071a8770f460cce31df0feb6f94b328aebd55bffeb5c69504593df097fdd9b29586dbd155419031834411c8919516cc565dee6b813c033676218496edcbe7939c0dd1f919f3d1a228ebe83b05a3bbdbae53ce11bcf4c04a42d8df1a83c2d06cb4ebb0b447e3963f48a1ca968996f3f0db8ab0e840a89d0a5d5a237e2f09189ed3")]
6 changes: 6 additions & 0 deletions src/Tmds.DBus/Tmds.DBus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<RepositoryUrl>https://github.com/tmds/Tmds.DBus</RepositoryUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Copyright>Tom Deseyn;Alp Toker</Copyright>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\sign.snk</AssemblyOriginatorKeyFile>
<PublicSign>true</PublicSign>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="System.IO.MemoryMappedFiles" Version="4.3.0" />
Expand All @@ -24,4 +27,7 @@
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\..\sign.snk" />
</ItemGroup>
</Project>
9 changes: 6 additions & 3 deletions test/Tmds.DBus.Tests/Tmds.DBus.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\sign.snk</AssemblyOriginatorKeyFile>
<PublicSign>true</PublicSign>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="../../src/Tmds.DBus/Tmds.DBus.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170427-09" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<Content Include="xunit.runner.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down