-
Notifications
You must be signed in to change notification settings - Fork 528
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.
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
[Xamarin.Android.Build.Tasks] remove checks for $(UsingAndroidNETSdk)
#8647
Merged
jonathanpeppers
merged 1 commit into
dotnet:main
from
jonathanpeppers:UsingAndroidNETSdk
Jan 19, 2024
Merged
[Xamarin.Android.Build.Tasks] remove checks for $(UsingAndroidNETSdk)
#8647
jonathanpeppers
merged 1 commit into
dotnet:main
from
jonathanpeppers:UsingAndroidNETSdk
Jan 19, 2024
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
jonathanpeppers
force-pushed
the
UsingAndroidNETSdk
branch
from
January 18, 2024 15:50
2f3e376
to
9eeb233
Compare
In .NET 6+, `$(UsingAndroidNETSdk)` is always `true` as the general identifier that this project is .NET and not Xamarin.Android. We used this flag as a way to share code between .NET Android and Xamarin.Android. * Remove checks for `$(UsingAndroidNETSdk)` * No longer need to pass in this value to MSBuilds tasks or other C# classes * Checks if `true` leave in place, and remove the condition * Checks if `false` can just be completely removed now In a future PR, we may also be able to remove `$(_AndroidIsBindingProject)`, which is slightly related. We removed the "binding project" as a concept in .NET 6+. I left the `$(UsingAndroidNETSdk)` property in place, even though it is not used in these targets. Other general MSBuild targets may continue to use it in perpetuity.
jonathanpeppers
force-pushed
the
UsingAndroidNETSdk
branch
from
January 18, 2024 16:42
9eeb233
to
84b59b6
Compare
jonathanpeppers
requested review from
grendello and
dellis1972
as code owners
January 18, 2024 21:22
Ignore the MAUI lane for now, I think their build is broken:
|
dellis1972
approved these changes
Jan 19, 2024
grendello
approved these changes
Jan 19, 2024
grendello
added a commit
that referenced
this pull request
Jan 25, 2024
* main: Localized file check-in by OneLocBuild Task (#8668) [Xamarin.Android.build.Tasks] `<CheckDuplicateJavaLibraries/>` ignores `repackaged.jar` (#8664) LEGO: Merge pull request 8665 [Xamarin.Android.Build.Tasks] parse JDK `release` file directly (#8663) Bump to dotnet/installer@f91d4ca399 9.0.100-alpha.1.24070.3 (#8635) [.github] Re-enable locking issues after 30 days of inactivity (#8655) Localized file check-in by OneLocBuild Task (#8657) LEGO: Merge pull request 8656 Localized file check-in by OneLocBuild Task (#8652) Bump to xamarin/xamarin-android-tools/main@b175674 (#8644) [Xamarin.Android.Build.Tasks] remove checks for `$(UsingAndroidNETSdk)` (#8647) [Xamarin.Android.Build.Tasks] XA1039 error for Android.Support (#8629)
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.
In .NET 6+,
$(UsingAndroidNETSdk)
is alwaystrue
as the general identifier that this project is .NET and not Xamarin.Android. We used this flag as a way to share code between .NET Android and Xamarin.Android.Remove checks for
$(UsingAndroidNETSdk)
No longer need to pass in this value to MSBuilds tasks or other C# classes
Checks if
true
leave in place, and remove the conditionChecks if
false
can just be completely removed nowIn a future PR, we may also be able to remove
$(_AndroidIsBindingProject)
, which is slightly related. We removed the "binding project" as a concept in .NET 6+.I left the
$(UsingAndroidNETSdk)
property in place, even though it is not used in these targets. Other general MSBuild targets may continue to use it in perpetuity.