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 into net8 #11693

Merged
merged 66 commits into from
Nov 28, 2022
Merged

[net8.0] Merge main into net8 #11693

merged 66 commits into from
Nov 28, 2022

Conversation

rmarinho
Copy link
Member

Description of Change

Merge main into net8 branch

github-actions bot and others added 30 commits November 10, 2022 15:56
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221108.30

Microsoft.iOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1463

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221108.30

Microsoft.tvOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1463

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221108.30

Microsoft.macOS.Sdk
 From Version 12.3.2372 -> To Version 13.0.2018

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221108.30

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2372 -> To Version 16.1.1463

* Bump Xcode to 14.1.0

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.4

Microsoft.iOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1465

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.4

Microsoft.tvOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1465

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.4

Microsoft.macOS.Sdk
 From Version 12.3.2372 -> To Version 13.0.2020

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.7

Microsoft.iOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1466

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.7

Microsoft.tvOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1466

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.4

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2372 -> To Version 16.1.1465

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.7

Microsoft.macOS.Sdk
 From Version 12.3.2372 -> To Version 13.0.2021

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.7

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2372 -> To Version 16.1.1466

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.14

Microsoft.iOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1467

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.14

Microsoft.tvOS.Sdk
 From Version 16.0.1478 -> To Version 16.1.1467

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.14

Microsoft.macOS.Sdk
 From Version 12.3.2372 -> To Version 13.0.2022

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221111.14

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2372 -> To Version 16.1.1467

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Alex Soto <alex@alexsoto.me>
### Description of Change

Just merging things again from net7.0 as some new commits arrived while
the previous PR was undergoing merging.
* Bump Microsoft.WindowsAppSDK from 1.1.5 to 1.2.221109.1

Bumps [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk) from 1.1.5 to 1.2.221109.1.
- [Release notes](https://github.com/microsoft/windowsappsdk/releases)
- [Commits](https://github.com/microsoft/windowsappsdk/commits)

---
updated-dependencies:
- dependency-name: Microsoft.WindowsAppSDK
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update Directory.Build.targets

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Bumps [Microsoft.CodeAnalysis.CSharp](https://github.com/dotnet/roslyn) from 4.2.0 to 4.4.0.
- [Release notes](https://github.com/dotnet/roslyn/releases)
- [Changelog](https://github.com/dotnet/roslyn/blob/main/docs/Breaking%20API%20Changes.md)
- [Commits](dotnet/roslyn@v4.2.0...Visual-Studio-2019-Version-16.0-Preview-4.4)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.CSharp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [Xamarin.Build.Download](https://github.com/xamarin/XamarinComponents) from 0.11.3 to 0.11.4.
- [Release notes](https://github.com/xamarin/XamarinComponents/releases)
- [Commits](https://github.com/xamarin/XamarinComponents/commits)

---
updated-dependencies:
- dependency-name: Xamarin.Build.Download
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [Microsoft.Net.Compilers.Toolset](https://github.com/dotnet/roslyn) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/dotnet/roslyn/releases)
- [Changelog](https://github.com/dotnet/roslyn/blob/main/docs/Breaking%20API%20Changes.md)
- [Commits](https://github.com/dotnet/roslyn/commits/Visual-Studio-2019-Version-16.0-Preview-4.4)

---
updated-dependencies:
- dependency-name: Microsoft.Net.Compilers.Toolset
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Set window soft input via window mapper

* - disconnect handlers

* - add additional logging info

* - fix handler typing

* - fix formatting
* Update Versions.props

* Not needed anymore!

* Revert "Not needed anymore!"

This reverts commit 1e22ff2.
Bumps Xamarin.UITest from 3.2.9 to 4.0.0.

---
updated-dependencies:
- dependency-name: Xamarin.UITest
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…21108.1 (#11342)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 1.0.0-prerelease.22531.1 -> To Version 1.0.0-prerelease.22558.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221114.10

Microsoft.MacCatalyst.Sdk
 From Version 15.4.2372 -> To Version 16.1.1468

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221115.12

Microsoft.iOS.Sdk
 From Version 16.1.1467 -> To Version 16.1.1469

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221115.12

Microsoft.tvOS.Sdk
 From Version 16.1.1467 -> To Version 16.1.1469

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221115.12

Microsoft.macOS.Sdk
 From Version 13.0.2022 -> To Version 13.0.2024

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221115.12

Microsoft.MacCatalyst.Sdk
 From Version 16.1.1467 -> To Version 16.1.1469

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
* Add NeedsExactMeasure check for Editor on Android
Fixes #8232
Fixes #7627

* Add public API stuff
* Update Essentials Barometer API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
* Fix Essentials AppActions API Docs

* Update AppActions.netstandard.tvos.watchos.macos.tizen.cs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
* External file to inline

* Final touches

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
* Remove unnecessary MeasureOverride from RefreshView;
Fixes #5772

* Fix missing api thing
* Don't set editor action to handled

* - Add tests

* - remove for tizen
* Update Essentials Battery API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
* Update Essentials AppInfo API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
* Update Essentials Browser API Docs

* Apply suggestions from code review

All the URI!

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
* Fix issue clearing MapElements in iOS Map

* Fix XAML formatting
* Update Essentials Contacts API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
* Update Essentials Connectivity API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
* Update Essentials Clipboard Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
* Fix the ordering registration for tests

* - fix the timing on some tests
jfversluis and others added 23 commits November 22, 2022 11:43
* Update Essentials DeviceInfo API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
* Update Essentials DeviceDisplay API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
* Possible fix for issue #10960

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

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
* Bump Microsoft.Bcl.AsyncInterfaces from 6.0.0 to 7.0.0

Bumps [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/runtime) from 6.0.0 to 7.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits)

---
updated-dependencies:
- dependency-name: Microsoft.Bcl.AsyncInterfaces
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump System.Text.Json

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
* Reboot on-prem Mac agent at the end of a test run

* Use agent-rebooter template capable of targeting the xamarin org

* Simplify agent-rebooter condition to only include the agent pool check

* Diagnostics: Show agent agentPool parameter setting

* Powershell block step

* Diagnostics: Single line echo statement

* Test: Simplify output to not include parameter setting

* Pass through the agent pool name rather than the pool object

* Show agent pool at the beginning of the job

* Remove agentPoolName parameter and condition

The agent-rebooter template will only take action when the agent is in an on-prem pool. It will not attempt to reboot an agent in a hosted pool

* Try placing group Xamarin-Secrets after the variables template

* Xamarin-Secrets is already included in the variables template

* Directly use the Xamarin public pool access token keyvault value

* Capture the agent pool access token in a variable

* Move AgentPoolAccessToken definition into device-tests

* Updated rebooter template eliminates need for organization and project parameters

* Temporarily remove all steps except the rebooter

* Restore the original steps

* Focus testing on the rebooter

* Restore all steps

* Comment noting that the rebooter template must always be the last step in the job

* Agent-rebooter capability was released to production and so target in yaml-templates main

* Trim trailing whitespace
* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.6

Microsoft.iOS.Sdk
 From Version 16.1.1469 -> To Version 16.1.1474

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.6

Microsoft.tvOS.Sdk
 From Version 16.1.1469 -> To Version 16.1.1474

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.6

Microsoft.macOS.Sdk
 From Version 13.0.2024 -> To Version 13.0.2029

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.6

Microsoft.MacCatalyst.Sdk
 From Version 16.1.1469 -> To Version 16.1.1474

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Fix the issue

* Added Device Tests
* Added sample to validate the issue

* Fix droid Stepper IsEnabled property

* Added Device Test
* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.14

Microsoft.iOS.Sdk
 From Version 16.1.1474 -> To Version 16.1.1475

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.14

Microsoft.tvOS.Sdk
 From Version 16.1.1474 -> To Version 16.1.1475

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.14

Microsoft.macOS.Sdk
 From Version 13.0.2029 -> To Version 13.0.2030

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.14

Microsoft.MacCatalyst.Sdk
 From Version 16.1.1474 -> To Version 16.1.1475

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.17

Microsoft.tvOS.Sdk
 From Version 16.1.1474 -> To Version 16.1.1477

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.17

Microsoft.macOS.Sdk
 From Version 13.0.2029 -> To Version 13.0.2032

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.17

Microsoft.MacCatalyst.Sdk
 From Version 16.1.1474 -> To Version 16.1.1477

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.17

Microsoft.iOS.Sdk
 From Version 16.1.1474 -> To Version 16.1.1477

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.16

Microsoft.iOS.Sdk
 From Version 16.1.1474 -> To Version 16.1.1476

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.16

Microsoft.tvOS.Sdk
 From Version 16.1.1474 -> To Version 16.1.1476

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.16

Microsoft.macOS.Sdk
 From Version 13.0.2029 -> To Version 13.0.2031

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221122.16

Microsoft.MacCatalyst.Sdk
 From Version 16.1.1474 -> To Version 16.1.1476

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This new and shiny version is able to just autoformat files already modified
in a PR, so enable that mode.
* Fix IsBusy crash on Android

* Added Device Test
* Align Shapes Fill property behavior with Xamarin.Forms

* Added device tests
Some C# files use '#if' to include/exclude code and that does not work well with the dotnet format command.
Adding '$(_MauiSkipSdkAutoImport)' != 'true' so that the imports can be skipped
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
@rmarinho rmarinho changed the base branch from main to net8.0 November 28, 2022 14:33
@rmarinho rmarinho merged commit 16f4c7f into net8.0 Nov 28, 2022
@rmarinho rmarinho deleted the main-net8 branch November 28, 2022 14:34
@samhouts samhouts added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Jul 19, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Dec 16, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions t/housekeeping ♻︎
Projects
None yet
Development

Successfully merging this pull request may close these issues.