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.
This commit is contained in:
parent
b9c5e2ec57
commit
21aa774707
3 changed files with 33 additions and 11 deletions
|
@ -50,6 +50,11 @@
|
|||
<HostFxrRpmPackageName>dotnet-hostfxr-$(HostFxrRpmPackageVersion)</HostFxrRpmPackageName>
|
||||
<HostFxrRpmPackageName>$(HostFxrRpmPackageName.ToLower())</HostFxrRpmPackageName>
|
||||
<HostRpmPackageName>dotnet-host</HostRpmPackageName>
|
||||
<HostRidInAspNetCoreRuntimeRpmInstallerFileName>$(HostRid)</HostRidInAspNetCoreRuntimeRpmInstallerFileName>
|
||||
<HostRidInAspNetCoreRuntimeRpmInstallerFileName Condition=" '$(HostRid)' == 'rhel.7-x64' ">rhel-x64</HostRidInAspNetCoreRuntimeRpmInstallerFileName>
|
||||
<AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp)</AspNetCoreRuntimePackageName>
|
||||
<AspNetCoreRuntimePackageVersion>$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreCoherenceTimestamp)</AspNetCoreRuntimePackageVersion>
|
||||
<AspNetCoreRuntimeRpmInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
@ -74,7 +79,6 @@
|
|||
<SDKManpages Include="$(ManPagesDir)/**/*"/>
|
||||
<SDKTemplatesFiles Include="$(TemplatesDir)/**/*"/>
|
||||
<SDKScriptsFiles Include="$(ScriptsDir)/**/*"/>
|
||||
<AspNetRuntimeFilesInput Include="$(AspNetRuntimePackageStorePublishDirectory)/**/*" />
|
||||
</ItemGroup>
|
||||
|
||||
<Copy SourceFiles="@(SDKFiles)"
|
||||
|
@ -101,17 +105,17 @@
|
|||
SkipUnchangedFiles="False"
|
||||
UseHardlinksIfPossible="False"/>
|
||||
|
||||
<Copy SourceFiles="@(AspNetRuntimeFilesInput)"
|
||||
DestinationFiles="@(AspNetRuntimeFilesInput ->'$(RpmLayoutPackageRoot)/%(RecursiveDir)%(Filename)%(Extension)')"
|
||||
OverwriteReadOnlyFiles="True"
|
||||
SkipUnchangedFiles="False"
|
||||
UseHardlinksIfPossible="False"/>
|
||||
|
||||
<!-- Replace config json variables -->
|
||||
<ItemGroup>
|
||||
<SDKTokenValue Include="%SHARED_HOST_RPM_VERSION%">
|
||||
<ReplacementString>$(SharedFrameworkVersion)</ReplacementString>
|
||||
</SDKTokenValue>
|
||||
<SDKTokenValue Include="%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_NAME%">
|
||||
<ReplacementString>$(AspNetCoreRuntimePackageName)</ReplacementString>
|
||||
</SDKTokenValue>
|
||||
<SDKTokenValue Include="%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_VERSION%">
|
||||
<ReplacementString>$(AspNetCoreRuntimePackageVersion)</ReplacementString>
|
||||
</SDKTokenValue>
|
||||
<SDKTokenValue Include="%SHARED_HOST_RPM_NAME%">
|
||||
<ReplacementString>$(SharedFxRpmPackageName)</ReplacementString>
|
||||
</SDKTokenValue>
|
||||
|
@ -162,6 +166,16 @@
|
|||
|
||||
</Target>
|
||||
|
||||
<Target Name="DownloadAspNetCoreRuntimeRpmInstaller"
|
||||
DependsOnTargets="SetupDebProps">
|
||||
<PropertyGroup>
|
||||
<DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
|
||||
</PropertyGroup>
|
||||
<DownloadFile
|
||||
Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName)"
|
||||
DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>
|
||||
</Target>
|
||||
|
||||
<Target Name="TestFPMTool">
|
||||
|
||||
<!-- run FPM -->
|
||||
|
@ -182,11 +196,12 @@
|
|||
</Target>
|
||||
|
||||
<Target Name="TestSdkRpm"
|
||||
DependsOnTargets="RestoreTests"
|
||||
DependsOnTargets="RestoreTests;DownloadAspNetCoreRuntimeRpmInstaller"
|
||||
Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
|
||||
Inputs="$(DownloadedSharedHostInstallerFile);
|
||||
$(DownloadedHostFxrInstallerFile);
|
||||
$(DownloadedSharedFrameworkInstallerFile);
|
||||
$(DownloadedSharedAspNetCoreRuntime);
|
||||
$(RpmTestResultsXmlFile);"
|
||||
Outputs="$(RpmTestResultsXmlFile)" >
|
||||
|
||||
|
@ -194,6 +209,7 @@
|
|||
<Exec Command="sudo yum -y install $(DownloadedSharedHostInstallerFile)" />
|
||||
<Exec Command="sudo yum -y install $(DownloadedHostFxrInstallerFile)" />
|
||||
<Exec Command="sudo yum -y install $(DownloadedSharedFrameworkInstallerFile)" />
|
||||
<Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime)" />
|
||||
|
||||
<Exec Command="sudo yum -y install $(SdkInstallerFile)" />
|
||||
|
||||
|
@ -207,6 +223,8 @@
|
|||
|
||||
<!-- Clean up Packages -->
|
||||
<Exec Command="sudo yum remove -y $(SdkRpmPackageName)" />
|
||||
|
||||
<Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName)" />
|
||||
<Exec Command="sudo yum remove -y $(SharedFxRpmPackageName)" />
|
||||
<Exec Command="sudo yum remove -y $(HostFxrRpmPackageName)" />
|
||||
<Exec Command="sudo yum remove -y $(HostRpmPackageName)" />
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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(){
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue