Skip to content

Commit 58b456e

Browse files
Make duplicate deb/rpm packages so we can sign them with the new PMC key (#63250)
Contributes to dotnet/arcade#16047 Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
1 parent 02235a7 commit 58b456e

File tree

7 files changed

+17
-0
lines changed

7 files changed

+17
-0
lines changed

src/Installers/Debian/Directory.Build.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,6 @@
6060
</PropertyGroup>
6161

6262
<Copy SourceFiles="$(IntermediateOutputPath)out/$(BuildScriptOutputFileName)" DestinationFiles="$(TargetPath)" />
63+
<Copy SourceFiles="$(IntermediateOutputPath)out/$(BuildScriptOutputFileName)" DestinationFiles="$(OutputPath)$(NewKeyTargetFileName)" />
6364
</Target>
6465
</Project>

src/Installers/Debian/Runtime/Debian.Runtime.debproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
<PropertyGroup>
3636
<TargetFileName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)-x64.deb</TargetFileName>
37+
<NewKeyTargetFileName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)-newkey-x64.deb</NewKeyTargetFileName>
3738
<TargetPath>$(TargetDir)$(TargetFileName)</TargetPath>
3839
<!-- DebPackageVersion does not match the ASP.NET Core runtime verison. -->
3940
<DebPackageVersion>$(VersionPrefix)</DebPackageVersion>

src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
<PropertyGroup>
4040
<TargetFileName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-$(TargetArchitecture).deb</TargetFileName>
41+
<NewKeyTargetFileName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-newkey-$(TargetArchitecture).deb</NewKeyTargetFileName>
4142
<TargetPath>$(TargetDir)$(TargetFileName)</TargetPath>
4243

4344
<DebPackageVersion>$(TargetingPackVersionPrefix)</DebPackageVersion>

src/Installers/Rpm/Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<CblMariner1VersionSuffix>-cm.1</CblMariner1VersionSuffix>
1313
<CblMariner2VersionSuffix>-cm.2</CblMariner2VersionSuffix>
14+
<NewKeyVersionSuffix>-newkey</NewKeyVersionSuffix>
1415

1516
<!-- All installers are shipping assets. -->
1617
<IsShipping>true</IsShipping>

src/Installers/Rpm/Directory.Build.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<PropertyGroup>
4141
<CblMariner1TargetPath>$(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner1VersionSuffix)$(CblMarinerExtension)</CblMariner1TargetPath>
4242
<CblMariner2TargetPath>$(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner2VersionSuffix)$(CblMarinerExtension)</CblMariner2TargetPath>
43+
<NewKeyTargetPath>$(InstallersOutputPath)$(NewKeyBaseName)$(NewKeyVersionSuffix)$(NewKeyExtension)</NewKeyTargetPath>
4344
</PropertyGroup>
4445

4546
<!-- Create layout: Create changelog -->
@@ -103,5 +104,13 @@
103104
UseHardlinksIfPossible="False" />
104105

105106
<Message Text="$(TargetPath) -> $(CblMariner2TargetPath)" Importance="high" />
107+
108+
<Copy SourceFiles="$(TargetPath)"
109+
DestinationFiles="$(NewKeyTargetPath)"
110+
OverwriteReadOnlyFiles="True"
111+
SkipUnchangedFiles="False"
112+
UseHardlinksIfPossible="False" />
113+
114+
<Message Text="$(TargetPath) -> $(NewKeyTargetPath)" Importance="high" />
106115
</Target>
107116
</Project>

src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@
1616
<TargetPath>$(InstallersOutputPath)$(TargetFileName)</TargetPath>
1717
<CblMarinerBaseName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)</CblMarinerBaseName>
1818
<CblMarinerExtension>-$(RpmArch).rpm</CblMarinerExtension>
19+
<NewKeyBaseName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)</NewKeyBaseName>
20+
<NewKeyExtension>-$(RpmArch).rpm</NewKeyExtension>
1921
</PropertyGroup>
2022
</Project>

src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
<TargetPath>$(InstallersOutputPath)$(TargetFileName)</TargetPath>
3434
<CblMarinerBaseName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)</CblMarinerBaseName>
3535
<CblMarinerExtension>-$(RpmArch).rpm</CblMarinerExtension>
36+
<NewKeyBaseName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)</NewKeyBaseName>
37+
<NewKeyExtension>-$(RpmArch).rpm</NewKeyExtension>
3638

3739
<PackageVersion>$(TargetingPackVersionPrefix)</PackageVersion>
3840

0 commit comments

Comments
 (0)