[One .NET] update the .NET 6 packs used in .NET 7 #7104
Merged
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
|
This breaks Xamarin.Legacy.Sdk, need to investigate why. |
Context: https://github.com/dotnet/maui/releases/tag/6.0.400 Context: dotnet#7023 MAUI SR 1 shipped along with a new .NET 6 Android workload. We should be able to use these packs in .NET 7. This would occur when building `net6.0-android` apps with a .NET 7 SDK. Since dotnet#7023 is in that release, we can: * Specific the .NET 6 packs as `sdk` where appropriate. * Condition `AutoImport.props` to apply for .NET 7-only. * We also need to remove `$(_DefaultJavaSourceJarPattern)` like we did in .NET 6.
jonathanpeppers
force-pushed
the
NET6Android32.0.415
branch
from
b36d458 to
c3bf0e2
Compare
|
Ok, the test that failed just needed to update Xamarin.Legacy.Sdk, let's see what the next run does. |
pjcollins
approved these changes
Jun 21, 2022
# for free
to subscribe to this conversation on GitHub.
Already have an account?
#.
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.
Context: https://github.com/dotnet/maui/releases/tag/6.0.400
Context: #7023
MAUI SR 1 shipped along with a new .NET 6 Android workload. We should
be able to use these packs in .NET 7. This would occur when building
net6.0-androidapps with a .NET 7 SDK.Since #7023 is in that release, we can:
sdkwhere appropriate.AutoImport.propsto apply for .NET 7-only.$(_DefaultJavaSourceJarPattern)like we didin .NET 6.