Skip to content

Commit 8a8fd6b

Browse files
HaploisHaplois
committed
Fixed signing of assemblies.
1 parent 8950e74 commit 8a8fd6b

File tree

1 file changed

+75
-57
lines changed

1 file changed

+75
-57
lines changed

‎src/package/sign/sign.proj

+75-57
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@
2121
<!-- Directory with .NET binaries -->
2222
<ArtifactsDirectory Condition="'$(ArtifactsDirectory)' == ''">$(ArtifactsBaseDirectory)$(TargetFramework)\$(TargetRuntime)\</ArtifactsDirectory>
2323

24-
<!-- Directory with .NETCore binaries -->
25-
<ArtifactsCoreDirectory Condition="'$(ArtifactsCoreDirectory)' == ''">$(ArtifactsBaseDirectory)netcoreapp2.1\</ArtifactsCoreDirectory>
24+
<!-- Directory with netcoreapp2.1 binaries -->
25+
<ArtifactsCore21Directory Condition="'$(ArtifactsCore21Directory)' == ''">$(ArtifactsBaseDirectory)netcoreapp2.1\</ArtifactsCore21Directory>
26+
27+
<!-- Directory with netcoreapp1.0 binaries -->
28+
<ArtifactsCore10Directory Condition="'$(ArtifactsCore10Directory)' == ''">$(ArtifactsBaseDirectory)netcoreapp1.0\</ArtifactsCore10Directory>
2629

2730
<!-- Directory with NetStandard1.0 binaries -->
2831
<ArtifactsNS10Directory Condition="'$(ArtifactsNS10Directory)' == ''">$(ArtifactsBaseDirectory)netstandard1.0\</ArtifactsNS10Directory>
@@ -128,7 +131,6 @@
128131
<AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.VisualStudio.QualityTools.DataCollectionAgentObject.dll" />
129132
<AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAdapter.dll" />
130133
<AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.VisualStudio.QualityTools.HostAdapters.ASPNETAgent.dll" />
131-
<AssembliesToSign Include="$(ArtifactsDirectory)VsWebSite.Interop.dll" />
132134
<AssembliesToSign Include="$(ArtifactsDirectory)QTAgent.exe" />
133135
<AssembliesToSign Include="$(ArtifactsDirectory)QTAgent32.exe" />
134136
<AssembliesToSign Include="$(ArtifactsDirectory)QTAgent32_35.exe" />
@@ -149,7 +151,6 @@
149151
<!--These dlls are already signed from VS nuget feed
150152
<AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.VisualStudio.Diagnostics.Measurement.dll" />
151153
<AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.VisualStudio.QualityTools.Sqm.dll" />
152-
<AssembliesToSign Include="$(ArtifactsDirectory)Microsoft.VisualStudio.OLE.Interop.dll" />
153154
-->
154155

155156
<!-- These are already signed, trying to sign them again causes warnings in the build pipeline.
@@ -302,46 +303,51 @@
302303
<!-- <IntellitraceAssembliesToSign Include="$(ArtifactsBaseDirectory)Intellitrace\Team Tools\Dynamic Code Coverage Tools\amd64\msdia140.dll" /> -->
303304
<!-- <IntellitraceAssembliesToSign Include="$(ArtifactsBaseDirectory)Intellitrace\Team Tools\Dynamic Code Coverage Tools\CodeCoverage.exe" /> -->
304305
<!-- <IntellitraceAssembliesToSign Include="$(ArtifactsBaseDirectory)Intellitrace\Team Tools\Dynamic Code Coverage Tools\amd64\CodeCoverage.exe" /> -->
306+
305307
<!-- Sign test platform v2 assemblies for .NET Core -->
306308
<ItemGroup>
307-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)DataCollector.dll" />
308-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Microsoft.TestPlatform.CommunicationUtilities.dll" />
309-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Microsoft.TestPlatform.CoreUtilities.dll" />
310-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
311-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Microsoft.TestPlatform.CrossPlatEngine.dll" />
312-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Microsoft.TestPlatform.Utilities.dll" />
313-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
314-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Microsoft.VisualStudio.TestPlatform.Client.dll" />
315-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Microsoft.VisualStudio.TestPlatform.Common.dll" />
316-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
317-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)vstest.console.dll" />
318-
319-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\Microsoft.TestPlatform.CommunicationUtilities.dll" />
320-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\Microsoft.TestPlatform.CoreUtilities.dll" />
321-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\Microsoft.TestPlatform.CrossPlatEngine.dll" />
322-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\Microsoft.TestPlatform.PlatformAbstractions.dll" />
323-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\Microsoft.TestPlatform.Utilities.dll" />
324-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\Microsoft.VisualStudio.TestPlatform.Common.dll" />
325-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
326-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.exe" />
327-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.x86.exe" />
328-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net452.exe" />
329-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net452.x86.exe" />
330-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net46.exe" />
331-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net46.x86.exe" />
332-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net461.exe" />
333-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net461.x86.exe" />
334-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net462.exe" />
335-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net462.x86.exe" />
336-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net47.exe" />
337-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net47.x86.exe" />
338-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net471.exe" />
339-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net471.x86.exe" />
340-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net472.exe" />
341-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net472.x86.exe" />
342-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net48.exe" />
343-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\testhost.net48.x86.exe" />
344-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\datacollector.exe" />
309+
<Core10AssembliesToSign Include="$(ArtifactsCore10Directory)Microsoft.TestPlatform.CoreUtilities.dll" />
310+
<Core10AssembliesToSign Include="$(ArtifactsCore10Directory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
311+
<Core10AssembliesToSign Include="$(ArtifactsCore10Directory)Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
312+
313+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)DataCollector.dll" />
314+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.TestPlatform.CommunicationUtilities.dll" />
315+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.TestPlatform.CoreUtilities.dll" />
316+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
317+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.TestPlatform.CrossPlatEngine.dll" />
318+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.TestPlatform.Utilities.dll" />
319+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" />
320+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.VisualStudio.TestPlatform.Client.dll" />
321+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.VisualStudio.TestPlatform.Common.dll" />
322+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
323+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)vstest.console.dll" />
324+
325+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.TestPlatform.CommunicationUtilities.dll" />
326+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.TestPlatform.CoreUtilities.dll" />
327+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.TestPlatform.CrossPlatEngine.dll" />
328+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.TestPlatform.PlatformAbstractions.dll" />
329+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.TestPlatform.Utilities.dll" />
330+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.VisualStudio.TestPlatform.Common.dll" />
331+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
332+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.exe" />
333+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.x86.exe" />
334+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net452.exe" />
335+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net452.x86.exe" />
336+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net46.exe" />
337+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net46.x86.exe" />
338+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net461.exe" />
339+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net461.x86.exe" />
340+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net462.exe" />
341+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net462.x86.exe" />
342+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net47.exe" />
343+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net47.x86.exe" />
344+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net471.exe" />
345+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net471.x86.exe" />
346+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net472.exe" />
347+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net472.x86.exe" />
348+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net48.exe" />
349+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\testhost.net48.x86.exe" />
350+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\datacollector.exe" />
345351

346352
<NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)Microsoft.TestPlatform.CoreUtilities.dll" />
347353
<NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
@@ -360,24 +366,25 @@
360366
<UAP100AssembliesToSign Include="$(ArtifactsUAP100Directory)Microsoft.TestPlatform.AdapterUtilities.dll" />
361367

362368
<!-- NetCoreExtensions -->
363-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
364-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
365-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
366-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
367-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Extensions\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
369+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
370+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />
371+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
372+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\Microsoft.TestPlatform.Extensions.BlameDataCollector.dll" />
373+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
368374

369375
<!-- Localized resources -->
370-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)%(ResxLang.Identity)\*.*" />
376+
<Core10AssembliesToSign Include="$(ArtifactsCore10Directory)%(ResxLang.Identity)\*.*" />
377+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)%(ResxLang.Identity)\*.*" />
371378
<NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)%(ResxLang.Identity)\*.*" />
372379
<NetStandard13AssembliesToSign Include="$(ArtifactsNS13Directory)%(ResxLang.Identity)\*.*" />
373380
<NetStandard20AssembliesToSign Include="$(ArtifactsNS20Directory)%(ResxLang.Identity)\*.*" />
374381
<UAP100AssembliesToSign Include="$(ArtifactsUAP100Directory)%(ResxLang.Identity)\*.*" />
375-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Extensions\%(ResxLang.Identity)\*.*" />
376-
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\%(ResxLang.Identity)\*.*" />
382+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)Extensions\%(ResxLang.Identity)\*.*" />
383+
<Core21AssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\%(ResxLang.Identity)\*.*" />
377384

378385
<!-- Third Party assemblies to sign -->
379-
<ThirdPartyAssembliesToSign Include="$(ArtifactsCoreDirectory)Newtonsoft.Json.dll" />
380-
<ThirdPartyAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\Newtonsoft.Json.dll" />
386+
<ThirdPartyAssembliesToSign Include="$(ArtifactsCore21Directory)Newtonsoft.Json.dll" />
387+
<ThirdPartyAssembliesToSign Include="$(ArtifactsCore21Directory)TestHost\Newtonsoft.Json.dll" />
381388
</ItemGroup>
382389

383390
<!-- Sign Microsoft.TestPlatform.Build -->
@@ -497,10 +504,15 @@
497504
<StrongName>StrongName</StrongName>
498505
</Fw45AssembliesToSign>
499506

500-
<CoreAssembliesToSign>
507+
<Core21AssembliesToSign>
501508
<Authenticode>Microsoft400</Authenticode>
502509
<StrongName>StrongName</StrongName>
503-
</CoreAssembliesToSign>
510+
</Core21AssembliesToSign>
511+
512+
<Core10AssembliesToSign>
513+
<Authenticode>Microsoft400</Authenticode>
514+
<StrongName>StrongName</StrongName>
515+
</Core10AssembliesToSign>
504516

505517
<BuildAssembliesToSign>
506518
<Authenticode>Microsoft400</Authenticode>
@@ -571,9 +583,15 @@
571583
IntermediatesDirectory="$(IntermediatesDirectory)"
572584
Type="$(SignType)" />
573585

574-
<Message Text="Signing using authenticode certificate CoreAssembliesToSign:'%(CoreAssembliesToSign.Authenticode)' for @(CoreAssembliesToSign)"/>
575-
<SignFiles Files="@(CoreAssembliesToSign)"
576-
BinariesDirectory="$(ArtifactsCoreDirectory)"
586+
<Message Text="Signing using authenticode certificate Core21AssembliesToSign:'%(Core21AssembliesToSign.Authenticode)' for @(Core21AssembliesToSign)"/>
587+
<SignFiles Files="@(Core21AssembliesToSign)"
588+
BinariesDirectory="$(ArtifactsCore21Directory)"
589+
IntermediatesDirectory="$(IntermediatesDirectory)"
590+
Type="$(SignType)" />
591+
592+
<Message Text="Signing using authenticode certificate Core10AssembliesToSign:'%(Core10AssembliesToSign.Authenticode)' for @(Core10AssembliesToSign)"/>
593+
<SignFiles Files="@(Core10AssembliesToSign)"
594+
BinariesDirectory="$(ArtifactsCore10Directory)"
577595
IntermediatesDirectory="$(IntermediatesDirectory)"
578596
Type="$(SignType)" />
579597

0 commit comments

Comments
 (0)