Skip to content

Commit 31e2ff2

Browse files
author
Dirk Lemstra
committed
Removed duplicate strong-name key files.
1 parent 738ef12 commit 31e2ff2

13 files changed

+65
-17
lines changed

‎Source/Magick.NET.AnyCPU/Magick.NET.snk ‎Magick.NET.snk

File renamed without changes.

‎Source/Magick.NET.Web/Magick.NET.Web.AnyCPU.csproj

+6-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<SignAssembly>true</SignAssembly>
5454
</PropertyGroup>
5555
<PropertyGroup>
56-
<AssemblyOriginatorKeyFile>Magick.NET.snk</AssemblyOriginatorKeyFile>
56+
<AssemblyOriginatorKeyFile>..\..\Magick.NET.snk</AssemblyOriginatorKeyFile>
5757
</PropertyGroup>
5858
<ItemGroup>
5959
<Reference Include="System" />
@@ -81,15 +81,17 @@
8181
<Compile Include="MagickModule.cs" />
8282
<Compile Include="Properties\AssemblyInfo.cs" />
8383
</ItemGroup>
84-
<ItemGroup>
85-
<None Include="Magick.NET.snk" />
86-
</ItemGroup>
8784
<ItemGroup>
8885
<ProjectReference Include="..\Magick.NET\Magick.NET.AnyCPU.csproj">
8986
<Project>{daae3844-6435-4912-8f69-9f7a9242b4ac}</Project>
9087
<Name>Magick.NET</Name>
9188
</ProjectReference>
9289
</ItemGroup>
90+
<ItemGroup>
91+
<None Include="..\..\Magick.NET.snk">
92+
<Link>Magick.NET.snk</Link>
93+
</None>
94+
</ItemGroup>
9395
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9496
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9597
Other similar extension points exist, see Microsoft.Common.targets.

‎Source/Magick.NET.Web/Magick.NET.Web.csproj

+7-5
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<SignAssembly>true</SignAssembly>
9191
</PropertyGroup>
9292
<PropertyGroup>
93-
<AssemblyOriginatorKeyFile>Magick.NET.snk</AssemblyOriginatorKeyFile>
93+
<AssemblyOriginatorKeyFile>..\..\Magick.NET.snk</AssemblyOriginatorKeyFile>
9494
</PropertyGroup>
9595
<ItemGroup>
9696
<Reference Include="System" />
@@ -118,15 +118,17 @@
118118
<Compile Include="MagickModule.cs" />
119119
<Compile Include="Properties\AssemblyInfo.cs" />
120120
</ItemGroup>
121-
<ItemGroup>
122-
<None Include="Magick.NET.snk" />
123-
</ItemGroup>
124121
<ItemGroup>
125122
<ProjectReference Include="..\Magick.NET\Magick.NET.csproj">
126123
<Project>{daae3844-6435-4912-8f69-9f7a9242b4ac}</Project>
127124
<Name>Magick.NET</Name>
128125
</ProjectReference>
129126
</ItemGroup>
127+
<ItemGroup>
128+
<None Include="..\..\Magick.NET.snk">
129+
<Link>Magick.NET.snk</Link>
130+
</None>
131+
</ItemGroup>
130132
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
131133
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
132134
Other similar extension points exist, see Microsoft.Common.targets.
@@ -135,4 +137,4 @@
135137
<Target Name="AfterBuild">
136138
</Target>
137139
-->
138-
</Project>
140+
</Project>

‎Source/Magick.NET.Web/Magick.NET.snk

-596 Bytes
Binary file not shown.

‎Source/Magick.NET/Magick.NET.AnyCPU.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<SignAssembly>true</SignAssembly>
102102
</PropertyGroup>
103103
<PropertyGroup>
104-
<AssemblyOriginatorKeyFile>Magick.NET.snk</AssemblyOriginatorKeyFile>
104+
<AssemblyOriginatorKeyFile>..\..\Magick.NET.snk</AssemblyOriginatorKeyFile>
105105
</PropertyGroup>
106106
<ItemGroup>
107107
<Reference Include="PresentationCore" />
@@ -500,6 +500,9 @@
500500
<Compile Include="Framework\Types\MagickGeometry.cs" />
501501
</ItemGroup>
502502
<ItemGroup>
503+
<None Include="..\..\Magick.NET.snk">
504+
<Link>Magick.NET.snk</Link>
505+
</None>
503506
<None Include="..\Magick.NET.ruleset">
504507
<Link>Magick.NET.ruleset</Link>
505508
<SubType>Designer</SubType>
@@ -556,7 +559,6 @@
556559
<EmbeddedResource Include="Resources\ReleaseQ8\MagickScript.xsd" Condition="'$(Configuration)' == 'ReleaseQ8' Or '$(Configuration)' == 'DebugQ8'">
557560
<SubType>Designer</SubType>
558561
</EmbeddedResource>
559-
<None Include="Magick.NET.snk" />
560562
<AdditionalFiles Include="stylecop.json" />
561563
<None Include="packages.config" />
562564
</ItemGroup>

‎Source/Magick.NET/Magick.NET.AnyCPU.net20.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<SignAssembly>true</SignAssembly>
101101
</PropertyGroup>
102102
<PropertyGroup>
103-
<AssemblyOriginatorKeyFile>Magick.NET.snk</AssemblyOriginatorKeyFile>
103+
<AssemblyOriginatorKeyFile>..\..\Magick.NET.snk</AssemblyOriginatorKeyFile>
104104
</PropertyGroup>
105105
<ItemGroup>
106106
<Reference Include="System" />
@@ -496,6 +496,9 @@
496496
<Compile Include="Framework\Types\MagickGeometry.cs" />
497497
</ItemGroup>
498498
<ItemGroup>
499+
<None Include="..\..\Magick.NET.snk">
500+
<Link>Magick.NET.snk</Link>
501+
</None>
499502
<None Include="..\Magick.NET.ruleset">
500503
<Link>Magick.NET.ruleset</Link>
501504
<SubType>Designer</SubType>
@@ -552,7 +555,6 @@
552555
<EmbeddedResource Include="Resources\ReleaseQ8\MagickScript.xsd" Condition="'$(Configuration)' == 'ReleaseQ8' Or '$(Configuration)' == 'DebugQ8'">
553556
<SubType>Designer</SubType>
554557
</EmbeddedResource>
555-
<None Include="Magick.NET.snk" />
556558
<AdditionalFiles Include="stylecop.json" />
557559
<None Include="packages.config" />
558560
</ItemGroup>

‎Source/Magick.NET/Magick.NET.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<SignAssembly>true</SignAssembly>
186186
</PropertyGroup>
187187
<PropertyGroup>
188-
<AssemblyOriginatorKeyFile>Magick.NET.snk</AssemblyOriginatorKeyFile>
188+
<AssemblyOriginatorKeyFile>..\..\Magick.NET.snk</AssemblyOriginatorKeyFile>
189189
</PropertyGroup>
190190
<ItemGroup>
191191
<Reference Include="PresentationCore" />
@@ -583,6 +583,9 @@
583583
<Compile Include="Framework\Types\MagickGeometry.cs" />
584584
</ItemGroup>
585585
<ItemGroup>
586+
<None Include="..\..\Magick.NET.snk">
587+
<Link>Magick.NET.snk</Link>
588+
</None>
586589
<None Include="..\Magick.NET.ruleset">
587590
<Link>Magick.NET.ruleset</Link>
588591
<SubType>Designer</SubType>
@@ -639,7 +642,6 @@
639642
<EmbeddedResource Include="Resources\ReleaseQ8\MagickScript.xsd" Condition="'$(Configuration)' == 'ReleaseQ8' Or '$(Configuration)' == 'DebugQ8'">
640643
<SubType>Designer</SubType>
641644
</EmbeddedResource>
642-
<None Include="Magick.NET.snk" />
643645
<AdditionalFiles Include="stylecop.json" />
644646
<None Include="packages.config" />
645647
</ItemGroup>

‎Source/Magick.NET/Magick.NET.net20.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<SignAssembly>true</SignAssembly>
185185
</PropertyGroup>
186186
<PropertyGroup>
187-
<AssemblyOriginatorKeyFile>Magick.NET.snk</AssemblyOriginatorKeyFile>
187+
<AssemblyOriginatorKeyFile>..\..\Magick.NET.snk</AssemblyOriginatorKeyFile>
188188
</PropertyGroup>
189189
<ItemGroup>
190190
<Reference Include="System" />
@@ -579,6 +579,9 @@
579579
<Compile Include="Framework\Types\MagickGeometry.cs" />
580580
</ItemGroup>
581581
<ItemGroup>
582+
<None Include="..\..\Magick.NET.snk">
583+
<Link>Magick.NET.snk</Link>
584+
</None>
582585
<None Include="..\Magick.NET.ruleset">
583586
<Link>Magick.NET.ruleset</Link>
584587
<SubType>Designer</SubType>
@@ -635,7 +638,6 @@
635638
<EmbeddedResource Include="Resources\ReleaseQ8\MagickScript.xsd" Condition="'$(Configuration)' == 'ReleaseQ8' Or '$(Configuration)' == 'DebugQ8'">
636639
<SubType>Designer</SubType>
637640
</EmbeddedResource>
638-
<None Include="Magick.NET.snk" />
639641
<AdditionalFiles Include="stylecop.json" />
640642
<None Include="packages.config" />
641643
</ItemGroup>

‎Source/Magick.NET/Magick.NET.snk

-596 Bytes
Binary file not shown.

‎Tests/Magick.NET.Tests/Magick.NET.Tests.AnyCPU.csproj

+9
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@
125125
<PlatformTarget>x64</PlatformTarget>
126126
<ErrorReport>prompt</ErrorReport>
127127
</PropertyGroup>
128+
<PropertyGroup>
129+
<SignAssembly>true</SignAssembly>
130+
</PropertyGroup>
131+
<PropertyGroup>
132+
<AssemblyOriginatorKeyFile>..\..\Magick.NET.snk</AssemblyOriginatorKeyFile>
133+
</PropertyGroup>
128134
<ItemGroup>
129135
<Reference Include="PresentationCore" />
130136
<Reference Include="System" />
@@ -262,6 +268,9 @@
262268
</ProjectReference>
263269
</ItemGroup>
264270
<ItemGroup>
271+
<None Include="..\..\Magick.NET.snk">
272+
<Link>Magick.NET.snk</Link>
273+
</None>
265274
<None Include="Core\Script\Collection.msl" />
266275
<None Include="Core\Script\Defines.msl" />
267276
<None Include="Core\Script\Distort.msl" />

‎Tests/Magick.NET.Tests/Magick.NET.Tests.AnyCPU.net20.csproj

+9
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@
125125
<PlatformTarget>x64</PlatformTarget>
126126
<ErrorReport>prompt</ErrorReport>
127127
</PropertyGroup>
128+
<PropertyGroup>
129+
<SignAssembly>true</SignAssembly>
130+
</PropertyGroup>
131+
<PropertyGroup>
132+
<AssemblyOriginatorKeyFile>..\..\Magick.NET.snk</AssemblyOriginatorKeyFile>
133+
</PropertyGroup>
128134
<ItemGroup>
129135
<Reference Include="System" />
130136
<Reference Include="System.Core">
@@ -260,6 +266,9 @@
260266
</ProjectReference>
261267
</ItemGroup>
262268
<ItemGroup>
269+
<None Include="..\..\Magick.NET.snk">
270+
<Link>Magick.NET.snk</Link>
271+
</None>
263272
<None Include="Core\Script\Collection.msl" />
264273
<None Include="Core\Script\Defines.msl" />
265274
<None Include="Core\Script\Distort.msl" />

‎Tests/Magick.NET.Tests/Magick.NET.Tests.csproj

+9
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@
125125
<PlatformTarget>x64</PlatformTarget>
126126
<ErrorReport>prompt</ErrorReport>
127127
</PropertyGroup>
128+
<PropertyGroup>
129+
<SignAssembly>true</SignAssembly>
130+
</PropertyGroup>
131+
<PropertyGroup>
132+
<AssemblyOriginatorKeyFile>..\..\Magick.NET.snk</AssemblyOriginatorKeyFile>
133+
</PropertyGroup>
128134
<ItemGroup>
129135
<Reference Include="PresentationCore" />
130136
<Reference Include="System" />
@@ -262,6 +268,9 @@
262268
</ProjectReference>
263269
</ItemGroup>
264270
<ItemGroup>
271+
<None Include="..\..\Magick.NET.snk">
272+
<Link>Magick.NET.snk</Link>
273+
</None>
265274
<None Include="Core\Script\Collection.msl" />
266275
<None Include="Core\Script\Defines.msl" />
267276
<None Include="Core\Script\Distort.msl" />

‎Tests/Magick.NET.Tests/Magick.NET.Tests.net20.csproj

+9
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@
125125
<PlatformTarget>x64</PlatformTarget>
126126
<ErrorReport>prompt</ErrorReport>
127127
</PropertyGroup>
128+
<PropertyGroup>
129+
<SignAssembly>true</SignAssembly>
130+
</PropertyGroup>
131+
<PropertyGroup>
132+
<AssemblyOriginatorKeyFile>..\..\Magick.NET.snk</AssemblyOriginatorKeyFile>
133+
</PropertyGroup>
128134
<ItemGroup>
129135
<Reference Include="System" />
130136
<Reference Include="System.Core">
@@ -260,6 +266,9 @@
260266
</ProjectReference>
261267
</ItemGroup>
262268
<ItemGroup>
269+
<None Include="..\..\Magick.NET.snk">
270+
<Link>Magick.NET.snk</Link>
271+
</None>
263272
<None Include="Core\Script\Collection.msl" />
264273
<None Include="Core\Script\Defines.msl" />
265274
<None Include="Core\Script\Distort.msl" />

0 commit comments

Comments
 (0)