Skip to content
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

Merge things from release/9.0.1xx-preview7 into net9.0 #24070

Merged
merged 20 commits into from
Aug 8, 2024

Conversation

mattleibow
Copy link
Member

Description of Change

Merge latest changes on the release branch back into the dev branch.

github-actions bot and others added 15 commits July 31, 2024 16:43
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 <[email protected]>
* Obsolete legacy measure calls

* - no warn

* - fix more no warn

* - more no warn

---------

Co-authored-by: Shane Neuville <[email protected]>
# 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 <[email protected]>
* 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 <[email protected]>
…24049)

This reverts commit cb0a332.

# Conflicts:
#	src/Controls/src/Core/Binding.cs
#	src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs
#	src/Controls/src/Xaml/XamlServiceProvider.cs
* 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 <[email protected]>
@rmarinho

This comment was marked as outdated.

@mattleibow mattleibow marked this pull request as draft August 7, 2024 13:31
@mattleibow

This comment was marked as outdated.

@mattleibow
Copy link
Member Author

Reverting a revert to avoid creating bad history on main and net9: d16c8d9

@mattleibow mattleibow marked this pull request as ready for review August 7, 2024 14:13
mattleibow and others added 4 commits August 8, 2024 02:35
…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 <[email protected]>
Co-authored-by: Matthew Leibowitz <[email protected]>
@mattleibow mattleibow force-pushed the dev/merge-pre7-into-net9 branch 2 times, most recently from b76505b to 9fa58f9 Compare August 8, 2024 13:15
@mattleibow mattleibow force-pushed the dev/merge-pre7-into-net9 branch 2 times, most recently from f554a4b to 70544ae Compare August 8, 2024 15:42
@rmarinho rmarinho merged commit 5ef168d into net9.0 Aug 8, 2024
117 checks passed
@rmarinho rmarinho deleted the dev/merge-pre7-into-net9 branch August 8, 2024 21:54
@samhouts samhouts added the fixed-in-net9.0-nightly This may be available in a nightly release! label Aug 27, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Oct 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
fixed-in-net9.0-nightly This may be available in a nightly release!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants