|
12 | 12 | GenerateRpmsInner" />
|
13 | 13 |
|
14 | 14 | <Target Name="GenerateRpmsInner"
|
15 |
| - DependsOnTargets="TestFPMTool;BuildRpms;TestSdkRpm" |
| 15 | + DependsOnTargets="TestFPMTool;BuildRpms" |
16 | 16 | Condition=" '$(IsRPMBasedDistro)' == 'True' "
|
17 | 17 | Outputs="@(GeneratedInstallers)" />
|
18 | 18 |
|
|
150 | 150 | </SDKTokenValue>
|
151 | 151 | </ItemGroup>
|
152 | 152 |
|
153 |
| - <ItemGroup> |
154 |
| - <TestSdkRpmTaskEnvironmentVariables Include="PATH=$(RpmInstalledDirectory)$(PathListSeparator)$(PATH)" /> |
155 |
| - <TestSdkRpmTaskEnvironmentVariables Include="TEST_ARTIFACTS=$(TestArtifactsDir)" /> |
156 |
| - <TestSdkRpmTaskEnvironmentVariables Include="TEST_PACKAGES=$(TestPackagesDir)" /> |
157 |
| - <TestSdkRpmTaskEnvironmentVariables Include="PreviousStageProps=$(NextStagePropsPath)" /> |
158 |
| - |
159 |
| - <!-- Consumed By Publish --> |
160 |
| - <!--<GeneratedInstallers Include="$(SdkRPMInstallerFile)" />--> |
161 |
| - </ItemGroup> |
162 |
| - |
163 | 153 | <ReplaceFileContents InputFiles="$(AfterInstallHostScriptTemplateFile)"
|
164 | 154 | DestinationFiles="$(AfterInstallHostScriptDestinationFile)"
|
165 | 155 | ReplacementItems="@(AfterInstallHostTokenValue)" />
|
|
310 | 300 | Importance="High" />
|
311 | 301 | </Target>
|
312 | 302 |
|
313 |
| - <Target Name="TestSdkRpm" |
314 |
| - Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' " |
315 |
| - Inputs="$(DownloadedNetCoreAppTargetingPackInstallerFile); |
316 |
| - $(DownloadedNetStandardTargetingPackInstallerFile); |
317 |
| - $(DownloadedNetCoreAppHostPackInstallerFile); |
318 |
| - $(DownloadedAspNetTargetingPackInstallerFile); |
319 |
| - $(DownloadedRuntimeDepsInstallerFile); |
320 |
| - $(DownloadedSharedHostInstallerFile); |
321 |
| - $(DownloadedHostFxrInstallerFile); |
322 |
| - $(DownloadedSharedFrameworkInstallerFile); |
323 |
| - $(DownloadedAspNetCoreSharedFxInstallerFile); |
324 |
| - $(SdkRPMInstallerFile); |
325 |
| - $(RpmTestResultsXmlFile);" |
326 |
| - Outputs="$(RpmTestResultsXmlFile)"> |
327 |
| - |
328 |
| - <!-- Install Dependencies and SDK Packages --> |
329 |
| - <Exec Command="sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc" /> |
330 |
| - <Exec Command="sudo rpm -Uv $(DownloadedRuntimeDepsInstallerFile)" /> |
331 |
| - <Exec Command="sudo rpm -Uv $(DownloadedNetCoreAppHostPackInstallerFile)" /> |
332 |
| - <Exec Command="sudo rpm -Uv $(DownloadedNetCoreAppTargetingPackInstallerFile)" /> |
333 |
| - <Exec Command="sudo rpm -Uv $(DownloadedNetStandardTargetingPackInstallerFile)" /> |
334 |
| - <Exec Command="sudo rpm -Uv $(DownloadedAspNetTargetingPackInstallerFile)" /> |
335 |
| - <Exec Command="sudo rpm -Uv $(DownloadedSharedHostInstallerFile)" /> |
336 |
| - <Exec Command="sudo rpm -Uv $(DownloadedHostFxrInstallerFile)" /> |
337 |
| - <Exec Command="sudo rpm -Uv $(DownloadedSharedFrameworkInstallerFile)" /> |
338 |
| - <!-- Ignore dependencies, which may have an incoherent dependency on dotnet-runtime --> |
339 |
| - <Exec Command="sudo rpm -Uv --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" /> |
340 |
| - <Exec Command="sudo rpm -Uv $(SdkRPMInstallerFile)" /> |
341 |
| - |
342 |
| - <!-- Run End-2-end Tests https://github.com/dotnet/core-sdk/issues/1174 |
343 |
| - <DotNetRestore ProjectPath="$(EndToEndTestProject)" |
344 |
| - ToolPath="$(RpmInstalledDirectory)" /> |
345 |
| - <DotNetTest ProjectPath="$(EndToEndTestProject)" |
346 |
| - EnvironmentVariables="@(TestSdkRpmTaskEnvironmentVariables)" |
347 |
| - ToolPath="$(RpmInstalledDirectory)" />--> |
348 |
| - |
349 |
| - <!-- Clean up Packages --> |
350 |
| - <Exec Command="sudo rpm -ev --nodeps $(SdkRpmPackageName)" /> |
351 |
| - <Exec Command="sudo rpm -ev --nodeps $(AspNetCoreSharedFxRpmPackageName)" /> |
352 |
| - <Exec Command="sudo rpm -ev --nodeps $(SharedFxRpmPackageName)" /> |
353 |
| - <Exec Command="sudo rpm -ev --nodeps $(HostFxrRpmPackageName)" /> |
354 |
| - <Exec Command="sudo rpm -ev --nodeps $(SharedHostRpmPackageName)" /> |
355 |
| - <Exec Command="sudo rpm -ev --nodeps $(AspNetTargetingPackRpmPackageName)" /> |
356 |
| - <Exec Command="sudo rpm -ev --nodeps $(NetStandardTargetingPackRpmPackageName)" /> |
357 |
| - <Exec Command="sudo rpm -ev --nodeps $(NetCoreAppTargetingPackRpmPackageName)" /> |
358 |
| - <Exec Command="sudo rpm -ev --nodeps $(NetCoreAppHostPackRpmPackageName)" /> |
359 |
| - <Exec Command="sudo rpm -ev --nodeps $(RuntimeDepsPackageName)" /> |
360 |
| - </Target> |
| 303 | + <!-- Removed the TestSdkRpm task as it would fail when the installed package exactly matched the upgrade package --> |
361 | 304 |
|
362 | 305 | </Project>
|
0 commit comments