Skip to content

Commit 0fdaf80

Browse files
committed
Fix conflict with code signing certificate name resolution that was introduced by a Microsoft change.
1 parent 33551b9 commit 0fdaf80

3 files changed

Lines changed: 13 additions & 20 deletions

File tree

Conform/FrmWarning.resx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="lblWarnBody1.Text" xml:space="preserve">
121121
<value>Every effort has been made to ensure that Conform behaves responsibly but please be aware that Conform assumes that your telescope and dome are able to move safely to any position in the visible sky, if this is not the case please do not use Conform.
@@ -129,7 +129,7 @@ You are responsible for making sure this happpens safely and doesn't damage the
129129

130130
Do not run Conform unless you are confident that you can do so safely and are able to stop the tests should Conform instruct the equipment to do something inappropriate.</value>
131131
</data>
132-
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
132+
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
133133
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
134134
<value>
135135
AAABAAEAICAAAAAACACoCAAAFgAAACgAAAAgAAAAQAAAAAEACAAAAAAAgAQAAAAAAAAAAAAAAAEAAAAA

Setup/Conform6.iss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ OutputDir=.\Builds
3939
PrivilegesRequired=admin
4040
SetupIconFile=..\Conform\Resources\ASCOM.ico
4141
SetupLogging=true
42+
SignToolRunMinimized=yes
4243
ShowLanguageDialog=auto
4344
SolidCompression=true
4445
UninstallDisplayIcon={app}\Conform.exe

SignConform.cmd

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,17 @@ if errorlevel 1 (
1010
echo Executables already signed on first pass...
1111
) ELSE (
1212
echo Signing compiled executables
13-
echo signtool sign /a /fd SHA256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\Debug\Conform.exe"
14-
signtool sign /a /fd SHA256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\Debug\Conform.exe"
15-
signtool sign /a /as /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\Debug\Conform.exe"
13+
echo signtool sign /a /fd SHA256 /n "Peter Simpson" /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\Debug\Conform.exe"
14+
signtool sign /a /fd SHA256 /n "Peter Simpson" /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\Debug\Conform.exe"
1615

17-
echo signtool sign /a /fd SHA256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\Release\Conform.exe"
18-
signtool sign /a /fd SHA256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\Release\Conform.exe"
19-
signtool sign /a /as /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\Release\Conform.exe"
16+
echo signtool sign /a /fd SHA256 /n "Peter Simpson" /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\Release\Conform.exe"
17+
signtool sign /a /fd SHA256 /n "Peter Simpson" /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\Release\Conform.exe"
2018

21-
echo signtool sign /a /fd SHA256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\x86\Debug\Conform.exe"
22-
signtool sign /a /fd SHA256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\x86\Debug\Conform.exe"
23-
signtool sign /a /as /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\x86\Debug\Conform.exe"
19+
echo signtool sign /a /fd SHA256 /n "Peter Simpson" /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\x86\Debug\Conform.exe"
20+
signtool sign /a /fd SHA256 /n "Peter Simpson" /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\x86\Debug\Conform.exe"
2421

25-
echo signtool sign /a /fd SHA256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\x86\Release\Conform.exe"
26-
signtool sign /a /fd SHA256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\x86\Release\Conform.exe"
27-
signtool sign /a /as /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\x86\Release\Conform.exe"
22+
echo signtool sign /a /fd SHA256 /n "Peter Simpson" /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\x86\Release\Conform.exe"
23+
signtool sign /a /fd SHA256 /n "Peter Simpson" /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "J:\Conform\Conform\bin\x86\Release\Conform.exe"
2824
)
2925

3026
echo Signing installer %1
@@ -33,11 +29,7 @@ REM The delays provide time for the executable to be released by the previous pr
3329
echo Starting 1 second wait
3430
timeout /T 1
3531
echo Finished wait
36-
start "Sign with SHA256" /wait /b "signtool" sign /a /fd SHA256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 %1
37-
echo Starting 1 second wait
38-
timeout /T 1
39-
echo Finished wait
40-
start "Sign with SHA1" /wait /b "signtool" sign /a /as /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 %1
32+
start "Sign with SHA256" /wait /b "signtool" sign /a /fd SHA256 /n "Peter Simpson" /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 %1
4133

4234
rem pause
4335

0 commit comments

Comments
 (0)