|
50 | 50 | <HostFxrRpmPackageName>dotnet-hostfxr-$(HostFxrRpmPackageVersion)</HostFxrRpmPackageName> |
51 | 51 | <HostFxrRpmPackageName>$(HostFxrRpmPackageName.ToLower())</HostFxrRpmPackageName> |
52 | 52 | <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> |
53 | 58 | </PropertyGroup> |
54 | 59 |
|
55 | 60 | <PropertyGroup> |
|
74 | 79 | <SDKManpages Include="$(ManPagesDir)/**/*"/> |
75 | 80 | <SDKTemplatesFiles Include="$(TemplatesDir)/**/*"/> |
76 | 81 | <SDKScriptsFiles Include="$(ScriptsDir)/**/*"/> |
77 | | - <AspNetRuntimeFilesInput Include="$(AspNetRuntimePackageStorePublishDirectory)/**/*" /> |
78 | 82 | </ItemGroup> |
79 | 83 |
|
80 | 84 | <Copy SourceFiles="@(SDKFiles)" |
|
101 | 105 | SkipUnchangedFiles="False" |
102 | 106 | UseHardlinksIfPossible="False"/> |
103 | 107 |
|
104 | | - <Copy SourceFiles="@(AspNetRuntimeFilesInput)" |
105 | | - DestinationFiles="@(AspNetRuntimeFilesInput ->'$(RpmLayoutPackageRoot)/%(RecursiveDir)%(Filename)%(Extension)')" |
106 | | - OverwriteReadOnlyFiles="True" |
107 | | - SkipUnchangedFiles="False" |
108 | | - UseHardlinksIfPossible="False"/> |
109 | | - |
110 | 108 | <!-- Replace config json variables --> |
111 | 109 | <ItemGroup> |
112 | 110 | <SDKTokenValue Include="%SHARED_HOST_RPM_VERSION%"> |
113 | 111 | <ReplacementString>$(SharedFrameworkVersion)</ReplacementString> |
114 | 112 | </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> |
115 | 119 | <SDKTokenValue Include="%SHARED_HOST_RPM_NAME%"> |
116 | 120 | <ReplacementString>$(SharedFxRpmPackageName)</ReplacementString> |
117 | 121 | </SDKTokenValue> |
|
162 | 166 |
|
163 | 167 | </Target> |
164 | 168 |
|
| 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 | + |
165 | 179 | <Target Name="TestFPMTool"> |
166 | 180 |
|
167 | 181 | <!-- run FPM --> |
|
182 | 196 | </Target> |
183 | 197 |
|
184 | 198 | <Target Name="TestSdkRpm" |
185 | | - DependsOnTargets="RestoreTests" |
| 199 | + DependsOnTargets="RestoreTests;DownloadAspNetCoreRuntimeRpmInstaller" |
186 | 200 | Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' " |
187 | 201 | Inputs="$(DownloadedSharedHostInstallerFile); |
188 | 202 | $(DownloadedHostFxrInstallerFile); |
189 | 203 | $(DownloadedSharedFrameworkInstallerFile); |
| 204 | + $(DownloadedSharedAspNetCoreRuntime); |
190 | 205 | $(RpmTestResultsXmlFile);" |
191 | 206 | Outputs="$(RpmTestResultsXmlFile)" > |
192 | 207 |
|
193 | 208 | <!-- Install Dependencies and SDK Packages --> |
194 | 209 | <Exec Command="sudo yum -y install $(DownloadedSharedHostInstallerFile)" /> |
195 | 210 | <Exec Command="sudo yum -y install $(DownloadedHostFxrInstallerFile)" /> |
196 | 211 | <Exec Command="sudo yum -y install $(DownloadedSharedFrameworkInstallerFile)" /> |
| 212 | + <Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime)" /> |
197 | 213 |
|
198 | 214 | <Exec Command="sudo yum -y install $(SdkInstallerFile)" /> |
199 | 215 |
|
|
207 | 223 |
|
208 | 224 | <!-- Clean up Packages --> |
209 | 225 | <Exec Command="sudo yum remove -y $(SdkRpmPackageName)" /> |
| 226 | + |
| 227 | + <Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName)" /> |
210 | 228 | <Exec Command="sudo yum remove -y $(SharedFxRpmPackageName)" /> |
211 | 229 | <Exec Command="sudo yum remove -y $(HostFxrRpmPackageName)" /> |
212 | 230 | <Exec Command="sudo yum remove -y $(HostRpmPackageName)" /> |
|
0 commit comments