Permalink
Browse files

Changing the way project signing happens.

- Reverting franken-signed AutoMoq.dll to unsigned version
- Adding 'development' Spring.Net.snk key, which will be overwritten on the build server for release builds
- Updated build script to copy real Spring.Net.snk key over the existing one if signing is requested
- Modified Spring.Messaging.Amqp, Spring.Messaging.Amqp.Rabbit, Spring.Messaging.Amqp.Rabbit.Admin, and Spring.Erlang projects to be signed by Spring.Net.snk
- Test projects will never be signed
  • Loading branch information...
1 parent db5ba63 commit a1c6db09b8632bfe2ff0392648ce28bb89bda948 @joefitzgerald joefitzgerald committed Sep 26, 2011
View
@@ -280,16 +280,20 @@
<target name="rebuild-solution" description="Rebuilds a given solution file">
<echo message="Rebuilding solution '${project.buildsolutionfile}'" />
+ <if test="${project.sign}">
+ <copy todir="${root.dir}">
+ <fileset basedir="${root.dir}\..\..\">
+ <include name="Spring.Net.snk" />
+ </fileset>
+ </copy>
+ </if>
<exec program="${msbuild.exe}">
<arg value="${project.buildsolutionfile}"/>
<arg value="/nologo" />
<arg value="/target:Rebuild" />
<arg value="/verbosity:minimal" />
<arg value="/property:OutDir=${project.buildoutputdir}/"/>
<arg value="/property:Configuration=${project.buildconfiguration}" />
- <arg value="/property:DefineExtraConstants=STRONG" if="${project.sign}" />
- <arg value="/property:SignAssembly=true" if="${project.sign}" />
- <arg value="/property:AssemblyOriginatorKeyFile=..\..\Spring.Net.snk" if="${project.sign}" />
</exec>
</target>
View
Binary file not shown.
Binary file not shown.
@@ -53,6 +53,12 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>..\..\Spring.Net.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -120,6 +126,9 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\Spring.Net.snk">
+ <Link>Spring.Net.snk</Link>
+ </None>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -53,6 +53,12 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>..\..\Spring.Net.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -122,6 +128,9 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\Spring.Net.snk">
+ <Link>Spring.Net.snk</Link>
+ </None>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -53,6 +53,12 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>..\..\Spring.Net.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -161,6 +167,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\Spring.Net.snk">
+ <Link>Spring.Net.snk</Link>
+ </None>
<None Include="Config\spring-rabbit.xsd" />
<None Include="packages.config" />
</ItemGroup>
@@ -54,6 +54,12 @@
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>..\..\Spring.Net.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -135,6 +141,9 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\Spring.Net.snk">
+ <Link>Spring.Net.snk</Link>
+ </None>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -16,4 +16,17 @@
</factoryAdapter>
</logging>
</common>
+
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="Microsoft.Practices.Unity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-2.1.505.0" newVersion="2.1.505.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
</configuration>

0 comments on commit a1c6db0

Please sign in to comment.