Skip to content

Commit 8ebd1a8

Browse files
committed
Ensure the aspnet-contrib signing key is always used for strong naming
1 parent f4e9acb commit 8ebd1a8

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

Directory.Build.props

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
<Project>
2+
23
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
4+
35
<PropertyGroup>
46
<LangVersion>latest</LangVersion>
57
<NoWarn>$(NoWarn);CS1591</NoWarn>
68
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
79
<DebugSymbols>true</DebugSymbols>
10+
</PropertyGroup>
11+
12+
<PropertyGroup>
13+
<StrongNameKeyId>aspnet-contrib</StrongNameKeyId>
814
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\eng\key.snk</AssemblyOriginatorKeyFile>
915
<SignAssembly>true</SignAssembly>
10-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
16+
<DelaySign>false</DelaySign>
17+
<PublicSign>false</PublicSign>
18+
<PublicKey>00240000048000001402000006020000002400005253413100100000010001003509225ad4352617a51a898866d28f3164f3a89953b492dd8b582c76a6fa8679429392db97c54d73cd0a1ddff3f5d91aeb2e861405060d2ac56240cbac91bbe3dfe529db7f32c2c4526b70339f842802fd454d99e1197e201be8c1cda0e2d94359d2a08fed162330f13ef437f0f73a4c5109bfff23db52a936fbdb1b680de3ff6a20d75bd40f326afd7c2b2f20400063b58ed59cf6f105397ee6889fd87bdf33519c30407cd5ee79bdfb93573941e165205282e2c65cae25e564fd431c872f470a24049be5ea617912d7c0b3a2296479d57976e8cc45516009218b183c48f66912fd682d7160f5c2a3a867259243fc2d42a63607ecabcc05a5239851090cee5f8b213da8a3c02ad87f4ceffe2d0793df8420492c7d6919eb2c7fc1657dc966d474d0423cc4b78707832e5c8957bdcb5a0350b10be17f15e95e58b66694c18c5b7a18e7728ed5d27c6993490f280bbbf5e6a93da32ad93fc5bffdadb19a10ac2fe8a41034ff26d2302d9df2b2785907bb65cc86fb0d52ec9876ca0101d15be19937ef7ecf8b5c68d9f0ebafb865effefc3029d89bc5205f537051615e3a0a26ac103c383429c8a718486c82b907b72430ee96b55a6d9dcbb293a65db643a441513d95f6382439a2aedbe86285398e47f83271b93b9bfc00c8ed5be88a710ccd078ea53ca917d96f859ef8e4792e8b6cf0c45db27520fbb5a3cfa4c621e4f983da</PublicKey>
19+
<PublicKeyToken>fa9e7b608b196fab</PublicKeyToken>
1120
</PropertyGroup>
21+
1222
<!--
1323
Arcade only allows the revision to contain up to two characters, and AppVeyor does not roll-over
1424
build numbers every day like Azure DevOps does. To balance these two requirements, set the official
@@ -17,6 +27,7 @@
1727
So a build between 00:00 and 00:14 would have a revision of 1, and a build between 23:45 and 23:59:59
1828
would have a revision of 97.
1929
-->
30+
2031
<PropertyGroup Condition=" '$(APPVEYOR)' == 'True' AND '$(APPVEYOR_PULL_REQUEST_NUMBER)' == '' ">
2132
<_Hours>$([MSBuild]::Multiply($([System.DateTime]::Now.ToString(HH)), 4))</_Hours>
2233
<_QuarterHours>$([MSBuild]::Divide($([System.DateTime]::Now.ToString(mm)), 15))</_QuarterHours>
@@ -26,6 +37,7 @@
2637
<OfficialBuild>true</OfficialBuild>
2738
<OfficialBuildId Condition=" '$(OfficialBuild)' == 'true' ">$([System.DateTime]::Now.ToString(yyyyMMdd)).$(_AppVeyorBuildRevision)</OfficialBuildId>
2839
</PropertyGroup>
40+
2941
<PropertyGroup>
3042
<Product>aspnet-contrib</Product>
3143
<Company>$(Authors)</Company>
@@ -36,10 +48,12 @@
3648
<RepositoryType>git</RepositoryType>
3749
<RepositoryUrl>git://github.com/aspnet-contrib/AspNet.Security.OpenId.Providers</RepositoryUrl>
3850
</PropertyGroup>
51+
3952
<PropertyGroup>
4053
<RepoRelativeProjectDir>$([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectDirectory)))</RepoRelativeProjectDir>
4154
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
4255
</PropertyGroup>
56+
4357
<PropertyGroup Condition=" $(RepoRelativeProjectDir.Contains('src')) ">
4458
<GenerateDocumentationFile>true</GenerateDocumentationFile>
4559
<IncludeSource>true</IncludeSource>
@@ -48,14 +62,18 @@
4862
<IsShipping>true</IsShipping>
4963
<Serviceable>false</Serviceable>
5064
</PropertyGroup>
65+
5166
<ItemGroup Condition=" '$(IsPackable)' == 'true' ">
5267
<None Include="$(MSBuildThisFileDirectory)\package-icon.png" Pack="True" PackagePath="" />
5368
</ItemGroup>
69+
5470
<ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
5571
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
5672
</ItemGroup>
73+
5774
<ItemGroup>
5875
<ProjectCapability Include="DynamicDependentFile" />
5976
<ProjectCapability Include="DynamicFileNesting" />
6077
</ItemGroup>
78+
6179
</Project>

Directory.Build.targets

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
<Project>
2+
23
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
34

45
<!--
56
Note: Arcade automatically replaces copyrights defined in .props or .csproj files
67
with the default Microsoft copyright. To ensure this doesn't happen, the replaced
78
copyright is restored in this .targets file using the private variable set in .props.
9+
Similarly, both delayed and public signing are disabled to override Arcade's defaults.
810
-->
911

1012
<PropertyGroup>
1113
<Company>$(Authors)</Company>
1214
<Copyright>$(_ProjectCopyright)</Copyright>
15+
<DelaySign>false</DelaySign>
16+
<PublicSign>false</PublicSign>
1317
</PropertyGroup>
1418

1519
</Project>

0 commit comments

Comments
 (0)