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 net8.0 into main #18609

Merged
merged 68 commits into from
Nov 8, 2023
Merged

Merge net8.0 into main #18609

merged 68 commits into from
Nov 8, 2023

Conversation

mattleibow
Copy link
Member

@mattleibow mattleibow commented Nov 8, 2023

Description of Change

Try again! Number 4!

dustin-wojciechowski and others added 30 commits October 12, 2023 12:34
…n debug and release configs. (#17833)

* Updated integration test to check for app-sandbox and network.client entitlements in debug config as well for maui-blazor.

* Added app-sandbox and network.client entitlements to both debug and release entitlement plists for maui-blazor and maui-mobile templates for MacCatalyst. get-task-allow is commented out for debug for maui-mobile but is not for maui-blazor.

* Removed unnecessary space

* Merged debug and release entitlement plists, edition conditionals in csproj

* Removed unnecessary items from csproj
This was to see if anything particularly unexpected happens due to making the templates have Nullable=enable by looking to see what happens in relatively large/complex projects. The conclusion is that it all seems to be just fine.
To used the very latest builds, I updated locally:

    <!-- dotnet/installer -->
    -<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rtm.23506.1</MicrosoftDotnetSdkInternalPackageVersion>
    +<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rtm.23513.4</MicrosoftDotnetSdkInternalPackageVersion>
    <!-- dotnet/runtime -->
    -<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rtm.23509.5</MicrosoftNETCoreAppRefPackageVersion>
    +<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rtm.23513.17</MicrosoftNETCoreAppRefPackageVersion>
    <!-- xamarin-android -->
    -<MicrosoftAndroidSdkWindowsPackageVersion>34.0.12</MicrosoftAndroidSdkWindowsPackageVersion>
    +<MicrosoftAndroidSdkWindowsPackageVersion>34.0.25</MicrosoftAndroidSdkWindowsPackageVersion>

Before updating the profile, an average of 10 runs on a Pixel 5 of a
`dotnet new maui` app:

    Average(ms): 557.9
    Std Err(ms): 1.73493515728975
    Std Dev(ms): 5.48634668973808

After updating the profile:

    Average(ms): 551.3
    Std Err(ms): 2.82075639973867
    Std Dev(ms): 8.92001494767058

These are even better numbers than we got in 2d8cf28. It's possible we
slightly beat .NET 7 now, I'll test.
Co-authored-by: Rui Marinho <me@ruimarinho.net>
* Fix wrong Layout from hidden CollectionView

* Applied some changes
This bug was introduced by #17069,
but the underlying cause is a bug on WinUI that makes the window blink when
setting `NavigationView.IsPaneVisible = false` (https://microsoft.visualstudio.com/DefaultCollection/OS/_workitems/edit/47131770).

After testing the samples attached on the issues the original commit fixed, this change does not seem to re-introduce those issues.

Fixes #17724
…ild 20231019.9 (#18157)

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8438 -> To Version 17.0.8445

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

Microsoft.iOS.Sdk
 From Version 17.0.8438 -> To Version 17.0.8446

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

Microsoft.tvOS.Sdk
 From Version 17.0.8438 -> To Version 17.0.8446

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

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8445 -> To Version 17.0.8446

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

Microsoft.macOS.Sdk
 From Version 14.0.8438 -> To Version 14.0.8446

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
As reported in #17461, OnPlatform simplification cause some issues
- while used as a Resource (#17461, unable to unit test for now)
- doesn't type convert. On nodes shouldn't be replaced by the Value, but
  an element node (<On Platform="..." Value="Red" /> should generate
<Color x:Key="foo">Red</Color>. right now it only generated "Red"

- fixes #17461
* Update dependencies from https://github.com/xamarin/xamarin-macios build 20231020.16

Microsoft.iOS.Sdk
 From Version 17.0.8446 -> To Version 17.0.8447

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

Microsoft.tvOS.Sdk
 From Version 17.0.8446 -> To Version 17.0.8447

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

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8446 -> To Version 17.0.8447

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

Microsoft.macOS.Sdk
 From Version 14.0.8446 -> To Version 14.0.8447

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

Microsoft.iOS.Sdk
 From Version 17.0.8446 -> To Version 17.0.8448

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

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8446 -> To Version 17.0.8448

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

Microsoft.macOS.Sdk
 From Version 14.0.8446 -> To Version 14.0.8448

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

Microsoft.tvOS.Sdk
 From Version 17.0.8446 -> To Version 17.0.8448

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

Microsoft.iOS.Sdk
 From Version 17.0.8446 -> To Version 17.0.8450

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

Microsoft.tvOS.Sdk
 From Version 17.0.8446 -> To Version 17.0.8450

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

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8446 -> To Version 17.0.8450

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

Microsoft.macOS.Sdk
 From Version 14.0.8446 -> To Version 14.0.8450

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

Microsoft.tvOS.Sdk
 From Version 17.0.8446 -> To Version 17.0.8451

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

Microsoft.macOS.Sdk
 From Version 14.0.8446 -> To Version 14.0.8451

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

Microsoft.iOS.Sdk
 From Version 17.0.8446 -> To Version 17.0.8451

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

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8446 -> To Version 17.0.8451

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…0231020.10 (#18224)

Microsoft.AspNetCore.Authentication.Facebook , Microsoft.AspNetCore.Authentication.Google , Microsoft.AspNetCore.Authentication.MicrosoftAccount , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Forms , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.Components.WebView , Microsoft.AspNetCore.Metadata , Microsoft.JSInterop
 From Version 8.0.0-rtm.23518.6 -> To Version 8.0.0-rtm.23520.10

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
The current implementation did not recreate the FormattedText spans when certain properties changed: Font and TextColor
* Update dependencies from https://github.com/xamarin/xamarin-macios build 20231023.1

Microsoft.tvOS.Sdk
 From Version 17.0.8451 -> To Version 17.0.8452

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

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8451 -> To Version 17.0.8452

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

Microsoft.macOS.Sdk
 From Version 14.0.8451 -> To Version 14.0.8452

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

Microsoft.iOS.Sdk
 From Version 17.0.8451 -> To Version 17.0.8452

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

Microsoft.iOS.Sdk
 From Version 17.0.8451 -> To Version 17.0.8453

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

Microsoft.tvOS.Sdk
 From Version 17.0.8451 -> To Version 17.0.8453

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

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8451 -> To Version 17.0.8453

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

Microsoft.macOS.Sdk
 From Version 14.0.8451 -> To Version 14.0.8453

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
When expanding star definitions, the targetSize
parameter contains the padding (which is
removed). However, the calculation for the
the GridMinimum[Width|Height]() also has the
padding which also needs to be removed.

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
…0231023.8 (#18286)

Microsoft.AspNetCore.Authentication.Facebook , Microsoft.AspNetCore.Authentication.Google , Microsoft.AspNetCore.Authentication.MicrosoftAccount , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Forms , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.Components.WebView , Microsoft.AspNetCore.Metadata , Microsoft.JSInterop
 From Version 8.0.0-rtm.23520.10 -> To Version 8.0.0-rtm.23523.8

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

Microsoft.tvOS.Sdk
 From Version 17.0.8453 -> To Version 17.0.8454

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

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8453 -> To Version 17.0.8454

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

Microsoft.macOS.Sdk
 From Version 14.0.8453 -> To Version 14.0.8454

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

Microsoft.iOS.Sdk
 From Version 17.0.8453 -> To Version 17.0.8454

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

Microsoft.tvOS.Sdk
 From Version 17.0.8453 -> To Version 17.0.8455

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

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8453 -> To Version 17.0.8455

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

Microsoft.macOS.Sdk
 From Version 14.0.8453 -> To Version 14.0.8455

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

Microsoft.iOS.Sdk
 From Version 17.0.8453 -> To Version 17.0.8455

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

Microsoft.tvOS.Sdk
 From Version 17.0.8453 -> To Version 17.0.8456

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

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8453 -> To Version 17.0.8456

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

Microsoft.macOS.Sdk
 From Version 14.0.8453 -> To Version 14.0.8456

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

Microsoft.iOS.Sdk
 From Version 17.0.8453 -> To Version 17.0.8456

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

Microsoft.iOS.Sdk
 From Version 17.0.8453 -> To Version 17.0.8457

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

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8453 -> To Version 17.0.8457

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

Microsoft.macOS.Sdk
 From Version 14.0.8453 -> To Version 14.0.8457

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

Microsoft.tvOS.Sdk
 From Version 17.0.8453 -> To Version 17.0.8457

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

Microsoft.iOS.Sdk
 From Version 17.0.8453 -> To Version 17.0.8458

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

Microsoft.tvOS.Sdk
 From Version 17.0.8453 -> To Version 17.0.8458

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

Microsoft.macOS.Sdk
 From Version 14.0.8453 -> To Version 14.0.8458

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

Microsoft.MacCatalyst.Sdk
 From Version 17.0.8453 -> To Version 17.0.8458

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
rmarinho and others added 5 commits November 1, 2023 22:42
* [ci] Bump iOS and Android

* Bum sdk

* Update Version.Details.xml

* Update Versions.props

---------

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
* Update android

* Bump aspnet
@mattleibow mattleibow requested review from a team as code owners November 8, 2023 01:23
@mattleibow mattleibow enabled auto-merge November 8, 2023 01:23
PureWeen
PureWeen previously approved these changes Nov 8, 2023
@mattleibow mattleibow force-pushed the dev/merge-net8.0-into-main branch 3 times, most recently from fcf36d7 to 3e5b59a Compare November 8, 2023 02:21
@mattleibow mattleibow force-pushed the dev/merge-net8.0-into-main branch from 3e5b59a to 25d8d05 Compare November 8, 2023 02:45
@rmarinho
Copy link
Member

rmarinho commented Nov 8, 2023

@Eilon can you approve ?

@rmarinho rmarinho requested a review from Eilon November 8, 2023 12:30
@mattleibow mattleibow merged commit a2ec7ae into main Nov 8, 2023
@mattleibow mattleibow deleted the dev/merge-net8.0-into-main branch November 8, 2023 13:26
@github-actions github-actions bot locked and limited conversation to collaborators Dec 9, 2023
@samhouts samhouts added the fixed-in-8.0.6 Look for this fix in 8.0.6 SR1! label Aug 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
fixed-in-8.0.6 Look for this fix in 8.0.6 SR1!
Projects
None yet
Development

Successfully merging this pull request may close these issues.