Remove IsRunningOnDesktop for the Android designer #10234

Copilot · 2025-06-19T21:45:01Z

The Android designer has been removed from Visual Studio, but we still had code in the product supporting it. This PR removes all the desktop-specific functionality as it's no longer needed.

Changes Made

C++ Changes

Removed isRunningOnDesktop field from JnienvInitializeArgs struct in managed-interface.hh
Removed assignments to this field in monodroid-glue.cc and host.cc

C# Changes

Removed IsRunningOnDesktop static field from JNIEnvInit class
Removed initialization code and __XA_PACKAGE_NAMING_POLICY__ environment variable handling
Inlined conditionals in TypeManager.cs assuming desktop is always false
Inlined conditionals in AndroidRuntime.cs removing desktop-specific type lookups
Removed desktop-specific error message from SyncContext.cs

Build Changes

Removed __XA_PACKAGE_NAMING_POLICY__ environment variable generation from MSBuild targets
Updated test to no longer expect this environment variable

Key Points

All if (IsRunningOnDesktop) statements have been inlined/deleted assuming the condition is always false
The $(AndroidPackageNamingPolicy) MSBuild property remains as-is since it's still used within the codebase
The __XA_PACKAGE_NAMING_POLICY__ environment variable has been removed as it was only used within desktop blocks
Minimal changes: 9 files modified, 37 lines removed, 4 lines changed

Verification

Zero references to IsRunningOnDesktop remain in C# source files
Zero references to isRunningOnDesktop remain in C++ source files
Zero references to __XA_PACKAGE_NAMING_POLICY__ remain in source files
The compile-time is_running_on_desktop constant in monodroid-glue-internal.hh is also removed

Fixes #10233.

💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.

Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>

src/Mono.Android/Java.Interop/TypeManager.cs

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

src/native/mono/monodroid/monodroid-glue.cc

…est list initialization, and remove remaining is_running_on_desktop usage from C++ code Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>

jonathanpeppers

I still see more instances of is_running_on_desktop that can be removed:

android/src/native/mono/monodroid/monodroid-glue-internal.hh

Line 74 in c255955

static constexpr bool is_running_on_desktop = false;

Then there are several usages in src\native\mono\monodroid\monodroid-glue.cc.

Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>

Copilot · 2025-06-20T13:53:57Z

I still see more instances of is_running_on_desktop that can be removed:
https://github.com/dotnet/android/blob/c25595518479edfa6f215a82f948ae7ba7780484/src/native/mono/monodroid/monodroid-glue-int...

Fixed in 6f46321. Removed the unused is_running_on_desktop constant from the MonodroidRuntime class. There are now zero references to is_running_on_desktop in any source files.

jonathanpeppers

@grendello should review the changes to native code.

grendello · 2025-06-23T09:34:35Z

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

@@ -1299,9 +1299,7 @@ public void PackageNamingPolicy ([Values ("LowercaseMD5", "LowercaseCrc64")] str
 				Assert.IsTrue (b.Build (proj), "build should have succeeded.");
 				var environment = b.Output.GetIntermediaryPath (Path.Combine ("__environment__.txt"));
 				FileAssert.Exists (environment);
-				var values = new List<string> {
-					$"__XA_PACKAGE_NAMING_POLICY__={packageNamingPolicy}"
-				};


I'm not sure how this is relevant to the removal of desktop support

grendello · 2025-06-23T09:34:55Z

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -1758,7 +1758,6 @@ because xbuild doesn't support framework reference assemblies.

 <Target Name="_GenerateEnvironmentFiles">
  <ItemGroup>
-    <_GeneratedAndroidEnvironment Include="__XA_PACKAGE_NAMING_POLICY__=$(AndroidPackageNamingPolicy)" />


I'm not sure how this is relevant to the removal of desktop support

This spot seemed to be the only place that actually reads the env var:

android/src/Mono.Android/Android.Runtime/JNIEnvInit.cs

Lines 142 to 147 in 5c5854f

if (IsRunningOnDesktop) {

var packageNamingPolicy = Environment.GetEnvironmentVariable ("__XA_PACKAGE_NAMING_POLICY__");

if (Enum.TryParse (packageNamingPolicy, out PackageNamingPolicy pnp)) {

JavaNativeTypeManager.PackageNamingPolicy = pnp;

}

}

$(AndroidPackageNamingPolicy) is still left in, which embeds a value in libxamarin-app.so.

grendello · 2025-06-23T09:36:48Z

The C++ changes look fine

Initial plan for issue

51b1e9d

Copilot AI assigned Copilot and jonathanpeppers Jun 19, 2025

Copilot started work on behalf of jonathanpeppers June 19, 2025 21:45 View session

Copilot AI and others added 2 commits June 19, 2025 22:14

Remove IsRunningOnDesktop and related functionality for Android designer

a486be2

Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>

Fix remaining IsRunningOnDesktop references in JNIEnvInit.cs

ed0dbe5

Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Remove IsRunningOnDesktop for the Android designer~~ Remove IsRunningOnDesktop for the Android designer Jun 19, 2025

Copilot AI requested a review from jonathanpeppers June 19, 2025 22:19

Copilot finished work on behalf of jonathanpeppers June 19, 2025 22:19

jonathanpeppers reviewed Jun 19, 2025

View reviewed changes

src/Mono.Android/Java.Interop/TypeManager.cs Outdated Show resolved Hide resolved

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs Outdated Show resolved Hide resolved

src/native/mono/monodroid/monodroid-glue.cc Show resolved Hide resolved

Copilot started work on behalf of jonathanpeppers June 19, 2025 22:23 View session

Address code review feedback: fix TypeManager condition, clean BuildT…

c255955

…est list initialization, and remove remaining is_running_on_desktop usage from C++ code Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>

Copilot AI requested a review from jonathanpeppers June 19, 2025 22:53

Copilot finished work on behalf of jonathanpeppers June 19, 2025 22:53

jonathanpeppers marked this pull request as ready for review June 20, 2025 13:29

jonathanpeppers requested a review from grendello as a code owner June 20, 2025 13:29

jonathanpeppers reviewed Jun 20, 2025

View reviewed changes

Copilot started work on behalf of jonathanpeppers June 20, 2025 13:31 View session

Remove unused is_running_on_desktop constant from MonodroidRuntime class

6f46321

Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>

Copilot AI requested a review from jonathanpeppers June 20, 2025 13:54

Copilot finished work on behalf of jonathanpeppers June 20, 2025 13:54

jonathanpeppers approved these changes Jun 20, 2025

View reviewed changes

grendello reviewed Jun 23, 2025

View reviewed changes

grendello approved these changes Jun 23, 2025

View reviewed changes

jonathanpeppers merged commit 3f45767 into main Jun 23, 2025
59 checks passed

jonathanpeppers deleted the copilot/fix-10233 branch June 23, 2025 13:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Remove IsRunningOnDesktop for the Android designer #10234

Remove IsRunningOnDesktop for the Android designer #10234

Uh oh!

Copilot AI commented Jun 19, 2025 •

edited by jonathanpeppers

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jonathanpeppers left a comment

Uh oh!

Copilot AI commented Jun 20, 2025

Uh oh!

jonathanpeppers left a comment

Uh oh!

grendello Jun 23, 2025

Uh oh!

grendello Jun 23, 2025

Uh oh!

jonathanpeppers Jun 23, 2025

Uh oh!

grendello commented Jun 23, 2025

Uh oh!

Uh oh!

Uh oh!

	if (IsRunningOnDesktop) {
	var packageNamingPolicy = Environment.GetEnvironmentVariable ("__XA_PACKAGE_NAMING_POLICY__");
	if (Enum.TryParse (packageNamingPolicy, out PackageNamingPolicy pnp)) {
	JavaNativeTypeManager.PackageNamingPolicy = pnp;
	}
	}

Remove IsRunningOnDesktop for the Android designer #10234

Remove IsRunningOnDesktop for the Android designer #10234

Uh oh!

Conversation

Copilot AI commented Jun 19, 2025 • edited by jonathanpeppers Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes Made

C++ Changes

C# Changes

Build Changes

Key Points

Verification

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jonathanpeppers left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI commented Jun 20, 2025

Uh oh!

jonathanpeppers left a comment

Choose a reason for hiding this comment

Uh oh!

grendello Jun 23, 2025

Choose a reason for hiding this comment

Uh oh!

grendello Jun 23, 2025

Choose a reason for hiding this comment

Uh oh!

jonathanpeppers Jun 23, 2025

Choose a reason for hiding this comment

Uh oh!

grendello commented Jun 23, 2025

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented Jun 19, 2025 •

edited by jonathanpeppers

Loading