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

[net8.0] Merge main to net8.0 branch #17139

Merged
merged 34 commits into from Sep 1, 2023
Merged

[net8.0] Merge main to net8.0 branch #17139

merged 34 commits into from Sep 1, 2023

Conversation

rmarinho
Copy link
Member

Description of Change

The routine of merging latest changes to net8.0 try to bring them to rc1

dependabot bot and others added 24 commits August 29, 2023 12:50
Bumps Microsoft.Web.WebView2 from 1.0.1901.177 to 1.0.1938.49.

---
updated-dependencies:
- dependency-name: Microsoft.Web.WebView2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…tHandler to specify scaling down the Refresh Indicator as user swipes up, and a pixel offset for the indicator to stop at. (#17080)
* [Controls] Move ITextInput and IFontElement to InputView

Fix  api changes

Add api Tizen

fix build

* [controls] Add InputViewTests for Text, SelectionLength and CursorPosition twoway binding
Bumps the androidx group with 1 update: [Xamarin.AndroidX.AppCompat.AppCompatResources](https://github.com/xamarin/AndroidX).

- [Commits](https://github.com/xamarin/AndroidX/commits)

---
updated-dependencies:
- dependency-name: Xamarin.AndroidX.AppCompat.AppCompatResources
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: androidx
...

Signed-off-by: dependabot[bot] <support@github.com>
* Improved distribution of star rows/columns where at least one start definition minimum size is larger than the target size.
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.7.1 to 17.7.2.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md)
- [Commits](microsoft/vstest@v17.7.1...v17.7.2)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Rename all accelerator things to keyboardAccelerator - first pass

* Remove original PR API changes and tweak more stuff

* Update PublicAPI.Unshipped.txt

Remove duplicate

* Fix API diffs

* Add more comprehensive MenuFlyoutItem and SubItem samples

* The great KA refactoring

* Tweaks for Mac

* Hold back AlphaShift and NumericPad support

* Clean up tests

* Respond to feedback

* Add null check

* Respond to feedback

* Add multiple accelerators sample

* Respond to feedback

* Tweak API docs

* Update PubliAPI.Unshipped files

* Remove Mac prioritization over system behavior

* Tweak API updates in Tizen

---------

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
* Fixed Android RoundRectangle border logic

1. RoundRectangle.GetPath() should not do ANY comepnsation for StrokeThickness
   because our callers do that for us. All we need to do is draw the rounded
   rectangle path using the width and height as-is.
2. RoundedRectangle.GetInnerPath() needs to be consistent about using the
   strokeThickness argument instead of (sometimes) using the StrokeThickness
   property which *may* be different. e.g. MauiDrawable.Android.cs's _shape's
   StrokeThickness is always 1 even when that is not the StrokeThickness that
   has been set on the Border).
3. MauiDrawable.Android.cs MUST pass a bounds argument to _shape?.ToPlatform()
   because that's what is expected if we want the stroke path (which we do,
   despite the 'clipPath' name suggesting otherwise).
4. MauiDrawable.Android.cs's _strokeThickness, _width, and _height member
   variables have already been multiplied by the pixel density on the Android
   device, so we must divide by _density to get back "MAUI pixels" that
   the RoundRectangle logic needs.
5. ContentViewGroup *also* needs to divide width and height by the pixel density
   instead of multiplying the StrokeThickness by the pixel density because
   clipShape.ToPlatform() calls RoundRectangle.InnerPathForBounds() which expects
   "MAUI pixels" rather than Android pixel coordinates.
6. ShapeExtensions.ToPlatform() now requires a 'float density` argument that
   represents the Android device's pixel density so that it can scale the
   "MAUI pixels" to "Android pixels".
7. I suspect that BorderDrawable.cs also needs to do this, but I'm not sure
   how to test that theory.

* Added a RoundRectangle unit test

TODO: make sure this passes (copied over from a previous attempt at fixing Android's
RoundRectangle bugs)

* Unit Test fixups

* Enable the BorderAndStrokeIsCorrectSize() test on Android
* [Controls]Fix specificity on RefreshView IsRefreshing

* [tests] Add RefreshView specificity test

* Add more refreshview tsts

* Update RefreshViewTests.cs
* Introduce the Platform Args for Drag and Drop Event Args

* First pass of review - remove handled and others

* change prop names

* windows uitest changes

* UITest does not drag and release at starting position

* APIPublic docs

* null reference for ui tests

* fix windows public api txt

* Suppress error in compat that is not being used

* Set PlatformArgs in constructors

* Add additional docs and throw exception if localObject is set

* Make the constructors with PlatformArgs public

* Add the eventargs.Handled property back in and small syntax changes

* various small changes

* Windows null dereference fix

* A few different discussed changes

* Merge conflict - missing bracket in test

* Nullable datapackage in constructor

---------

Co-authored-by: TJ Lambert (HE/HIM/HIS) <antlambe@microsoft.com>
This seem to have regressed after the stroke thickness property values were fixed, making the path size bigger than the control itself and drawing the border outside of the bounds of the control.

The main fix is on the path size, where we subtract the stroke thickness to the control size now, because it should not exceed the control size. And then the transformation was updated to make sure the content is correctly adapted. The transformation on the path is enough and we don't need to add another one on the content panel.

Fixes #16667

Co-authored-by: Jeffrey Stedfast <jestedfa@microsoft.com>
don't ask me why, that's how it is

- fixes #16849
Co-authored-by: Samantha Houts <samhouts@users.noreply.github.com>
Co-authored-by: Samantha Houts <samhouts@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Bumps Microsoft.Web.WebView2 from 1.0.1901.177 to 1.0.1938.49.


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Microsoft.Web.WebView2&package-manager=nuget&previous-version=1.0.1901.177&new-version=1.0.1938.49)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore <dependency name> major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will
remove the ignore condition of the specified dependency and ignore
conditions


</details>
### Description of Change

don't ask me why, that's how it is

### Issues Fixed

- fixes #16849
Bumps the androidx group with 1 update:
[Xamarin.AndroidX.AppCompat.AppCompatResources](https://github.com/xamarin/AndroidX).

<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/xamarin/AndroidX/commits">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Xamarin.AndroidX.AppCompat.AppCompatResources&package-manager=nuget&previous-version=1.6.1.3&new-version=1.6.1.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore <dependency name> major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will
remove the ignore condition of the specified dependency and ignore
conditions


</details>
### Description of Change

Previously, we wanted to diff the APIs against the latest public builds
(including previews), however, we now want to always compare against the
latest _stable_ version to compare the .NET 8 RC 1 with .NET 7.
### Description of Change

Moves the external comments to inline, adds missing comments and minor
improvements.

### Issues Fixed

Related to #3960
@rmarinho rmarinho added this to the .NET 8 GA milestone Aug 31, 2023
@rmarinho rmarinho requested a review from a team as a code owner August 31, 2023 13:27
@Eilon Eilon added the area/infrastructure 🏗️ CI, Maestro / Coherency label Aug 31, 2023
jstedfast and others added 7 commits August 31, 2023 16:36
These new borders have image content to examine how image scaling
works on the various platforms.
* move suppression

* use less suppression code
# Conflicts:
#	src/Controls/src/Core/Platform/Android/DragAndDropGestureHandler.cs
* [tests] Ignore appium visual test #15330  while we investigate

* Only ignore test on iOS

---------

Co-authored-by: Bret Johnson <bret.johnson@microsoft.com>
These new borders have image content to examine how image scaling works
on the various platforms.


### Description of Change

<!-- Enter description of the fix in this section -->

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

Fixes #

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
mattleibow
mattleibow previously approved these changes Sep 1, 2023
jfversluis and others added 2 commits September 1, 2023 11:52
* Update BindableObject.cs

* Update src/Controls/src/Core/BindableObject.cs

Co-authored-by: Juan Diego Herrera <juherrera@microsoft.com>

---------

Co-authored-by: Juan Diego Herrera <juherrera@microsoft.com>
@rmarinho rmarinho merged commit c378d68 into net8.0 Sep 1, 2023
38 checks passed
@rmarinho rmarinho deleted the merge-main-net82 branch September 1, 2023 14:35
@github-actions github-actions bot locked and limited conversation to collaborators Dec 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet