Skip to content

Remove dead OnlyAndroid method from integration tests #34517

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
PureWeen merged 1 commit into from
Mar 18, 2026
Merged

Remove dead OnlyAndroid method from integration tests #34517

Show file tree
Hide file tree
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
12 changes: 0 additions & 12 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/AOTTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@ public void PublishNativeAOT(string id, string framework, string runtimeIdentifi
Assert.True(DotnetInternal.New(id, projectDir, DotNetCurrent, output: _output),
$"Unable to create template {id}. Check test output for errors.");

// For Android-only builds on Linux, modify the csproj to only target Android
// This avoids restore failures due to missing iOS/macCatalyst workloads
if (isAndroidPlatform && !TestEnvironment.IsMacOS && !TestEnvironment.IsWindows)
{
OnlyAndroid(projectFile);
}

var extendedBuildProps = isWindowsFramework
? PrepareNativeAotBuildPropsWindows(runtimeIdentifier)
Expand Down Expand Up @@ -95,12 +89,6 @@ public void PublishNativeAOTRootAllMauiAssemblies(string id, string framework, s
Assert.True(DotnetInternal.New(id, projectDir, DotNetCurrent, output: _output),
$"Unable to create template {id}. Check test output for errors.");

// For Android-only builds on Linux, modify the csproj to only target Android
// This avoids restore failures due to missing iOS/macCatalyst workloads
if (isAndroidPlatform && !TestEnvironment.IsMacOS && !TestEnvironment.IsWindows)
{
OnlyAndroid(projectFile);
}

var extendedBuildProps = isWindowsFramework
? PrepareNativeAotBuildPropsWindows(runtimeIdentifier)
Expand Down
8 changes: 0 additions & 8 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseTemplateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ protected BaseTemplateTests(IntegrationTestFixture fixture, ITestOutputHelper ou
Path.Combine(TestDirectory, "Directory.Build.targets"), true);
}

protected void OnlyAndroid(string projectFile)
{
FileUtilities.ReplaceInFile(projectFile, new Dictionary<string, string>()
{
{ "<TargetFrameworks>net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>", "<TargetFrameworks>net10.0-android</TargetFrameworks>" },
});
}

protected void AssertContains(string expected, string actual)
{
Assert.True(
Expand Down
6 changes: 0 additions & 6 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@ public void Build(string id, string framework, string config, bool shouldPack, s
"</Project>",
"<PropertyGroup><Version>1.0.0-preview.1</Version></PropertyGroup></Project>");

// We only have these packs for Android
if (additionalDotNetBuildParams.Contains("UseMonoRuntime=false", StringComparison.OrdinalIgnoreCase))
{
OnlyAndroid(projectFile);
}

var buildProps = BuildProps;

if (additionalDotNetBuildParams is not "" and not null)
Expand Down
Loading