Skip to content

Commit c91c206

Browse files
authored
Merge pull request #1130 from SixLabors/af/sn
Strong name all projects in the repository
2 parents b2bd68d + 6d2afb3 commit c91c206

File tree

5 files changed

+27
-11
lines changed

5 files changed

+27
-11
lines changed

Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@
9595
<!-- Contains RemoteExecutor. Taken from: https://github.com/dotnet/runtime/blob/master/NuGet.config -->
9696
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json;
9797
</RestoreSources>
98-
<SixLaborsPublicKey>002400000c8000009400000006020000002400005253413100040000010001000147e6fe6766715eec6cfed61f1e7dcdbf69748a3e355c67e9d8dfd953acab1d5e012ba34b23308166fdc61ee1d0390d5f36d814a6091dd4b5ed9eda5a26afced924c683b4bfb4b3d64b0586a57eff9f02b1f84e3cb0ddd518bd1697f2c84dcbb97eb8bb5c7801be12112ed0ec86db934b0e9a5171e6bb1384b6d2f7d54dfa97</SixLaborsPublicKey>
98+
<SixLaborsPublicKey>00240000048000009400000006020000002400005253413100040000010001000147e6fe6766715eec6cfed61f1e7dcdbf69748a3e355c67e9d8dfd953acab1d5e012ba34b23308166fdc61ee1d0390d5f36d814a6091dd4b5ed9eda5a26afced924c683b4bfb4b3d64b0586a57eff9f02b1f84e3cb0ddd518bd1697f2c84dcbb97eb8bb5c7801be12112ed0ec86db934b0e9a5171e6bb1384b6d2f7d54dfa97</SixLaborsPublicKey>
9999
<UseSharedCompilation>true</UseSharedCompilation>
100+
<SignAssembly>true</SignAssembly>
100101
</PropertyGroup>
101102

102103
<!-- Package references and additional files which are consumed by all projects -->

src/Directory.Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup>
30+
<!-- DynamicProxyGenAssembly2 is needed so Moq can use our internals -->
3031
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
31-
<InternalsVisibleTo Include="DynamicProxyGenAssembly2, PublicKeyToken=null" />
32-
<InternalsVisibleTo Include="ImageSharp.Benchmarks" />
33-
<InternalsVisibleTo Include="SixLabors.ImageSharp.Sandbox46" />
34-
<InternalsVisibleTo Include="SixLabors.ImageSharp.Tests" />
32+
<InternalsVisibleTo Include="ImageSharp.Benchmarks" PublicKey="$(SixLaborsPublicKey)" />
33+
<InternalsVisibleTo Include="ImageSharp.Tests.ProfilingSandbox" PublicKey="$(SixLaborsPublicKey)" />
34+
<InternalsVisibleTo Include="SixLabors.ImageSharp.Tests" PublicKey="$(SixLaborsPublicKey)" />
3535
</ItemGroup>
3636

3737
</Project>

tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<GenerateProgramFile>false</GenerateProgramFile>
1010
<!--Used to hide test project from dotnet test-->
1111
<IsTestProject>false</IsTestProject>
12+
13+
<!-- Uncomment this to run benchmarks depending on Colorful or Pfim (colorspaces and TGA): -->
14+
<!--<SignAssembly>false</SignAssembly>-->
1215
</PropertyGroup>
1316

1417
<ItemGroup>
@@ -25,4 +28,21 @@
2528
<PackageReference Include="System.Drawing.Common" />
2629
</ItemGroup>
2730

31+
<!-- Exclude benchmarks using internals, in case of unsigned benchmark execution: -->
32+
<ItemGroup Condition="'$(SignAssembly)' == 'false'">
33+
<Compile Remove="Codecs\Jpeg\BlockOperations\**" />
34+
<Compile Remove="Codecs\Jpeg\DoubleBufferedStreams.cs" />
35+
<Compile Remove="Codecs\Jpeg\YCbCrColorConversion.cs" />
36+
<Compile Remove="Codecs\Jpeg\DecodeJpegParseStreamOnly.cs" />
37+
<Compile Remove="Color\Bulk\**" />
38+
<Compile Remove="Color\RgbToYCbCr.cs" />
39+
<Compile Remove="Color\YCbCrToRgb.cs" />
40+
<Compile Remove="General\Vectorization\**" />
41+
<Compile Remove="General\PixelConversion\**" />
42+
<Compile Remove="General\BasicMath\ModuloPowerOfTwoConstant.cs" />
43+
<Compile Remove="General\BasicMath\ModuloPowerOfTwoVariable.cs" />
44+
<Compile Remove="PixelBlenders\**" />
45+
<Compile Remove="Samplers\Resize.cs" />
46+
</ItemGroup>
47+
2848
</Project>

tests/ImageSharp.Tests/AssemblyInfo.cs

Lines changed: 0 additions & 6 deletions
This file was deleted.

tests/ImageSharp.Tests/ImageSharp.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
<ItemGroup>
1616
<DotNetCliToolReference Include="dotnet-xunit" />
17+
<InternalsVisibleTo Include="ImageSharp.Tests.ProfilingSandbox" PublicKey="$(SixLaborsPublicKey)" />
1718
</ItemGroup>
1819

1920
<ItemGroup>

0 commit comments

Comments
 (0)