Merge things from release/9.0.1xx-preview7 into net9.0
#24070
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
Context: https://github.com/jonathanpeppers/Mono.Profiler.Android/releases/tag/9.0.0-preview.1 I had to build dotnet/runtime from source and update the `Mono.AotProfiler.Android` NuGet package for this to work again. Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
* Obsolete legacy measure calls * - no warn * - fix more no warn * - more no warn --------- Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
# Conflicts: # src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
* Update versions for iOS and sdk * Update versions * Update iOS * Update iOS again
* Call correct Arrange logic from VE.Arrange * - update comments * - add more comments * - add more comments
* Fix transparent default modal background * - fix test * - fix tests
…esource (#24024) * Remove the 'Resources' prefix from BundleResource Fixes #23554 Prior to Maui 8.0.70, there was a bug that only removed the "Resources/" prefix, and not the correct "Platforms/iOS/Resource": #16734 This PR #23269 fixes the original issue, but now exposed the case where BundleResource were included in the root Resources folder instead of the Platforms/iOS/ folder. * Update Microsoft.Maui.Controls.SingleProject.targets * Update Microsoft.Maui.Controls.SingleProject.targets * Add a test * string --------- Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
* Build the previous TFMs * ) * cleanup * fix sample TFMs * this * tests * disable tizen for now on net8.0 TFMs * MauiPackageVersion * almost * remove it * pranks * this * net8 things * warns --------- Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
* Update to newest net9p7 build * Update with barId 233839 * Update aspnet dependencies * Fix extensions versions * Update iOS and Android versions --------- Co-authored-by: Rui Marinho <me@ruimarinho.net>
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
|
Reverting a revert to avoid creating bad history on main and net9: d16c8d9 |
…23787) * Updating Maui templates to build unpackaged Windows apps by default * Fixing typo in comment * Tests * comment * Updating template maui-blazor-solution * split the tests into categories * better name * they tricked me # Conflicts: # eng/pipelines/common/maui-templates.yml * hmmm * Fixing spaces vs tabs issue * fix CI * Split the Template tests * sigh * this is better * this * fix harder --------- Co-authored-by: Luke Westendorf <lukewest@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
mattleibow
force-pushed
the
dev/merge-pre7-into-net9
branch
2 times, most recently
from
b76505b to
9fa58f9
Compare
mattleibow
force-pushed
the
dev/merge-pre7-into-net9
branch
2 times, most recently
from
f554a4b to
70544ae
Compare
mattleibow
force-pushed
the
dev/merge-pre7-into-net9
branch
from
70544ae to
603c831
Compare
samhouts
added
the
fixed-in-net9.0-nightly
samhouts
added
the
fixed-in-net8.0-nightly
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.
Description of Change
Merge latest changes on the release branch back into the dev branch.