Skip to content

Commit 44440ae

Browse files
committed
Remove extra test signing project
1 parent 84b5a63 commit 44440ae

File tree

3 files changed

+46
-87
lines changed

3 files changed

+46
-87
lines changed

eng/pipelines/templates/jobs/dnup/dnup-library-package.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,8 @@ jobs:
4242
displayName: '🌐 Publish dnup library packages'
4343
condition: always()
4444
targetPath: '$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping/'
45-
artifactName: 'dnup-library-packages-unsigned'
45+
artifactName: 'dnup-library-packages'
4646
publishLocation: Container
47-
- output: pipelineArtifact
48-
displayName: '🗺️ Publish signed dnup library packages'
49-
condition: always()
50-
targetPath: '$(Build.ArtifactStagingDirectory)\packaging\drop\'
51-
artifactName: 'dnup-library-packages-signed'
52-
publishLocation: Container
53-
5447
steps:
5548
- ${{ if eq(parameters.pool.os, 'windows') }}:
5649
- powershell: |
@@ -66,5 +59,5 @@ jobs:
6659
& .\.dotnet\dotnet build .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.sign.proj
6760
displayName: 🖋️ Sign dnup library packages with full.sign.proj (no sign target)
6861
- powershell: |
69-
& .\.dotnet\dotnet build .\src\Installer\Microsoft.Dotnet.Installation\Install.sign.proj /t:Sign
62+
& .\.dotnet\dotnet build .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.sign.proj /t:Sign
7063
displayName: 🖋️ Sign dnup library packages with arcade signtool

src/Installer/Microsoft.Dotnet.Installation/Install.sign.proj

Lines changed: 0 additions & 66 deletions
This file was deleted.
Lines changed: 44 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1-
<Project Sdk="Microsoft.Build.NoTargets">
2-
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
4-
<GenerateAssemblyVersionInfo>false</GenerateAssemblyVersionInfo>
5-
<EnableDefaultSignFiles>false</EnableDefaultSignFiles>
6-
<MicroBuild_DoNotStrongNameSign>true</MicroBuild_DoNotStrongNameSign>
7-
<IsPackable>false</IsPackable>
8-
<OutDir>$(RepoRoot)packages\</OutDir>
9-
</PropertyGroup>
10-
1+
<Project Sdk="Microsoft.NET.Sdk">
112
<PropertyGroup>
3+
<TargetFramework>net10.0</TargetFramework>
124
<!-- Determine repository root when the pipeline variables are unavailable (e.g. local invocations). -->
135
<_RepoRoot Condition="'$(RepoRoot)' != ''">$(RepoRoot)</_RepoRoot>
146
<_RepoRoot Condition="'$(_RepoRoot)' == ''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\..\'))</_RepoRoot>
@@ -25,10 +17,50 @@
2517
<MicroBuild_SigningEnabled>true</MicroBuild_SigningEnabled>
2618
</PropertyGroup>
2719

20+
<Import Project="$(NuGetPackageRoot)microsoft.dotnet.signtool\$(MicrosoftDotNetSignToolVersion)\build\Microsoft.DotNet.SignTool.props" />
21+
22+
<!-- The name of the .NET specific certificate, which is a general replacement for Microsoft400
23+
If UseDotNetCert is specific in a repo's eng/Signing.props, all usage of Microsoft400 is replaced
24+
with MicrosoftDotNet500 -->
25+
<PropertyGroup>
26+
<DotNetCertificateName>MicrosoftDotNet500</DotNetCertificateName>
27+
<UseDotNetCertificate>false</UseDotNetCertificate>
28+
</PropertyGroup>
29+
2830
<ItemGroup>
29-
<FilesToSign Include="$(PackagesDir)**\*.nupkg">
31+
<FileExtensionSignInfo Include=".nupkg" CertificateName="NuGet" />
32+
<FileExtensionSignInfo Include=".dll" CertificateName="Microsoft400" />
33+
<FileSignInfo Include="Microsoft.Dotnet.Installation.dll" CertificateName="Microsoft400" />
34+
<FileSignInfo Include="Microsoft.Dotnet.Installation*.nupkg" CertificateName="NuGet" />
35+
<ItemsToSign Include="$(PackagesDir)**\Microsoft.Dotnet.Installation*.nupkg">
3036
<Authenticode>NuGet</Authenticode>
31-
</FilesToSign>
37+
</ItemsToSign>
3238
</ItemGroup>
3339

40+
<PropertyGroup Condition="'$(SignType)' == ''">
41+
<SignType>test</SignType>
42+
<TestSign>true</TestSign>
43+
</PropertyGroup>
44+
45+
<PropertyGroup Condition="'$(TestSign)' == ''">
46+
<TestSign>false</TestSign>
47+
</PropertyGroup>
48+
49+
50+
<Target Name="Sign" AfterTargets="Build">
51+
<Microsoft.DotNet.SignTool.SignToolTask
52+
DryRun="false"
53+
TestSign="$(TestSign)"
54+
ItemsToSign="@(ItemsToSign)"
55+
FileSignInfo="@(FileSignInfo)"
56+
FileExtensionSignInfo="@(FileExtensionSignInfo)"
57+
TempDir="$(IntermediateOutputPath)"
58+
LogDir="$(LogDir)"
59+
DoStrongNameCheck="false"
60+
DotNetPath="$(DotNetPath)"
61+
MicroBuildCorePath="$(NuGetPackageRoot)microsoft.visualstudioeng.microbuild.core\$(MicrosoftVisualStudioEngMicroBuildCoreVersion)"
62+
SNBinaryPath="$(NuGetPackageRoot)sn\$(SNVersion)\sn.exe"
63+
>
64+
</Microsoft.DotNet.SignTool.SignToolTask>
65+
</Target>
3466
</Project>

0 commit comments

Comments
 (0)