Skip to content

Commit 4e2353f

Browse files
[release/8.0.4xx] Make duplicate deb/rpm packages so we can sign them with the new PMC key (#20615)
Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
1 parent 41da505 commit 4e2353f

File tree

3 files changed

+17
-0
lines changed

3 files changed

+17
-0
lines changed

src/redist/targets/GenerateDebs.targets

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
<PropertyGroup>
9494
<InstallerOutputDirectory>$(ArtifactsShippingPackagesDir)</InstallerOutputDirectory>
9595
<SdkDebInstallerFile>$(InstallerOutputDirectory)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</SdkDebInstallerFile>
96+
<NewKeyDebInstallerFile>$(InstallerOutputDirectory)$(NewKeyArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</NewKeyDebInstallerFile>
9697
<SdkDebianIntermediateDirectory>$(IntermediateOutputPath)debian/sdk/</SdkDebianIntermediateDirectory>
9798
<DotNetDebToolOutputDirectory>$(SdkDebianIntermediateDirectory)deb-tool-output</DotNetDebToolOutputDirectory>
9899
<DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)debian-testResults.xml</DebianTestResultsXmlFile>
@@ -317,6 +318,13 @@
317318
SkipUnchangedFiles="False"
318319
UseHardlinksIfPossible="False" />
319320

321+
<Copy
322+
DestinationFiles="$(NewKeyDebInstallerFile)"
323+
SourceFiles="@(GeneratedDebFiles)"
324+
OverwriteReadOnlyFiles="True"
325+
SkipUnchangedFiles="False"
326+
UseHardlinksIfPossible="False"/>
327+
320328
<!-- Proactively remove all possible Shared Framework and Debian Packages -->
321329
<ItemGroup>
322330
<SetupDebPackageToRemove Include="$(SdkDebianPackageName)" />

src/redist/targets/GenerateRPMs.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,12 @@
213213
SkipUnchangedFiles="False"
214214
UseHardlinksIfPossible="False"/>
215215

216+
<Copy SourceFiles="@(GeneratedRpmFiles)"
217+
DestinationFiles="$(NewKeyRpmFile)"
218+
OverwriteReadOnlyFiles="True"
219+
SkipUnchangedFiles="False"
220+
UseHardlinksIfPossible="False"/>
221+
216222
</Target>
217223

218224
<Target Name="SetupRpmProps"
@@ -227,6 +233,7 @@
227233
<RpmFile>$(SdkRPMInstallerFile)</RpmFile>
228234
<MarinerRpmFile>$(ArtifactsShippingPackagesDir)$(MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</MarinerRpmFile>
229235
<Mariner2RpmFile>$(ArtifactsShippingPackagesDir)$(Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</Mariner2RpmFile>
236+
<NewKeyRpmFile>$(ArtifactsShippingPackagesDir)$(NewKeyArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</NewKeyRpmFile>
230237
<!-- Need to acquire manpage files from CLI repo: https://github.com/dotnet/cli/issues/10266 -->
231238
<ManPagesDir>$(RepoRoot)/Documentation/manpages</ManPagesDir>
232239
<EndToEndTestProject>$(RepoRoot)/test/EndToEnd/EndToEnd.csproj</EndToEndTestProject>

src/redist/targets/GetRuntimeInformation.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
<!-- Mariner RPM names -->
5353
<MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk Condition=" '$(IsRPMBasedDistro)' == 'True' ">$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(InstallerTargetArchitecture)</MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
5454
<Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk Condition=" '$(IsRPMBasedDistro)' == 'True' ">$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.2-$(InstallerTargetArchitecture)</Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
55+
<!-- NewKey RPM and Deb names-->
56+
<NewKeyArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-newkey-$(InstallerTargetArchitecture)</NewKeyArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
5557

5658
</PropertyGroup>
5759
</Target>

0 commit comments

Comments
 (0)