diff options
| author | Joel Hendrix <jhendrix@microsoft.com> | 2016-05-19 15:18:56 -0700 |
|---|---|---|
| committer | Joel Hendrix <jhendrix@microsoft.com> | 2016-05-19 15:18:56 -0700 |
| commit | fffe097e4a0b21b618543078a8fa19aec3d55856 (patch) | |
| tree | 0fe49dd3bc290fdafa7e1d8e43b44c69d88d5d24 /src/mscorlib | |
| parent | 00d3f3e45ee5648d8315c817b2e4bc0a76e4af4c (diff) | |
| parent | 5b784c2a3b1de97a8ee164d70207a9ba172d1f41 (diff) | |
| download | coreclr-fffe097e4a0b21b618543078a8fa19aec3d55856.tar.gz coreclr-fffe097e4a0b21b618543078a8fa19aec3d55856.tar.bz2 coreclr-fffe097e4a0b21b618543078a8fa19aec3d55856.zip | |
Merge pull request #5074 from jhendrixMSFT/master
Add sign.builds projects to facilitate real signing in official builds.
Diffstat (limited to 'src/mscorlib')
| -rw-r--r-- | src/mscorlib/System.Private.CoreLib.csproj | 4 | ||||
| -rw-r--r-- | src/mscorlib/facade/mscorlib.csproj | 13 | ||||
| -rw-r--r-- | src/mscorlib/mscorlib.csproj | 4 | ||||
| -rw-r--r-- | src/mscorlib/ref/mscorlib.csproj | 4 |
4 files changed, 24 insertions, 1 deletions
diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj index 2f246e74c9..f44944ec1a 100644 --- a/src/mscorlib/System.Private.CoreLib.csproj +++ b/src/mscorlib/System.Private.CoreLib.csproj @@ -181,6 +181,10 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" /> + <PropertyGroup> + <StrongNameSig>Silverlight</StrongNameSig> + </PropertyGroup> + <!-- Import signing tools --> <Import Condition="Exists('$(ToolsDir)\sign.targets')" Project="$(ToolsDir)\sign.targets" /> diff --git a/src/mscorlib/facade/mscorlib.csproj b/src/mscorlib/facade/mscorlib.csproj index 11dde3ee5d..9806ee0111 100644 --- a/src/mscorlib/facade/mscorlib.csproj +++ b/src/mscorlib/facade/mscorlib.csproj @@ -61,10 +61,21 @@ <ItemGroup> <None Include="project.json" /> </ItemGroup> + + <PropertyGroup> + <StrongNameSig>Silverlight</StrongNameSig> + </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup> + <PropertyGroup> <!-- Overwrite the key that we are going to use for signing --> <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\Tools\Signing\mscorlib.snk</AssemblyOriginatorKeyFile> </PropertyGroup> + + <!-- the signing marker file is incorrectly named mscorlib.dll.requires_signing --> + <Target Name="RenameSigningMarker" AfterTargets="WriteSigningRequired" Condition="Exists('$(TargetPath).requires_signing')"> + <Move SourceFiles="$(TargetPath).requires_signing" DestinationFiles="$(OutputPath)\System.Private.CoreLib.dll.requires_signing" /> + </Target> + </Project> diff --git a/src/mscorlib/mscorlib.csproj b/src/mscorlib/mscorlib.csproj index 5a6f369eb9..9f5615dbfc 100644 --- a/src/mscorlib/mscorlib.csproj +++ b/src/mscorlib/mscorlib.csproj @@ -179,6 +179,10 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" /> + <PropertyGroup> + <StrongNameSig>Silverlight</StrongNameSig> + </PropertyGroup> + <!-- Import signing tools --> <Import Condition="Exists('$(ToolsDir)\sign.targets')" Project="$(ToolsDir)\sign.targets" /> diff --git a/src/mscorlib/ref/mscorlib.csproj b/src/mscorlib/ref/mscorlib.csproj index e80a71b76d..9827fe7ca2 100644 --- a/src/mscorlib/ref/mscorlib.csproj +++ b/src/mscorlib/ref/mscorlib.csproj @@ -68,6 +68,10 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" /> + <PropertyGroup> + <StrongNameSig>Silverlight</StrongNameSig> + </PropertyGroup> + <!-- Import signing tools --> <Import Condition="Exists('$(ToolsDir)\sign.targets')" Project="$(ToolsDir)\sign.targets" /> |