Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Including Microsoft.TestPlatform.AdapterUtilities in signing #2719

Merged
merged 3 commits into from
Jan 27, 2021
+19 −0
Merged

Including Microsoft.TestPlatform.AdapterUtilities in signing #2719

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b65a73
Added additional certificates.
Haplois Nov 19, 2020
d8e687c
Included missing assemblies in signing.
Haplois Jan 27, 2021
385e40c
Merge branch 'master' into signing-fix
Haplois Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/package/sign/sign.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@

<!-- Directory with NetStandard2.0 binaries -->
<ArtifactsNS20Directory Condition="'$(ArtifactsNS20Directory)' == ''">$(ArtifactsBaseDirectory)netstandard2.0\</ArtifactsNS20Directory>

<!-- Directory with UAP10.0 binaries -->
<ArtifactsUAP100Directory Condition="'$(ArtifactsUAP100Directory)' == ''">$(ArtifactsBaseDirectory)uap10.0\</ArtifactsUAP100Directory>

<IntermediatesDirectory Condition="'$(IntermediatesDirectory)' == ''">$(ArtifactsBaseDirectory)obj\$(BuildConfiguration)\$(TargetFramework)\$(TargetRuntime)\</IntermediatesDirectory>
</PropertyGroup>
Expand Down Expand Up @@ -332,6 +335,7 @@
<NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)Microsoft.TestPlatform.CoreUtilities.dll" />
<NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
<NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
<NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)Microsoft.TestPlatform.AdapterUtilities.dll" />

<NetStandard13AssembliesToSign Include="$(ArtifactsNS13Directory)Microsoft.TestPlatform.CoreUtilities.dll" />
<NetStandard13AssembliesToSign Include="$(ArtifactsNS13Directory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
Expand All @@ -340,6 +344,9 @@
<NetStandard20AssembliesToSign Include="$(ArtifactsNS20Directory)Microsoft.TestPlatform.CoreUtilities.dll" />
<NetStandard20AssembliesToSign Include="$(ArtifactsNS20Directory)Microsoft.TestPlatform.PlatformAbstractions.dll" />
<NetStandard20AssembliesToSign Include="$(ArtifactsNS20Directory)Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
<NetStandard20AssembliesToSign Include="$(ArtifactsNS20Directory)Microsoft.TestPlatform.AdapterUtilities.dll" />

<UAP100AssembliesToSign Include="$(ArtifactsUAP100Directory)Microsoft.TestPlatform.AdapterUtilities.dll" />

<!-- NetCoreExtensions -->
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
Expand All @@ -353,6 +360,7 @@
<NetStandard10AssembliesToSign Include="$(ArtifactsNS10Directory)%(ResxLang.Identity)\*.*" />
<NetStandard13AssembliesToSign Include="$(ArtifactsNS13Directory)%(ResxLang.Identity)\*.*" />
<NetStandard20AssembliesToSign Include="$(ArtifactsNS20Directory)%(ResxLang.Identity)\*.*" />
<UAP100AssembliesToSign Include="$(ArtifactsUAP100Directory)%(ResxLang.Identity)\*.*" />
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)Extensions\%(ResxLang.Identity)\*.*" />
<CoreAssembliesToSign Include="$(ArtifactsCoreDirectory)TestHost\%(ResxLang.Identity)\*.*" />

Expand Down Expand Up @@ -462,6 +470,11 @@
<Authenticode>Microsoft400</Authenticode>
<StrongName>StrongName</StrongName>
</NetStandard20AssembliesToSign>

<UAP100AssembliesToSign>
<Authenticode>Microsoft400</Authenticode>
<StrongName>StrongName</StrongName>
</UAP100AssembliesToSign>

<AssembliesToSign>
<Authenticode>Microsoft400</Authenticode>
Expand Down Expand Up @@ -527,6 +540,12 @@
IntermediatesDirectory="$(IntermediatesDirectory)"
Type="$(SignType)" />

<Message Text="Signing using authenticode certificate UAP100AssembliesToSign:'%(UAP100AssembliesToSign.Authenticode)' for @(UAP100AssembliesToSign)"/>
<SignFiles Files="@(UAP100AssembliesToSign)"
BinariesDirectory="$(ArtifactsUAP100Directory)"
IntermediatesDirectory="$(IntermediatesDirectory)"
Type="$(SignType)" />

<Message Text="Signing using authenticode certificate Fw45AssembliesToSign:'%(Fw45AssembliesToSign.Authenticode)' for @(Fw45AssembliesToSign)"/>
<SignFiles Files="@(Fw45AssembliesToSign)"
BinariesDirectory="$(ArtifactsFw45Directory)"
Expand Down