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

[main] Make main net9 #25351

Merged
merged 646 commits into from
Oct 18, 2024
Merged

[main] Make main net9 #25351

merged 646 commits into from
Oct 18, 2024

Conversation

rmarinho
Copy link
Member

Description of Change

Merge net9 to main

pjcollins and others added 30 commits July 22, 2024 12:37
* [ci] Use drop service for SDK insertion artifacts

Context: xamarin/yaml-templates@8759ec9

Steps to upload release artifacts to custom blob storage have been
replaced with azure-artifacts-drop (aka.ms/drop).

A new version of nuget-msi-convert has been added that will create a set
of artifact drops for the following shipping artifacts:
  * nugets
  * vs-components
  * vs-packs

The nugets drop contains all shipping packages that should be pushed to
various feeds or NuGet.org.

The components and packs drops are used for VS insertions.

* Fix sign verify paths

* Use main yaml-templates branch

* Fix artifact name that contains symbols
# Conflicts:
#	eng/pipelines/handlers.yml
#	src/Controls/src/Core/Binding.cs
#	src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs
#	src/Controls/src/Xaml/XamlServiceProvider.cs
* Obsolete setting mainpage via application

* - fix up our samples

* - Add templates for creating a window

* - fixes

* - fix naming

* - fix mainpage

* Update WindowTests.cs

* - restore mainpage test

* - fix

* - fix page setter

* - fix essentials

* - winui fix

* - more fixes

* - fix

* - fix

* Update App.xaml.cs
* - move layout forward

* - implement layout<T> API surface

* - updates

* change to use field

* - add onchildadded

* Update LayoutOfT.cs

* Update LayoutOfT.cs

* - remove LayoutOFT and make more things obsolete

* - fix compat

---------

Co-authored-by: Matthew Leibowitz <[email protected]>
…23393)

* Use the SetBinding SG wherever possible in Controls Core

* Use the SetBinding SG wherever possible in Controls Core UnitTests

* Use the SetBinding SG wherever possible in Compatibility Core Android

* Add workaround for XamlPreCompile with interceptors for Windows builds

* Generate file-scoped attribute class in each generated source output

* Remove explicit restore and build targets in ExecuteBuildUITestApp

* Fix integration test
* Stop using IPlatformSizeService

* Update IPlatformSizeService.cs
* Android ecosystem updates based on net9.0 branch

* ContainsItem implementation added

* return value fix

* fixed parameter type

* fix according to Pepper's comment

* correct warnings code to be ignored as errors

* newest versions (hopefully aligned)

* NU1608 added

* Update Core.csproj

* explicitly added nuget transitive dependencies

* new versions from `net9.0` branch

* fix for AAPT errors

* explicitly added Xamarin.AndroidX.Lifecycle

* explicitly added Xamarin.AndroidX.Lifecycle.Runtime

* to fix CI added Xamarin.AndroidX.Lifecycle.ViewModel

* added Xamarin.AndroidX.Lifecycle. packagereferences

* added Xamarin.AndroidX.Lifecycle.* package references

* bumps after alignment

* reverting additions afte alignment

* WarningsNotAsErrors replaced with #pragma warning

* fix for AndroidX.Core.View.ViewCompat.IsLaidOut(view)

* XAOBS001 fixes

* com.android.tools.build:gradle:7.4.2

* fixes for CS0618 on Windows only?!?!

* more pragma warning disable CS0618 on windows

* wrong line fix
* [core] Delete obsolete Mappers

* Update MapperTests.cs

* Fix unit tests
### Description of Change

Bring latest changes from main to net9.0
* implement DialogFragment

add new shiny DialogFragment

refactoring code to find and dismiss DialogFragment

code cleanup

delete ModalContainer to use only ModalFragment

handle animation and add a map between page and dialogFragment

We've back button enabled!

After dismissing several demons summoned using obscure Android APIs, I was able to deal with the BackButtonPressed event

add modal animations as anim.xml files

using cleanup

remowork PopModalPlatformAsync to work with dialogFragment

remove tag

final adjustments on DialogFragment

change the ShowNow for Show to fix the issue

Wait for animation to complete

change local functions order

fix build

create window hooks for android (like iOS)

clean up ModalFragment fields

change Dictionary to ConditionalWeakTable

clean up event animation

refactor on Null notation

remove comments

- adjust back button

- different back button

code style

remove unused prop.

fix DontPushModalPagesWhenWindowIsDeactivated DeviceTest

completes the task

return back the way how modalManager handles android modals

normilize animation duration

Co-authored-by: Shane Neuville <[email protected]>

remove focusability code

change how fragments are looked-up

code style

* code cleanup

* simplify the notification when modal is dismissed
…tHandler is called (#23738)

* Initial Commit

* - fixes

* - fix destroy path for android shell

* - fix toolbar handler disconnect

* - fix

* - add new apis

* - IElement Changes

* - window timing fixes

* - fix naming and iOS timing

* - fix windows and add unshipped txt files

* - fix naming

* Update PublicAPI.Unshipped.txt

* - fix naming

* Rename HandlerBehavior.cs to HandlerProperties.cs

* Rename IHandlerBehaviors.cs to {IHandlerDisconnectPolicies.cs

* Rename {IHandlerDisconnectPolicies.cs to IHandlerDisconnectPolicies.cs

* Update PublicAPI.Unshipped.txt

* - fix

* - fixes

* - add tests

* Update NavigationRenderer.cs

* Update HandlerLifeCycleTests.cs

---------

Co-authored-by: Matthew Leibowitz <[email protected]>
* Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24366.1+azdo.9890920

Microsoft.Android.Sdk.Windows
 From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.8

* Android API 35 obsoletions

These are both on Compatiblity, so we probably can just ignore them or use a different API (if alternative is clear).

Ignore warning for `Window.SetStatusBarColor()`:

* https://developer.android.com/reference/android/view/Window#setStatusBarColor(int)

Stop passing `exact:false` for `Path.ComputeBounds()` as it is ignored:

* https://developer.android.com/reference/android/graphics/Path#computeBounds(android.graphics.RectF,%20boolean)

* https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/graphics/java/android/graphics/Path.java;l=305

* Install Android SDK dependencies for API 35

* Suppress API 35 warning in ShapeRenderer

It appears `ComputeBounds(Rect)` without `exact` is missing in the C# binding

* Update ui-tests-build-sample.yml

* Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188

Microsoft.Android.Sdk.Windows
 From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9

* Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188

Microsoft.Android.Sdk.Windows
 From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9

* Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188

Microsoft.Android.Sdk.Windows
 From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9

* Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188

Microsoft.Android.Sdk.Windows
 From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9

* Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188

Microsoft.Android.Sdk.Windows
 From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9

* Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188

Microsoft.Android.Sdk.Windows
 From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9

* Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24368.1+azdo.9903188

Microsoft.Android.Sdk.Windows
 From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.9

* Update dependencies from https://github.com/dotnet/android build 9.0.0-preview.7.24375.1+azdo.9939534

Microsoft.Android.Sdk.Windows
 From Version 34.99.0-preview.7.346 -> To Version 35.0.0-preview.7.29

* Bump dotnet/runtime to match dotnet/android

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <[email protected]>
# Conflicts:
#	src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
* [Windows] Add TitleBar Control (#23019)

* Custom titlebar control support spike

* handle titlebar hit test elements automatically

* sample

* Added TitleBar property to Window: you can now set titlebar properties on the Window such as leading + trailing content, color, etc.

* Add inactive colors for background + foreground
Fix hide/show titlebar control not working

* Fix issue w/ titlebar unhook on window close
Add titlebar to sample page

* Added `Window.SetTitleBar` function to set the window titlebar. This allows XAML defined titlebars w/ bindings

* Revert some changes

* Revert changes
Fix PublicAPI defs

* Error checkAdditional error checks for page nav

* Update ITitlebar interface

* Titlebar control is now a TemplatedView

* Remove `SetTitlebar` API
Update sample

* Remove child

* Use pattern matching

* Add some docs

* Fix missing publicapi bits

* More public api bits

* Missed some

* Fix use of content presenter

* Adjust passthrough logic

* Fix titlebar height adjust for caption buttons

* Fix override of default template not working

* Cleanup

* Fix default control template not being applied
Add default style for TitleBar

* Fix missing API for tizen

* Fix sample issue
Update sample

* Fix missing title + icon when titlebar is not fully set
Fix titlebar title spacing w/ default behavior
Fix titlebar content added not allowing hit test
Fix missing public API

* Add IgnoreSafeArea for macOS

* Tizen

* Fix titlebar being set on window creation w/ template selector

* Comment out templates

---------

Co-authored-by: Mike Corsaro <[email protected]>
Co-authored-by: Javier Suárez <[email protected]>
# Conflicts:
#	src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
#	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-tizen/PublicAPI.Unshipped.txt
#	src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
#	src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
#	src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
#	src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt

* Use new things

---------

Co-authored-by: Mike Corsaro <[email protected]>
### Description of Change

Bring latest changes from main to net9.0 for branching for preview7
* dismiss the modal when IsAnimated is set to false

* add test to validate the change
* Fire UpdateValue after all propertychange events

* - fix

* - fixes
rmarinho and others added 7 commits October 16, 2024 18:24
Change the heuristic for deciding if we need ot ignore parent DataType,
as DataTrigger.Binding shoud inherit it, and
Picker.ItemDisplayNameBinding should not

this is an alternate fix for #23989, partially replaces #24513, and will
help fixing #25141 together with #24152
* Update templates for non-VS IDE hosts

* PR feedback
# Conflicts:
#	.config/dotnet-tools.json
#	eng/Version.Details.xml
#	eng/Versions.props
#	src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs
#	src/Controls/tests/TestCases.HostApp/Issues/Issue20439.xaml.cs
#	src/Controls/tests/TestCases.HostApp/Issues/Issue3089.cs
#	src/Controls/tests/TestCases.HostApp/Issues/Issue3333.cs
#	src/Controls/tests/TestCases.HostApp/MauiProgram.cs
#	src/Core/src/maui.aar
@rmarinho rmarinho requested review from a team as code owners October 17, 2024 11:20
jfversluis and others added 17 commits October 17, 2024 13:24
Context: ce01c15

We've decided hold off on this change until .NET 10.
# Conflicts:
#	src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
#	src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
#	src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
#	src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
#	src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
#	src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
#	src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
#	src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
#	src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@rmarinho rmarinho merged commit 4a2e721 into main Oct 18, 2024
119 of 122 checks passed
@rmarinho rmarinho deleted the net9-merge-main branch October 18, 2024 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.