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.

Sign up for GitHub

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

Jump to bottom

Merge main to net8 #12032

Merged
merged 118 commits into from
Dec 12, 2022
Merged

Merge main to net8 #12032

merged 118 commits into from
Dec 12, 2022

Conversation

rmarinho
Copy link
Member

Description of Change

Weekly merge of main to net8 branch

github-actions bot and others added 30 commits November 10, 2022 15:56
@github-actions @jfversluis
Update Entry.cs (#11250)
2b4e0be 
Co-authored-by: Gerald Versluis <[email protected]>
@jonathanpeppers
Revert "[android] bring back $(AndroidLinkResources) by default" (#…
a4d78ae 
…11096)

This reverts commit b73147e.

Fixes: dotnet/sdk#28880
@github-actions @jfversluis
Remove dead XML Doc link (#11233)
c64e102 
Co-authored-by: Gerald Versluis <[email protected]>
@dotnet-maestro @dalexsoto
[net7.0] Update dependencies from xamarin/xamarin-macios (#11220)
5302c47 
* 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 <[email protected]>
@StephaneDelcroix
restore unittests for native views binding (#11341)
44599ac
@mattleibow
Merge net7.0 into main (#11290)
03db961 
### Description of Change

Just merging things again from net7.0 as some new commits arrived while
the previous PR was undergoing merging.
@dependabot @mattleibow
Bump Microsoft.WindowsAppSDK from 1.1.5 to 1.2.221109.1 (#11280)
24cee8b 
* 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] <[email protected]>

* Update Directory.Build.targets

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew Leibowitz <[email protected]>
@dependabot
Bump Microsoft.CodeAnalysis.CSharp from 4.2.0 to 4.4.0 (#11365)
0971d66 
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] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump Xamarin.Build.Download from 0.11.3 to 0.11.4 (#11367)
89326a5 
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] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump Microsoft.Net.Compilers.Toolset from 4.3.1 to 4.4.0 (#11366)
0dfcf8a 
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] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@PureWeen
Set window soft input via window mapper (#11356)
6115146 
* Set window soft input via window mapper

* - disconnect handlers

* - add additional logging info

* - fix handler typing

* - fix formatting
@mattleibow
Update Microsoft.Windows.SDK.BuildTools (#11396)
fb7acc0 
* Update Versions.props

* Not needed anymore!

* Revert "Not needed anymore!"

This reverts commit 1e22ff2.
@dependabot
Bump Xamarin.UITest from 3.2.9 to 4.0.0 (#11407)
bfccbb6 
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] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/xharness build 202…
44429a4 
…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>
@dotnet-maestro @rmarinho
[main] Update dependencies from xamarin/xamarin-macios (#11338)
aa31270 
* 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 <[email protected]>
@hartez
Add NeedsExactMeasure check for Editor on Android (#10876)
50f32fc 
* Add NeedsExactMeasure check for Editor on Android
Fixes #8232
Fixes #7627

* Add public API stuff
@jfversluis @hartez
Update Essentials Barometer API Docs (#11378)
6013f56 
* Update Essentials Barometer API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <[email protected]>

Co-authored-by: E.Z. Hart <[email protected]>
@jfversluis @hartez
Update Essentials AppActions API Docs (#11373)
502d973 
* Fix Essentials AppActions API Docs

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

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <[email protected]>

Co-authored-by: E.Z. Hart <[email protected]>
@jfversluis @hartez
Update Essentials Accelerometer API Docs (#11370)
63ee346 
* External file to inline

* Final touches

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <[email protected]>

Co-authored-by: E.Z. Hart <[email protected]>
@hartez
Remove unnecessary MeasureOverride from RefreshView; (#11357)
0d78b93 
* Remove unnecessary MeasureOverride from RefreshView;
Fixes #5772

* Fix missing api thing
@PureWeen
Don't set editor action to handled (#11386)
0203472 
* Don't set editor action to handled

* - Add tests

* - remove for tizen
@jfversluis @hartez
Update Essentials Battery API Docs (#11380)
0f8fbc3 
* Update Essentials Battery API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <[email protected]>

Co-authored-by: E.Z. Hart <[email protected]>
@jfversluis @hartez
Update Essentials AppInfo API Docs (#11374)
881316f 
* Update Essentials AppInfo API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <[email protected]>

Co-authored-by: E.Z. Hart <[email protected]>
@jfversluis @hartez
Update Essentials Browser API Docs (#11394)
5d830d5 
* Update Essentials Browser API Docs

* Apply suggestions from code review

All the URI!

Co-authored-by: E.Z. Hart <[email protected]>

Co-authored-by: E.Z. Hart <[email protected]>
@jsuarezruiz
[iOS] Fix issue clearing MapElements in Map (#11471) Fixes #11296
289381e 
* Fix issue clearing MapElements in iOS Map

* Fix XAML formatting
@jfversluis @hartez
Update Essentials Contacts API Docs (#11417)
a3c2204 
* Update Essentials Contacts API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <[email protected]>

Co-authored-by: E.Z. Hart <[email protected]>
@jfversluis @hartez
Update Essentials Connectivity API Docs (#11415)
418488d 
* Update Essentials Connectivity API Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <[email protected]>

Co-authored-by: E.Z. Hart <[email protected]>
@jfversluis @hartez
Update Essentials Clipboard Docs (#11395)
18b3241 
* Update Essentials Clipboard Docs

* Apply suggestions from code review

Co-authored-by: E.Z. Hart <[email protected]>

Co-authored-by: E.Z. Hart <[email protected]>
@PureWeen
Fix window page changed event subscriptions (#11483)
6354e78
@PureWeen
Fix the ordering registration for tests (#11484)
1779012 
* Fix the ordering registration for tests

* - fix the timing on some tests
jsuarezruiz and others added 15 commits December 6, 2022 17:53
@jsuarezruiz @rmarinho
[Android] Fix crash disconnecting the IndicatorView (#11346)
3f8a4ea 
* Fix crash disconnecting the IndicatorView on Android

* Added IndicatorViewStub

Co-authored-by: Rui Marinho <[email protected]>
@PureWeen
Remove non platform TFM and sync up SupportedOSPlatformVersion (#11910)
41eea33
@PureWeen
Fix UpdateSemantics for UIStepper and UIPagerControl (#11937)
63f2ed5
@PureWeen
Make OnShouldReceiveMapTouch static (#11974)
d701004
@dependabot
Bump Microsoft.CodeAnalysis.NetAnalyzers (#11958)
d0e6e4c 
Bumps [Microsoft.CodeAnalysis.NetAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 7.0.0-preview1.22559.1 to 7.0.0.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/main/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/commits/7.0.0)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.NetAnalyzers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jfversluis @hartez
Update Essentials MainThread API Docs (#11934)
6e9dd16 
* Update Essentials MainThread API Docs

* Update MainThread.netstandard.cs

* Update src/Essentials/src/MainThread/MainThread.shared.cs

Co-authored-by: E.Z. Hart <[email protected]>

Co-authored-by: E.Z. Hart <[email protected]>
@jfversluis
Update Essentials Flashlight API Docs (#11920)
962802d
@mattleibow
Prepare MAUI to support building with NuGets (#11946)
8d3ada2 
* Prepare MAUI to support building with NuGets

* Exclude resizetizer when UseMauiNuGets=True
@dependabot
Bump Xamarin.Firebase.AppIndexing from 120.0.0.9 to 120.0.0.10 (#11929)
c1c2c09 
Bumps [Xamarin.Firebase.AppIndexing](https://github.com/xamarin/GooglePlayServicesComponents) from 120.0.0.9 to 120.0.0.10.
- [Release notes](https://github.com/xamarin/GooglePlayServicesComponents/releases)
- [Commits](https://github.com/xamarin/GooglePlayServicesComponents/commits)

---
updated-dependencies:
- dependency-name: Xamarin.Firebase.AppIndexing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jsuarezruiz
Fix crash typing in Shell SearchHandler on iOS (#11927)
45893ea
@jsuarezruiz @PureWeen
Fix crash using BackButtonBehavior and navigating to root (#11438) Fixes
07951fa 
 #11401 Fixes #10514

* Fix crash using BackButtonBehavior and navigating to root

* Added Device Test

* - add unit test and fixup ShellToolbar to unhook from previous command

* - remove extra call to OnBackButtonCommandPropertyChanged

* - remove excess code from ShellToolbar

Co-authored-by: Shane Neuville <[email protected]>
@github-actions
[create-pull-request] automated change (#11949)
505e10f 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@BioTurboNick @Redth
Vibrate - Detect zero duration and return early (#11314)
a63b120 
* Detect zero duration and return early

* Check for < 0 condition as well

Co-authored-by: Jonathan Dick <[email protected]>
@jsuarezruiz
Fix SwipeItemView size issues on Android (#10522) Fixes #10065 Fixes #…
509d91e 
…6018
@rmarinho
Merge branch 'main' into net8-main
240c2e6 
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
#	src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj
#	src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj
#	src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj
#	src/Controls/src/Core/Platform/AlertManager/AlertManager.Android.cs
#	src/Controls/src/Core/Platform/iOS/CustomHoverGestureRecognizer.cs
#	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/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.iOS.cs
#	src/Controls/tests/DeviceTests/TestCategory.cs
#	src/Controls/tests/Xaml.UnitTests/NativeViewsAndBindings.xaml.cs
#	src/Core/maps/src/Platform/iOS/MauiMKMapView.cs
#	src/Core/src/Graphics/ShapeDrawable.cs
#	src/Core/src/Handlers/ViewHandlerExtensions.Android.cs
#	src/Core/src/Platform/Android/KeyboardManager.cs
#	src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
#	src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
#	src/Core/src/PublicAPI/net-maccatalyst/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
#	src/Core/tests/DeviceTests/Handlers/ScrollView/ScrollViewHandlerTests.iOS.cs
#	src/Essentials/src/Accelerometer/Accelerometer.shared.cs
#	src/Essentials/src/AppInfo/AppTheme.shared.cs
#	src/Essentials/src/Battery/Battery.shared.cs
#	src/Essentials/src/DeviceInfo/DeviceInfo.shared.cs
#	src/TestUtils/src/DeviceTests/AssertionExtensions.cs
@rmarinho rmarinho changed the base branch from main to net8.0 December 12, 2022 16:24
@rmarinho rmarinho requested a review from a team as a code owner December 12, 2022 16:24
@Eilon Eilon added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Dec 12, 2022
@rmarinho rmarinho requested a review from mattleibow December 12, 2022 18:14
@rmarinho rmarinho merged commit 5bdbfda into net8.0 Dec 12, 2022
@rmarinho rmarinho deleted the net8-main branch December 12, 2022 18:24
@mattleibow mattleibow restored the net8-main branch December 13, 2022 03:02
@mattleibow mattleibow deleted the net8-main branch December 13, 2022 03:07
@mattleibow
Copy link
Member

We need to revert this and re-merge with history. We should not squash merge these types of ones as we lose all history. If there are rules, then those rules must change. Going to be impossible to try and work out what changed where now.

rmarinho added a commit that referenced this pull request Dec 13, 2022
@rmarinho
Revert "Merge main to net8 (#12032)"
42ceea2 
This reverts commit 5bdbfda.
@rmarinho rmarinho restored the net8-main branch December 13, 2022 12:11
rmarinho added a commit that referenced this pull request Dec 13, 2022
@rmarinho
Revert "Merge main to net8 (#12032)" (#12049)
03ee3a0 
This reverts commit 5bdbfda.
@rmarinho rmarinho deleted the net8-main branch December 13, 2022 15:01
@github-actions github-actions bot locked and limited conversation to collaborators Dec 13, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Eilon Eilon Eilon approved these changes

@mattleibow mattleibow Awaiting requested review from mattleibow

Assignees
No one assigned
Labels
area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.