[build] Remove MONOANDROID, NET, and NETCOREAPP directives #8434
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pjcollins
force-pushed
the
monoandroid-directives
branch
3 times, most recently
from
0fff586
to
c24c3c2
Compare
pjcollins
commented
Oct 17, 2023
...n.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/CheckClientHandlerTypeTests.cs
Outdated
Show resolved
Hide resolved
Removes the conditional compiler directives used to swap between `.NET` and `MonoAndroid`. These are no longer needed in main as `.NET` is the only supported target.
pjcollins
force-pushed
the
monoandroid-directives
branch
from
c24c3c2
to
a3c5fbe
Compare
jpobst
approved these changes
Oct 19, 2023
| @@ -91,7 +89,7 @@ public bool FitsSystemWindows () | |||
| } | |||
| #endif | |||
|
|
|||
| #if NET && ANDROID_34 | |||
| #if ANDROID_34 | |||
There was a problem hiding this comment.
I think ANDROID_34 could be deleted as well. We won't be making a net8.0-android33 or net9.0-android33, etc.
There was a problem hiding this comment.
Maybe we will want to go through and clean this up in a future PR? Given that main still allows you to build Mono.Android.csproj for ~any supported framework version I think it makes sense to leave these in for now.
| @@ -4,7 +4,7 @@ namespace Android.Views | |||
| { | |||
| partial class WindowManagerLayoutParams | |||
| { | |||
| #if NET && ANDROID_34 | |||
| #if ANDROID_34 | |||
jonathanpeppers
approved these changes
Oct 20, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removes the conditional compiler directives used to swap between
.NETand
MonoAndroid. These are no longer needed in main as.NETis theonly supported target.