Skip to content

Remove the TestSdkRpm #48400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2025
Merged

Remove the TestSdkRpm #48400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 2 additions & 59 deletions src/Installer/redist-installer/targets/GenerateRPMs.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
GenerateRpmsInner" />

<Target Name="GenerateRpmsInner"
DependsOnTargets="TestFPMTool;BuildRpms;TestSdkRpm"
DependsOnTargets="TestFPMTool;BuildRpms"
Condition=" '$(IsRPMBasedDistro)' == 'True' "
Outputs="@(GeneratedInstallers)" />

Expand Down Expand Up @@ -150,16 +150,6 @@
</SDKTokenValue>
</ItemGroup>

<ItemGroup>
<TestSdkRpmTaskEnvironmentVariables Include="PATH=$(RpmInstalledDirectory)$(PathListSeparator)$(PATH)" />
<TestSdkRpmTaskEnvironmentVariables Include="TEST_ARTIFACTS=$(TestArtifactsDir)" />
<TestSdkRpmTaskEnvironmentVariables Include="TEST_PACKAGES=$(TestPackagesDir)" />
<TestSdkRpmTaskEnvironmentVariables Include="PreviousStageProps=$(NextStagePropsPath)" />

<!-- Consumed By Publish -->
<!--<GeneratedInstallers Include="$(SdkRPMInstallerFile)" />-->
</ItemGroup>

<ReplaceFileContents InputFiles="$(AfterInstallHostScriptTemplateFile)"
DestinationFiles="$(AfterInstallHostScriptDestinationFile)"
ReplacementItems="@(AfterInstallHostTokenValue)" />
Expand Down Expand Up @@ -310,53 +300,6 @@
Importance="High" />
</Target>

<Target Name="TestSdkRpm"
Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
Inputs="$(DownloadedNetCoreAppTargetingPackInstallerFile);
$(DownloadedNetStandardTargetingPackInstallerFile);
$(DownloadedNetCoreAppHostPackInstallerFile);
$(DownloadedAspNetTargetingPackInstallerFile);
$(DownloadedRuntimeDepsInstallerFile);
$(DownloadedSharedHostInstallerFile);
$(DownloadedHostFxrInstallerFile);
$(DownloadedSharedFrameworkInstallerFile);
$(DownloadedAspNetCoreSharedFxInstallerFile);
$(SdkRPMInstallerFile);
$(RpmTestResultsXmlFile);"
Outputs="$(RpmTestResultsXmlFile)">

<!-- Install Dependencies and SDK Packages -->
<Exec Command="sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc" />
<Exec Command="sudo rpm -Uv $(DownloadedRuntimeDepsInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedNetCoreAppHostPackInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedNetStandardTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedAspNetTargetingPackInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedSharedHostInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedHostFxrInstallerFile)" />
<Exec Command="sudo rpm -Uv $(DownloadedSharedFrameworkInstallerFile)" />
<!-- Ignore dependencies, which may have an incoherent dependency on dotnet-runtime -->
<Exec Command="sudo rpm -Uv --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" />
<Exec Command="sudo rpm -Uv $(SdkRPMInstallerFile)" />

<!-- Run End-2-end Tests https://github.com/dotnet/core-sdk/issues/1174
<DotNetRestore ProjectPath="$(EndToEndTestProject)"
ToolPath="$(RpmInstalledDirectory)" />
<DotNetTest ProjectPath="$(EndToEndTestProject)"
EnvironmentVariables="@(TestSdkRpmTaskEnvironmentVariables)"
ToolPath="$(RpmInstalledDirectory)" />-->

<!-- Clean up Packages -->
<Exec Command="sudo rpm -ev --nodeps $(SdkRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(AspNetCoreSharedFxRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(SharedFxRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(HostFxrRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(SharedHostRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(AspNetTargetingPackRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(NetStandardTargetingPackRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(NetCoreAppTargetingPackRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(NetCoreAppHostPackRpmPackageName)" />
<Exec Command="sudo rpm -ev --nodeps $(RuntimeDepsPackageName)" />
</Target>
<!-- Removed the TestSdkRpm task as it would fail when the installed package exactly matched the upgrade package -->

</Project>
Loading