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

Enabling ASP.NET targeting pack and shared framework in RPM/DEB native installers. (#5090)

Browse source
This commit is contained in:
John Beisner 2019-10-03 14:37:59 -07:00 committed by GitHub
parent 262a91cb43
commit 1a7f735b3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/redist/targets/GenerateDebs.targets
View file

@ -235,10 +235,12 @@
<Exec Command="sudo dpkg -i $(DownloadedNetCoreAppHostPackInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedNetStandardTargetingPackInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedAspNetTargetingPackInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedRuntimeDepsInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
<Exec Command="sudo dpkg $(InstallAspNetCoreSharedFxArgs) -i $(DownloadedAspNetCoreSharedFxInstallerFile)" />
<!-- Create layout: Binaries -->
<Copy
@ -309,15 +311,15 @@
<!-- Proactively remove all possible Shared Framework and Debian Packages -->
<ItemGroup>
<SetupDebPackageToRemove Include="$(SdkDebianPackageName)" />
<!-- <SetupDebPackageToRemove Include="$(AspNetCoreSharedFxDebianPackageName)" />
<SetupDebPackageToRemove Include="$(AspNetCoreSharedFxDebianPackageFileName)" /> -->
<SetupDebPackageToRemove Include="$(AspNetCoreSharedFxDebianPackageName)" />
<SetupDebPackageToRemove Include="$(AspNetCoreSharedFxDebianPackageFileName)" />
<SetupDebPackageToRemove Include="$(SharedFxDebianPackageName)" />
<SetupDebPackageToRemove Include="$(SharedFxDebianPackageFileName)" />
<SetupDebPackageToRemove Include="$(HostFxrDebianPackageName)" />
<SetupDebPackageToRemove Include="$(HostFxrDebianPackageFileName)" />
<SetupDebPackageToRemove Include="$(SharedHostDebianPackageName)" />
<!-- <SetupDebPackageToRemove Include="$(AspNetTargetingPackDebianPackageName)" />
<SetupDebPackageToRemove Include="$(AspNetTargetingPackDebianPackageFileName)" /> -->
<SetupDebPackageToRemove Include="$(AspNetTargetingPackDebianPackageName)" />
<SetupDebPackageToRemove Include="$(AspNetTargetingPackDebianPackageFileName)" />
<SetupDebPackageToRemove Include="$(NetStandardTargetingPackDebianPackageName)" />
<SetupDebPackageToRemove Include="$(NetStandardTargetingPackDebianPackageFileName)" />
<SetupDebPackageToRemove Include="$(NetCoreAppTargetingPackDebianPackageName)" />
@ -351,9 +353,11 @@
<Exec Command="sudo dpkg -i $(DownloadedNetCoreAppHostPackInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedNetStandardTargetingPackInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedAspNetTargetingPackInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
<Exec Command="sudo dpkg $(InstallAspNetCoreSharedFxArgs) -i $(DownloadedAspNetCoreSharedFxInstallerFile)" />
<Exec Command="sudo dpkg -i $(SdkDebInstallerFile)" />
@ -370,9 +374,11 @@
<ItemGroup>
<TestSdkDebPackageToRemove Include="$(SdkDebianPackageName)" />
<TestSdkDebPackageToRemove Include="$(AspNetCoreSharedFxDebianPackageName)" />
<TestSdkDebPackageToRemove Include="$(SharedFxDebianPackageName)" />
<TestSdkDebPackageToRemove Include="$(HostFxrDebianPackageName)" />
<TestSdkDebPackageToRemove Include="$(SharedHostDebianPackageName)" />
<TestSdkDebPackageToRemove Include="$(AspNetTargetingPackDebianPackageName)" />
<TestSdkDebPackageToRemove Include="$(NetStandardTargetingPackDebianPackageName)" />
<TestSdkDebPackageToRemove Include="$(NetCoreAppTargetingPackDebianPackageName)" />
<TestSdkDebPackageToRemove Include="$(NetCoreAppHostPackDebianPackageName)" />

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

@ -286,10 +286,12 @@
<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="sudo rpm -iv --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" />
<Exec Command="sudo rpm -iv $(SdkRPMInstallerFile)" />
<!-- Run End-2-end Tests https://github.com/dotnet/core-sdk/issues/1174
@ -301,9 +303,11 @@
<!-- Clean up Packages -->
<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)" />

4
src/redist/targets/packaging/deb/dotnet-debian_config.json
View file

@ -32,6 +32,8 @@
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%,
"%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" },
"%NETCORE_APPHOST_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" },
"%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" }
"%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" },
"%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" },
"%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" }
}
}

8
src/redist/targets/packaging/rpm/dotnet-config.json
View file

@ -37,6 +37,14 @@
{
"package_name": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%",
"package_version": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%"
},
{
"package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%",
"package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%"
},
{
"package_name": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_NAME%",
"package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%"
}
],
"directories": [