mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Bring back sudo on the RPM commands now that we install sudo in the fpm image. (#16303)

Browse source
This commit is contained in:
Jeremy Koritzinsky 2023-05-03 00:43:12 -07:00 • committed by GitHub
parent 02d1ce7c95
commit 3c6b8ae11f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/redist/targets/GenerateRPMs.targets
View file

@ -330,18 +330,18 @@
Outputs="$(RpmTestResultsXmlFile)" >
<!-- Install Dependencies and SDK Packages -->
<Exec Command="rpm --import https://packages.microsoft.com/keys/microsoft.asc" />
<Exec Command="rpm -iv $(DownloadedRuntimeDepsInstallerFile)" />
<Exec Command="rpm -iv $(DownloadedNetCoreAppHostPackInstallerFile)" />
<Exec Command="rpm -iv $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
<Exec Command="rpm -iv $(DownloadedNetStandardTargetingPackInstallerFile)" />
<Exec Command="rpm -iv $(DownloadedAspNetTargetingPackInstallerFile)" />
<Exec Command="rpm -iv $(DownloadedSharedHostInstallerFile)" />
<Exec Command="rpm -iv $(DownloadedHostFxrInstallerFile)" />
<Exec Command="rpm -iv $(DownloadedSharedFrameworkInstallerFile)" />
<Exec Command="sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc" />
<Exec Command="sudo rpm -iv $(DownloadedRuntimeDepsInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedNetCoreAppHostPackInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedNetStandardTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedAspNetTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedSharedHostInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedHostFxrInstallerFile)" />
<Exec Command="sudo rpm -iv $(DownloadedSharedFrameworkInstallerFile)" />
<!-- Ignore dependencies, which may have an incoherent dependency on dotnet-runtime -->
<Exec Command="rpm -iv --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" />
<Exec Command="rpm -iv $(SdkRPMInstallerFile)" />
<Exec Command="sudo rpm -iv --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" />
<Exec Command="sudo rpm -iv $(SdkRPMInstallerFile)" />
<!-- Run End-2-end Tests https://github.com/dotnet/core-sdk/issues/1174
<DotNetRestore ProjectPath="$(EndToEndTestProject)"
@ -351,15 +351,15 @@
ToolPath="$(RpmInstalledDirectory)" />-->
<!-- Clean up Packages -->
<Exec Command="rpm -ev --nodeps $(SdkRpmPackageName)" />
<Exec Command="rpm -ev --nodeps $(AspNetCoreSharedFxRpmPackageName)" />
<Exec Command="rpm -ev --nodeps $(SharedFxRpmPackageName)" />
<Exec Command="rpm -ev --nodeps $(HostFxrRpmPackageName)" />
<Exec Command="rpm -ev --nodeps $(SharedHostRpmPackageName)" />
<Exec Command="rpm -ev --nodeps $(AspNetTargetingPackRpmPackageName)" />
<Exec Command="rpm -ev --nodeps $(NetStandardTargetingPackRpmPackageName)" />
<Exec Command="rpm -ev --nodeps $(NetCoreAppTargetingPackRpmPackageName)" />
<Exec Command="rpm -ev --nodeps $(NetCoreAppHostPackRpmPackageName)" />
<Exec Command="rpm -ev --nodeps $(RuntimeDepsPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(SdkRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(AspNetCoreSharedFxRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(SharedFxRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(HostFxrRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(SharedHostRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(AspNetTargetingPackRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(NetStandardTargetingPackRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(NetCoreAppTargetingPackRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(NetCoreAppHostPackRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(RuntimeDepsPackageName)" />
</Target>
</Project>