Skip to content

Commit

Permalink
[release/9.0.1xx-preview6] Upgrade rather than install, in case .NET …
Browse files Browse the repository at this point in the history
…is on container/machine alr… (#41857)

Co-authored-by: Matt Mitchell (.NET) <[email protected]>
  • Loading branch information
github-actions[bot] and mmitche authored Jun 28, 2024
1 parent b839cda commit ef4c241
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/Installer/redist-installer/targets/GenerateRPMs.targets
Original file line number Diff line number Diff line change
Expand Up @@ -327,17 +327,17 @@

<!-- Install Dependencies and SDK Packages -->
<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)" />
<Exec Command="sudo rpm -Uv $(DownloadedRuntimeDepsInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedNetCoreAppHostPackInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedNetStandardTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedAspNetTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedSharedHostInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedHostFxrInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedSharedFrameworkInstallerFile)" />
<!-- Ignore dependencies, which may have an incoherent dependency on dotnet-runtime -->
<Exec Command="sudo rpm -iv --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" />
<Exec Command="sudo rpm -iv $(SdkRPMInstallerFile)" />
<Exec Command="sudo rpm -Uv --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" />
<Exec Command="sudo rpm -Uv $(SdkRPMInstallerFile)" />

<!-- Run End-2-end Tests https://github.com/dotnet/core-sdk/issues/1174
<DotNetRestore ProjectPath="$(EndToEndTestProject)"
Expand Down

0 comments on commit ef4c241

Please sign in to comment.