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

Merge pull request #9695 from johnbeisner/FixRPMInstallErrors

Browse source 
Fix RPM install errors; CLI:release/2.2.1xx
This commit is contained in:
Nick Guerrera 2018-07-18 21:56:36 -07:00 committed by GitHub
commit c45905a1c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/package/Installer.DEB.proj
View file

@ -94,6 +94,7 @@
UseHardlinksIfPossible="False" /> UseHardlinksIfPossible="False" />
<!-- Remove Shared Framework and Debian Packages --> <!-- Remove Shared Framework and Debian Packages -->
<!-- Remove the "ContinueOnError="WarnAndContinue"" when the following issue is resolved: https://github.com/dotnet/cli/issues/9672 -->
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SdkDebianPackageName)" /> <Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SdkDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" /> <Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SharedFxDebianPackageName)" /> <Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
@ -129,6 +130,7 @@
ToolPath="$(DebianInstalledDirectory)" /> ToolPath="$(DebianInstalledDirectory)" />
<!-- Clean up Packages --> <!-- Clean up Packages -->
<!-- Remove the "ContinueOnError="WarnAndContinue"" when the following issue is resolved: https://github.com/dotnet/cli/issues/9672 -->
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SdkDebianPackageName)" /> <Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SdkDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" /> <Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SharedFxDebianPackageName)" /> <Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SharedFxDebianPackageName)" />

26
build/package/Installer.RPM.targets
View file

@ -172,7 +172,11 @@
<SdkRpmPackageName>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkRpmPackageVersion)</SdkRpmPackageName> <SdkRpmPackageName>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkRpmPackageVersion)</SdkRpmPackageName>
<SharedFxRpmPackageVersion>$(MicrosoftNETCoreAppMajorMinorVersion)</SharedFxRpmPackageVersion> <SharedFxRpmPackageVersion>$(MicrosoftNETCoreAppMajorMinorVersion)</SharedFxRpmPackageVersion>
<SharedFxRpmPackageFileVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedFxRpmPackageFileVersion> <SharedFxRpmPackageFileVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedFxRpmPackageFileVersion>
<SharedFxRpmPackageName>dotnet-runtime-$(SharedFxRpmPackageVersion)</SharedFxRpmPackageName>
<!-- Replace the line below with this line when the following issue is resolved: https://github.com/dotnet/cli/issues/9672
<SharedFxRpmPackageName>dotnet-runtime-$(SharedFxRpmPackageVersion)</SharedFxRpmPackageName> -->
<SharedFxRpmPackageName>dotnet-runtime-$(SharedFxRpmPackageFileVersion)</SharedFxRpmPackageName>
<SharedFxRpmPackageName>$(SharedFxRpmPackageName.ToLower())</SharedFxRpmPackageName> <SharedFxRpmPackageName>$(SharedFxRpmPackageName.ToLower())</SharedFxRpmPackageName>
<SharedFxRpmPackageFileName>dotnet-runtime-$(SharedFxRpmPackageFileVersion)</SharedFxRpmPackageFileName> <SharedFxRpmPackageFileName>dotnet-runtime-$(SharedFxRpmPackageFileVersion)</SharedFxRpmPackageFileName>
<SharedFxRpmPackageFileName>$(SharedFxRpmPackageFileName.ToLower())</SharedFxRpmPackageFileName> <SharedFxRpmPackageFileName>$(SharedFxRpmPackageFileName.ToLower())</SharedFxRpmPackageFileName>
@ -180,7 +184,11 @@
<HostFxrRpmPackageName>dotnet-hostfxr-$(HostFxrRpmPackageVersion)</HostFxrRpmPackageName> <HostFxrRpmPackageName>dotnet-hostfxr-$(HostFxrRpmPackageVersion)</HostFxrRpmPackageName>
<HostFxrRpmPackageName>$(HostFxrRpmPackageName.ToLower())</HostFxrRpmPackageName> <HostFxrRpmPackageName>$(HostFxrRpmPackageName.ToLower())</HostFxrRpmPackageName>
<HostRpmPackageName>dotnet-host</HostRpmPackageName> <HostRpmPackageName>dotnet-host</HostRpmPackageName>
<AspNetCoreSharedFxRpmPackageName>aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)</AspNetCoreSharedFxRpmPackageName>
<!-- Replace the line below with this line when the following issue is resolved: https://github.com/dotnet/cli/issues/9672
<AspNetCoreSharedFxRpmPackageName>aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)</AspNetCoreSharedFxRpmPackageName> -->
<AspNetCoreSharedFxRpmPackageName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxRpmPackageName>
<AspNetCoreSharedFxRpmPackageName>$(AspNetCoreSharedFxRpmPackageName.ToLower())</AspNetCoreSharedFxRpmPackageName> <AspNetCoreSharedFxRpmPackageName>$(AspNetCoreSharedFxRpmPackageName.ToLower())</AspNetCoreSharedFxRpmPackageName>
<AspNetCoreSharedFxRpmPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxRpmPackageFileName> <AspNetCoreSharedFxRpmPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxRpmPackageFileName>
<AspNetCoreSharedFxRpmPackageFileName>$(AspNetCoreSharedFxRpmPackageFileName.ToLower())</AspNetCoreSharedFxRpmPackageFileName> <AspNetCoreSharedFxRpmPackageFileName>$(AspNetCoreSharedFxRpmPackageFileName.ToLower())</AspNetCoreSharedFxRpmPackageFileName>
@ -241,12 +249,12 @@
ToolPath="$(RpmInstalledDirectory)" /> ToolPath="$(RpmInstalledDirectory)" />
<!-- Clean up Packages --> <!-- Clean up Packages -->
<Exec Command="sudo yum remove -y $(SdkRpmPackageName)" /> <!-- Remove the "ContinueOnError="WarnAndContinue"" when the following issue is resolved: https://github.com/dotnet/cli/issues/9672 -->
<Exec ContinueOnError="WarnAndContinue" Command="sudo yum remove -y $(SdkRpmPackageName)" />
<Exec Command="sudo yum remove -y $(AspNetCoreSharedFxRpmPackageFileName)" /> <Exec ContinueOnError="WarnAndContinue" Command="sudo yum remove -y $(AspNetCoreSharedFxRpmPackageFileName)" />
<Exec Command="sudo yum remove -y $(SharedFxRpmPackageFileName)" /> <Exec ContinueOnError="WarnAndContinue" Command="sudo yum remove -y $(SharedFxRpmPackageFileName)" />
<Exec Command="sudo yum remove -y $(HostFxrRpmPackageName)" /> <Exec ContinueOnError="WarnAndContinue" Command="sudo yum remove -y $(HostFxrRpmPackageName)" />
<Exec Command="sudo yum remove -y $(HostRpmPackageName)" /> <Exec ContinueOnError="WarnAndContinue" Command="sudo yum remove -y $(HostRpmPackageName)" />
<Exec Command="sudo yum remove -y $(RuntimeDepsPackageFileName)" /> <Exec ContinueOnError="WarnAndContinue" Command="sudo yum remove -y $(RuntimeDepsPackageFileName)" />
</Target> </Target>
</Project> </Project>