From 21aa774707bef5c5d6165b2d7bcdbf813678d341 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 13 Jul 2017 12:08:35 -0700 Subject: [PATCH] dotnet-sdk rpm package consume store by dependency Instead of Packing along. Edit RPM config, add download store rpm package as part of the test. --- build/package/Installer.RPM.targets | 34 ++++++++++++++----- packaging/rpm/dotnet-config.json | 8 +++-- .../dotnet-uninstall-rpm-packages.sh | 2 ++ 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index e64e73ce4..58eaca201 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -50,6 +50,11 @@ dotnet-hostfxr-$(HostFxrRpmPackageVersion) $(HostFxrRpmPackageName.ToLower()) dotnet-host + $(HostRid) + rhel-x64 + $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp) + $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreCoherenceTimestamp) + $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm @@ -74,7 +79,6 @@ - - - $(SharedFrameworkVersion) + + $(AspNetCoreRuntimePackageName) + + + $(AspNetCoreRuntimePackageVersion) + $(SharedFxRpmPackageName) @@ -162,6 +166,16 @@ + + + $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) + + + + @@ -182,11 +196,12 @@ @@ -194,6 +209,7 @@ + @@ -207,6 +223,8 @@ + + diff --git a/packaging/rpm/dotnet-config.json b/packaging/rpm/dotnet-config.json index 6ed9d53ad..38f533bcb 100644 --- a/packaging/rpm/dotnet-config.json +++ b/packaging/rpm/dotnet-config.json @@ -25,14 +25,16 @@ { "package_name": "%SHARED_HOST_RPM_NAME%", "package_version": "%SHARED_HOST_RPM_VERSION%" + }, + { + "package_name": "%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_NAME%", + "package_version": "%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_VERSION%" } ], "directories": [ "/usr/share/dotnet/sdk", - "/usr/share/dotnet/store", - "/usr/share/dotnet/additionalDeps", "/usr/share/doc/%SDK_RPM_PACKAGE_NAME%" ], "after_install_source": "scripts/after_install_host.sh", "after_remove_source": "scripts/after_remove_host.sh" -} \ No newline at end of file +} diff --git a/scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh b/scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh index d3572ec38..ef7be91af 100755 --- a/scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh +++ b/scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh @@ -13,9 +13,11 @@ if [ $current_userid -ne 0 ]; then fi host_package_name="dotnet-host" +aspnetcore_package_store_package_name="aspnetcore-store*" remove_all(){ yum remove -y $host_package_name + yum remove -y $aspnetcore_package_store_package_name } is_dotnet_host_installed(){