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

#651 Strong naming #655

Closed
wants to merge 2 commits into from
Closed

#651 Strong naming #655

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
a38c88b
#651 Strong naming
nathan-alden-sr Oct 23, 2021
c374236
#651 Adding public key to InternalsVisibleTo
nathan-alden-sr Oct 23, 2021
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
1 change: 1 addition & 0 deletions Silk.NET.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Properties", "Build P
build\dx_typemap.json = build\dx_typemap.json
generator.json = generator.json
build\gl_typemap.json = build\gl_typemap.json
build\Silk.NET.snk = build\Silk.NET.snk
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.Input.Common", "src\Input\Silk.NET.Input.Common\Silk.NET.Input.Common.csproj", "{8FFF49D6-B029-400B-8510-1A088868DFA6}"
Expand Down
Binary file added build/Silk.NET.snk
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions build/props/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,10 @@
<IncludeSymbols>false</IncludeSymbols>
<SymbolPackageFormat></SymbolPackageFormat>
</PropertyGroup>
<!-- Strong naming (only applies to net5.0+ TFMs) -->
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(TargetFramework), '^net\d+\.\d+(-\S+)?$'))">
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\Silk.NET.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorPublicKey>00240000048000009400000006020000002400005253413100040000010001003978b9c8ce5c08d54ff797be6fdcb734bb8f8fd47082de8d4311a2b85f89e9d27720824c2ca9b19bd6bdf54c583d297cf346d204b2d70826627789e6f536a7aa4f3e40f37f92ebeef91b820f1a61f15e9c0dccf3c2d372b5b4fa0c630f7cb6f18ea6aca8d04a4104d762f36f9b57ecbdde1055a16f5f088262b2df54c128debf</AssemblyOriginatorPublicKey>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Input/Silk.NET.Input.Common/Silk.NET.Input.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>Silk.NET.Input.Glfw</_Parameter1>
<_Parameter1>Silk.NET.Input.Glfw, PublicKey=00240000048000009400000006020000002400005253413100040000010001003978b9c8ce5c08d54ff797be6fdcb734bb8f8fd47082de8d4311a2b85f89e9d27720824c2ca9b19bd6bdf54c583d297cf346d204b2d70826627789e6f536a7aa4f3e40f37f92ebeef91b820f1a61f15e9c0dccf3c2d372b5b4fa0c630f7cb6f18ea6aca8d04a4104d762f36f9b57ecbdde1055a16f5f088262b2df54c128debf</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>Silk.NET.Input.Sdl</_Parameter1>
<_Parameter1>Silk.NET.Input.Sdl, PublicKey=00240000048000009400000006020000002400005253413100040000010001003978b9c8ce5c08d54ff797be6fdcb734bb8f8fd47082de8d4311a2b85f89e9d27720824c2ca9b19bd6bdf54c583d297cf346d204b2d70826627789e6f536a7aa4f3e40f37f92ebeef91b820f1a61f15e9c0dccf3c2d372b5b4fa0c630f7cb6f18ea6aca8d04a4104d762f36f9b57ecbdde1055a16f5f088262b2df54c128debf</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Windowing/Silk.NET.Windowing.Common/Silk.NET.Windowing.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>Silk.NET.Windowing.Glfw</_Parameter1>
<_Parameter1>Silk.NET.Windowing.Glfw, PublicKey=00240000048000009400000006020000002400005253413100040000010001003978b9c8ce5c08d54ff797be6fdcb734bb8f8fd47082de8d4311a2b85f89e9d27720824c2ca9b19bd6bdf54c583d297cf346d204b2d70826627789e6f536a7aa4f3e40f37f92ebeef91b820f1a61f15e9c0dccf3c2d372b5b4fa0c630f7cb6f18ea6aca8d04a4104d762f36f9b57ecbdde1055a16f5f088262b2df54c128debf</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>Silk.NET.Windowing.Sdl</_Parameter1>
<_Parameter1>Silk.NET.Windowing.Sdl, PublicKey=00240000048000009400000006020000002400005253413100040000010001003978b9c8ce5c08d54ff797be6fdcb734bb8f8fd47082de8d4311a2b85f89e9d27720824c2ca9b19bd6bdf54c583d297cf346d204b2d70826627789e6f536a7aa4f3e40f37f92ebeef91b820f1a61f15e9c0dccf3c2d372b5b4fa0c630f7cb6f18ea6aca8d04a4104d762f36f9b57ecbdde1055a16f5f088262b2df54c128debf</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Windowing/Silk.NET.Windowing.Glfw/Silk.NET.Windowing.Glfw.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>Silk.NET.Input.Glfw</_Parameter1>
<_Parameter1>Silk.NET.Input.Glfw, PublicKey=00240000048000009400000006020000002400005253413100040000010001003978b9c8ce5c08d54ff797be6fdcb734bb8f8fd47082de8d4311a2b85f89e9d27720824c2ca9b19bd6bdf54c583d297cf346d204b2d70826627789e6f536a7aa4f3e40f37f92ebeef91b820f1a61f15e9c0dccf3c2d372b5b4fa0c630f7cb6f18ea6aca8d04a4104d762f36f9b57ecbdde1055a16f5f088262b2df54c128debf</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Windowing/Silk.NET.Windowing.Sdl/Silk.NET.Windowing.Sdl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>Silk.NET.Input.Sdl</_Parameter1>
<_Parameter1>Silk.NET.Input.Sdl, PublicKey=00240000048000009400000006020000002400005253413100040000010001003978b9c8ce5c08d54ff797be6fdcb734bb8f8fd47082de8d4311a2b85f89e9d27720824c2ca9b19bd6bdf54c583d297cf346d204b2d70826627789e6f536a7aa4f3e40f37f92ebeef91b820f1a61f15e9c0dccf3c2d372b5b4fa0c630f7cb6f18ea6aca8d04a4104d762f36f9b57ecbdde1055a16f5f088262b2df54c128debf</_Parameter1>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens if Silk.NET.Input.Sdl isn't strong named? Is this just ignored?

</AssemblyAttribute>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>Silk.NET.Windowing.Sdl.Android</_Parameter1>
<_Parameter1>Silk.NET.Windowing.Sdl.Android, PublicKey=00240000048000009400000006020000002400005253413100040000010001003978b9c8ce5c08d54ff797be6fdcb734bb8f8fd47082de8d4311a2b85f89e9d27720824c2ca9b19bd6bdf54c583d297cf346d204b2d70826627789e6f536a7aa4f3e40f37f92ebeef91b820f1a61f15e9c0dccf3c2d372b5b4fa0c630f7cb6f18ea6aca8d04a4104d762f36f9b57ecbdde1055a16f5f088262b2df54c128debf</_Parameter1>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This assembly isn't strong named per your logic in common.props.

</AssemblyAttribute>
</ItemGroup>

Expand Down