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

Use the full version as the DEB package names for the runtime and ASP.NET runtime.

Browse source
This commit is contained in:
jbeisner 2018-07-16 22:52:41 +00:00
parent 782c4401d4
commit d8735024f9
2 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,12 +94,12 @@
UseHardlinksIfPossible="False" /> UseHardlinksIfPossible="False" />
<!-- Remove Shared Framework and Debian Packages --> <!-- Remove Shared Framework and Debian Packages -->
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SdkDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" /> <Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SharedFxDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(HostFxrDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(HostDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(RuntimeDepsPackageName)" /> <Exec Command="sudo dpkg -r $(RuntimeDepsPackageName)" />
</Target> </Target>
<Target Name="TestSdkDeb" <Target Name="TestSdkDeb"
@ -129,12 +129,12 @@
ToolPath="$(DebianInstalledDirectory)" /> ToolPath="$(DebianInstalledDirectory)" />
<!-- Clean up Packages --> <!-- Clean up Packages -->
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SdkDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" /> <Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(SharedFxDebianPackageName)" /> <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(HostFxrDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(HostDebianPackageName)" /> <Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
<Exec ContinueOnError="WarnAndContinue" Command="sudo dpkg -r $(RuntimeDepsPackageName)" /> <Exec Command="sudo dpkg -r $(RuntimeDepsPackageName)" />
</Target> </Target>
<Target Name="PrepareDotnetDebDirectories"> <Target Name="PrepareDotnetDebDirectories">

12
build/package/Installer.DEB.targets
View file

@ -30,7 +30,11 @@
<SharedFxDebianPackageVersion>$(MicrosoftNETCoreAppMajorMinorVersion)</SharedFxDebianPackageVersion> <SharedFxDebianPackageVersion>$(MicrosoftNETCoreAppMajorMinorVersion)</SharedFxDebianPackageVersion>
<SharedFxDebianPackageFileName>dotnet-runtime-$(SharedFxDebianPackageFileVersion)</SharedFxDebianPackageFileName> <SharedFxDebianPackageFileName>dotnet-runtime-$(SharedFxDebianPackageFileVersion)</SharedFxDebianPackageFileName>
<SharedFxDebianPackageFileName>$(SharedFxDebianPackageFileName.ToLower())</SharedFxDebianPackageFileName> <SharedFxDebianPackageFileName>$(SharedFxDebianPackageFileName.ToLower())</SharedFxDebianPackageFileName>
<SharedFxDebianPackageName>dotnet-runtime-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName>
<!--Replace the line below with this line when the following issue is resolved: https://github.com/dotnet/cli/issues/9672
<SharedFxDebianPackageName>dotnet-runtime-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName>-->
<SharedFxDebianPackageName>dotnet-runtime-$(SharedFxDebianPackageFileVersion)</SharedFxDebianPackageName>
<SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName> <SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName>
<HostFxrDebianPackageVersion>$(HostFxrMajorMinorVersion)</HostFxrDebianPackageVersion> <HostFxrDebianPackageVersion>$(HostFxrMajorMinorVersion)</HostFxrDebianPackageVersion>
<HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName> <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
@ -38,7 +42,11 @@
<HostDebianPackageName>dotnet-host</HostDebianPackageName> <HostDebianPackageName>dotnet-host</HostDebianPackageName>
<AspNetCoreSharedFxDebianPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxDebianPackageFileName> <AspNetCoreSharedFxDebianPackageFileName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxDebianPackageFileName>
<AspNetCoreSharedFxDebianPackageFileName>$(AspNetCoreSharedFxDebianPackageFileName.ToLower())</AspNetCoreSharedFxDebianPackageFileName> <AspNetCoreSharedFxDebianPackageFileName>$(AspNetCoreSharedFxDebianPackageFileName.ToLower())</AspNetCoreSharedFxDebianPackageFileName>
<AspNetCoreSharedFxDebianPackageName>aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)</AspNetCoreSharedFxDebianPackageName>
<!--Replace the line below with this line when the following issue is resolved: https://github.com/dotnet/cli/issues/9672
<AspNetCoreSharedFxDebianPackageName>aspnetcore-runtime-$(AspNetCoreMajorMinorVersion)</AspNetCoreSharedFxDebianPackageName>-->
<AspNetCoreSharedFxDebianPackageName>aspnetcore-runtime-$(AspNetCoreVersion)</AspNetCoreSharedFxDebianPackageName>
<AspNetCoreSharedFxDebianPackageName>$(AspNetCoreSharedFxDebianPackageName.ToLower())</AspNetCoreSharedFxDebianPackageName> <AspNetCoreSharedFxDebianPackageName>$(AspNetCoreSharedFxDebianPackageName.ToLower())</AspNetCoreSharedFxDebianPackageName>
</PropertyGroup> </PropertyGroup>