Skip to content

Commit 04a613c

Browse files
committed
wpf: strong-name sign Microsoft.Terminal.Wpf (#18836)
This requires us to delay-sign the assembly with a public key (the snk file), and then later submit it for strong naming. This is separate from code signing, and has to take place before it. The snk file does not contain any private key material. This cannot merge until we are approved to use this new signing "key code". (cherry picked from commit 0568173) Service-Card-Id: PVTI_lADOAF3p4s4AxadtzgZuEzU Service-Version: 1.23
1 parent 4aa4d4a commit 04a613c

File tree

4 files changed

+21
-0
lines changed

4 files changed

+21
-0
lines changed

.github/actions/spelling/expect/expect.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1679,6 +1679,7 @@ SMARTQUOTE
16791679
SMTO
16801680
snapcx
16811681
snapcy
1682+
snk
16821683
SOLIDBOX
16831684
Solutiondir
16841685
somefile

build/config/272MSSharedLibSN2048.snk

288 Bytes
Binary file not shown.

build/config/esrp.build.batch.wpfdotnet.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@
66
],
77
"SigningInfo": {
88
"Operations": [
9+
{
10+
"KeyCode": "CP-233904-SN",
11+
"OperationSetCode": "StrongNameSign",
12+
"ToolName": "sign",
13+
"ToolVersion": "1.0",
14+
"Parameters": []
15+
},
16+
{
17+
"KeyCode": "CP-233904-SN",
18+
"OperationSetCode": "StrongNameVerify",
19+
"ToolName": "sign",
20+
"ToolVersion": "1.0",
21+
"Parameters": []
22+
},
923
{
1024
"KeyCode": "CP-230012",
1125
"OperationSetCode": "SigntoolSign",

src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<Version>0.1</Version>
1616
</PropertyGroup>
1717

18+
<PropertyGroup Condition="'$(WindowsTerminalOfficialBuild)'=='true'">
19+
<SignAssembly>true</SignAssembly>
20+
<DelaySign>true</DelaySign>
21+
<AssemblyOriginatorKeyFile>..\..\..\build\config\272MSSharedLibSN2048.snk</AssemblyOriginatorKeyFile>
22+
</PropertyGroup>
23+
1824
<ItemGroup>
1925
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json">
2026
<Visible>true</Visible>

0 commit comments

Comments
 (0)