Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 21aa774

Browse files
author
William Li
committed
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.
1 parent b9c5e2e commit 21aa774

File tree

3 files changed

+33
-11
lines changed

3 files changed

+33
-11
lines changed

build/package/Installer.RPM.targets

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@
5050
<HostFxrRpmPackageName>dotnet-hostfxr-$(HostFxrRpmPackageVersion)</HostFxrRpmPackageName>
5151
<HostFxrRpmPackageName>$(HostFxrRpmPackageName.ToLower())</HostFxrRpmPackageName>
5252
<HostRpmPackageName>dotnet-host</HostRpmPackageName>
53+
<HostRidInAspNetCoreRuntimeRpmInstallerFileName>$(HostRid)</HostRidInAspNetCoreRuntimeRpmInstallerFileName>
54+
<HostRidInAspNetCoreRuntimeRpmInstallerFileName Condition=" '$(HostRid)' == 'rhel.7-x64' ">rhel-x64</HostRidInAspNetCoreRuntimeRpmInstallerFileName>
55+
<AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp)</AspNetCoreRuntimePackageName>
56+
<AspNetCoreRuntimePackageVersion>$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreCoherenceTimestamp)</AspNetCoreRuntimePackageVersion>
57+
<AspNetCoreRuntimeRpmInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName>
5358
</PropertyGroup>
5459

5560
<PropertyGroup>
@@ -74,7 +79,6 @@
7479
<SDKManpages Include="$(ManPagesDir)/**/*"/>
7580
<SDKTemplatesFiles Include="$(TemplatesDir)/**/*"/>
7681
<SDKScriptsFiles Include="$(ScriptsDir)/**/*"/>
77-
<AspNetRuntimeFilesInput Include="$(AspNetRuntimePackageStorePublishDirectory)/**/*" />
7882
</ItemGroup>
7983

8084
<Copy SourceFiles="@(SDKFiles)"
@@ -101,17 +105,17 @@
101105
SkipUnchangedFiles="False"
102106
UseHardlinksIfPossible="False"/>
103107

104-
<Copy SourceFiles="@(AspNetRuntimeFilesInput)"
105-
DestinationFiles="@(AspNetRuntimeFilesInput ->'$(RpmLayoutPackageRoot)/%(RecursiveDir)%(Filename)%(Extension)')"
106-
OverwriteReadOnlyFiles="True"
107-
SkipUnchangedFiles="False"
108-
UseHardlinksIfPossible="False"/>
109-
110108
<!-- Replace config json variables -->
111109
<ItemGroup>
112110
<SDKTokenValue Include="%SHARED_HOST_RPM_VERSION%">
113111
<ReplacementString>$(SharedFrameworkVersion)</ReplacementString>
114112
</SDKTokenValue>
113+
<SDKTokenValue Include="%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_NAME%">
114+
<ReplacementString>$(AspNetCoreRuntimePackageName)</ReplacementString>
115+
</SDKTokenValue>
116+
<SDKTokenValue Include="%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_VERSION%">
117+
<ReplacementString>$(AspNetCoreRuntimePackageVersion)</ReplacementString>
118+
</SDKTokenValue>
115119
<SDKTokenValue Include="%SHARED_HOST_RPM_NAME%">
116120
<ReplacementString>$(SharedFxRpmPackageName)</ReplacementString>
117121
</SDKTokenValue>
@@ -162,6 +166,16 @@
162166

163167
</Target>
164168

169+
<Target Name="DownloadAspNetCoreRuntimeRpmInstaller"
170+
DependsOnTargets="SetupDebProps">
171+
<PropertyGroup>
172+
<DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
173+
</PropertyGroup>
174+
<DownloadFile
175+
Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName)"
176+
DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>
177+
</Target>
178+
165179
<Target Name="TestFPMTool">
166180

167181
<!-- run FPM -->
@@ -182,18 +196,20 @@
182196
</Target>
183197

184198
<Target Name="TestSdkRpm"
185-
DependsOnTargets="RestoreTests"
199+
DependsOnTargets="RestoreTests;DownloadAspNetCoreRuntimeRpmInstaller"
186200
Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
187201
Inputs="$(DownloadedSharedHostInstallerFile);
188202
$(DownloadedHostFxrInstallerFile);
189203
$(DownloadedSharedFrameworkInstallerFile);
204+
$(DownloadedSharedAspNetCoreRuntime);
190205
$(RpmTestResultsXmlFile);"
191206
Outputs="$(RpmTestResultsXmlFile)" >
192207

193208
<!-- Install Dependencies and SDK Packages -->
194209
<Exec Command="sudo yum -y install $(DownloadedSharedHostInstallerFile)" />
195210
<Exec Command="sudo yum -y install $(DownloadedHostFxrInstallerFile)" />
196211
<Exec Command="sudo yum -y install $(DownloadedSharedFrameworkInstallerFile)" />
212+
<Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime)" />
197213

198214
<Exec Command="sudo yum -y install $(SdkInstallerFile)" />
199215

@@ -207,6 +223,8 @@
207223

208224
<!-- Clean up Packages -->
209225
<Exec Command="sudo yum remove -y $(SdkRpmPackageName)" />
226+
227+
<Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName)" />
210228
<Exec Command="sudo yum remove -y $(SharedFxRpmPackageName)" />
211229
<Exec Command="sudo yum remove -y $(HostFxrRpmPackageName)" />
212230
<Exec Command="sudo yum remove -y $(HostRpmPackageName)" />

packaging/rpm/dotnet-config.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,16 @@
2525
{
2626
"package_name": "%SHARED_HOST_RPM_NAME%",
2727
"package_version": "%SHARED_HOST_RPM_VERSION%"
28+
},
29+
{
30+
"package_name": "%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_NAME%",
31+
"package_version": "%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_VERSION%"
2832
}
2933
],
3034
"directories": [
3135
"/usr/share/dotnet/sdk",
32-
"/usr/share/dotnet/store",
33-
"/usr/share/dotnet/additionalDeps",
3436
"/usr/share/doc/%SDK_RPM_PACKAGE_NAME%"
3537
],
3638
"after_install_source": "scripts/after_install_host.sh",
3739
"after_remove_source": "scripts/after_remove_host.sh"
38-
}
40+
}

scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ if [ $current_userid -ne 0 ]; then
1313
fi
1414

1515
host_package_name="dotnet-host"
16+
aspnetcore_package_store_package_name="aspnetcore-store*"
1617

1718
remove_all(){
1819
yum remove -y $host_package_name
20+
yum remove -y $aspnetcore_package_store_package_name
1921
}
2022

2123
is_dotnet_host_installed(){

0 commit comments

Comments
 (0)