diff options
| author | Wes Haggard <weshaggard@users.noreply.github.com> | 2017-04-11 02:48:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-11 02:48:43 +0300 |
| commit | 4b0b313c3a40fefe793ab465f152f382484813d8 (patch) | |
| tree | 55c8d9d97bf5728e44bc58ecf73473cff5ebbac3 /Tools-Override | |
| parent | 17dcb31cf2cb604484d702475ef3c963209346df (diff) | |
| parent | ac09a797d09502ebab61f7167bb856846602e1e6 (diff) | |
Merge pull request #18165 from weshaggard/UpdateAssemblyKeys
Updates how we define which key an assembly uses
Diffstat (limited to 'Tools-Override')
| -rw-r--r-- | Tools-Override/sign.targets | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/Tools-Override/sign.targets b/Tools-Override/sign.targets index 23da65f05e..981366b979 100644 --- a/Tools-Override/sign.targets +++ b/Tools-Override/sign.targets @@ -10,19 +10,28 @@ <UsingTask AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" TaskName="WriteSigningRequired" /> <PropertyGroup Condition="'$(SkipSigning)'!='true'"> - <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)' == ''">$(ToolsDir)MSFT.snk</AssemblyOriginatorKeyFile> - <AssemblyOriginatorKeyFile Condition="'$(UseECMAKey)' == 'true'">$(ToolsDir)ECMA.snk</AssemblyOriginatorKeyFile> - <AssemblyOriginatorKeyFile Condition="'$(UseOpenKey)' == 'true'">$(ToolsDir)Open.snk</AssemblyOriginatorKeyFile> + + <!-- For older support set AssemblyKey base on Use*Key properties but moving forward projects should just set AssemblyKey --> + <AssemblyKey Condition="'$(AssemblyKey)'=='' and '$(UseOpenKey)' == 'true'">Open</AssemblyKey> + <AssemblyKey Condition="'$(AssemblyKey)'=='' and '$(UseECMAKey)' == 'true'">ECMA</AssemblyKey> + <AssemblyKey Condition="'$(AssemblyKey)'=='' and '$(UseMSFTKey)' == 'true'">MSFT</AssemblyKey> + + <!-- Force all test projects to use the Test key --> + <AssemblyKey Condition="'$(IsTestProject)' == 'true'">Test</AssemblyKey> + + <AssemblyOriginatorKeyFile Condition="'$(AssemblyKey)' == 'MSFT'">$(ToolsDir)MSFT.snk</AssemblyOriginatorKeyFile> + <AssemblyOriginatorKeyFile Condition="'$(AssemblyKey)' == 'ECMA'">$(ToolsDir)ECMA.snk</AssemblyOriginatorKeyFile> + <AssemblyOriginatorKeyFile Condition="'$(AssemblyKey)' == 'Open'">$(ToolsDir)Open.snk</AssemblyOriginatorKeyFile> <!-- Don't sign test assemblies with the Microsoft Key, as this affects APIs checking if the test assembly is an MS Key --> - <AssemblyOriginatorKeyFile Condition="'$(IsTestProject)' == 'true'">$(ToolsDir)Test.snk</AssemblyOriginatorKeyFile> + <AssemblyOriginatorKeyFile Condition="'$(AssemblyKey)' == 'Test'">$(ToolsDir)Test.snk</AssemblyOriginatorKeyFile> <SignAssembly>true</SignAssembly> <DelaySign>true</DelaySign> <!-- For full keys we should disable delay signing --> - <FullPublicPrivateKey Condition="'$(AssemblyOriginatorKeyFile)' == '$(ToolsDir)Open.snk'">true</FullPublicPrivateKey> - <FullPublicPrivateKey Condition="'$(AssemblyOriginatorKeyFile)' == '$(ToolsDir)Test.snk'">true</FullPublicPrivateKey> + <FullPublicPrivateKey Condition="'$(AssemblyKey)' == 'Open'">true</FullPublicPrivateKey> + <FullPublicPrivateKey Condition="'$(AssemblyKey)' == 'Test'">true</FullPublicPrivateKey> <DelaySign Condition="'$(FullPublicPrivateKey)' == 'true'">false</DelaySign> |