Skip to content

Commit f3eefea

Browse files
[release/9.0.3xx] Make duplicate deb/rpm packages so we can sign them with the new PMC key (#50910)
Co-authored-by: Jeremy Koritzinsky <[email protected]>
1 parent cea9cb1 commit f3eefea

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

src/Installer/redist-installer/targets/GenerateDebs.targets

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
<PropertyGroup>
9393
<InstallerOutputDirectory>$(ArtifactsShippingPackagesDir)</InstallerOutputDirectory>
9494
<SdkDebInstallerFile>$(InstallerOutputDirectory)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</SdkDebInstallerFile>
95+
<NewKeyDebInstallerFile>$(InstallerOutputDirectory)$(NewKeyArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</NewKeyDebInstallerFile>
9596
<SdkDebianIntermediateDirectory>$(IntermediateOutputPath)debian/sdk/</SdkDebianIntermediateDirectory>
9697
<DotNetDebToolOutputDirectory>$(SdkDebianIntermediateDirectory)deb-tool-output</DotNetDebToolOutputDirectory>
9798
<DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)debian-testResults.xml</DebianTestResultsXmlFile>
@@ -220,7 +221,7 @@
220221

221222
<AspNetVersionPatchSeparator>$(AspNetSimpleVersion.LastIndexOf('.'))</AspNetVersionPatchSeparator>
222223
<AspNetSimpleVersion Condition=" '$(AspNetVersionPatchSeparator)' != -1 ">$(AspNetSimpleVersion.Substring(0, $(AspNetVersionPatchSeparator)))</AspNetSimpleVersion>
223-
224+
224225
<!-- dotnet-runtime package may not currently be available -->
225226
<InstallAspNetCoreSharedFxArgs>--ignore-depends=dotnet-runtime-$(AspNetSimpleVersion)</InstallAspNetCoreSharedFxArgs>
226227
</PropertyGroup>
@@ -315,7 +316,12 @@
315316
OverwriteReadOnlyFiles="True"
316317
SkipUnchangedFiles="False"
317318
UseHardlinksIfPossible="False" />
318-
319+
<Copy
320+
DestinationFiles="$(NewKeyDebInstallerFile)"
321+
SourceFiles="@(GeneratedDebFiles)"
322+
OverwriteReadOnlyFiles="True"
323+
SkipUnchangedFiles="False"
324+
UseHardlinksIfPossible="False"/>
319325
<!-- Proactively remove all possible Shared Framework and Debian Packages -->
320326
<ItemGroup>
321327
<SetupDebPackageToRemove Include="$(SdkDebianPackageName)" />
@@ -374,7 +380,7 @@
374380
<DotNetTest ProjectPath="$(EndToEndTestProject)"
375381
EnvironmentVariables="@(TestSdkDebTaskEnvironmentVariables)"
376382
ToolPath="$(DebianInstalledDirectory)" />-->
377-
383+
378384
<!-- Clean up Packages -->
379385
<!-- The following line is needed. So it won't warning dotnet folder is not empty after uninstall -->
380386
<Exec Command="sudo rm -rf /usr/share/dotnet/sdk/NuGetFallbackFolder" />

src/Installer/redist-installer/targets/GenerateRPMs.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,12 @@
200200
OverwriteReadOnlyFiles="True"
201201
SkipUnchangedFiles="False"
202202
UseHardlinksIfPossible="False" />
203+
204+
<Copy SourceFiles="@(GeneratedRpmFiles)"
205+
DestinationFiles="$(NewKeyRpmFile)"
206+
OverwriteReadOnlyFiles="True"
207+
SkipUnchangedFiles="False"
208+
UseHardlinksIfPossible="False"/>
203209
</Target>
204210

205211
<Target Name="SetupRpmProps"
@@ -214,6 +220,7 @@
214220
<RpmFile>$(SdkRPMInstallerFile)</RpmFile>
215221
<MarinerRpmFile>$(ArtifactsShippingPackagesDir)$(MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</MarinerRpmFile>
216222
<Mariner2RpmFile>$(ArtifactsShippingPackagesDir)$(Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</Mariner2RpmFile>
223+
<NewKeyRpmFile>$(ArtifactsShippingPackagesDir)$(NewKeyArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</NewKeyRpmFile>
217224
<!-- Need to acquire manpage files from CLI repo: https://github.com/dotnet/cli/issues/10266 -->
218225
<ManPagesDir>$(RepoRoot)/Documentation/manpages</ManPagesDir>
219226
<EndToEndTestProject>$(RepoRoot)/test/EndToEnd/EndToEnd.csproj</EndToEndTestProject>

src/Installer/redist-installer/targets/GetRuntimeInformation.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
<!-- Mariner RPM names -->
5555
<MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk Condition=" '$(IsRPMBasedDistro)' == 'True' ">$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(InstallerTargetArchitecture)</MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
5656
<Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk Condition=" '$(IsRPMBasedDistro)' == 'True' ">$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.2-$(InstallerTargetArchitecture)</Mariner2ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
57+
<!-- NewKey RPM and Deb names-->
58+
<NewKeyArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-newkey-$(InstallerTargetArchitecture)</NewKeyArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
5759
</PropertyGroup>
5860
</Target>
5961

0 commit comments

Comments
 (0)