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 net7 #11279

Merged
merged 316 commits into from
Nov 11, 2022
Merged

Merge net7 #11279

merged 316 commits into from
Nov 11, 2022

Conversation

rmarinho
Copy link
Member

Description of Change

Issues Fixed

Fixes #

mattleibow and others added 30 commits July 15, 2022 01:15
@mattleibow
Make the MAUI package ID be pre.7 (#8737)
513789c
@mattleibow
Merge remote-tracking branch 'origin/main' into net7.0
e2dd61a
@mattleibow
Merge branch 'main' into net7.0
09cc12b 
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
@mattleibow
Merge remote-tracking branch 'origin/main' into net7.0
1887504
@mattleibow
Merge remote-tracking branch 'origin/main' into net7.0
bc26add
@mattleibow
Drop back down to preview 6 (#8773)
cad4cd8
@pjcollins @mattleibow
[workload] Remove Microsoft.Maui.Dependencies pack (#6871)
0d9b032 
Co-authored-by: Matthew Leibowitz <[email protected]>
@mattleibow
Merge branch 'main' into net7.0
e3cd70f
@mattleibow
Merge branch 'main' into net7.0
e7a22a3
@mattleibow
Merge remote-tracking branch 'origin/main' into net7.0
e1c1d39
@mattleibow
Merge branch 'main' into net7.0
d1bdc3e 
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
@mattleibow
Merge remote-tracking branch 'origin/main' into net7.0
9517694 
# Conflicts:
#	eng/Versions.props
@mattleibow
Merge branch 'main' into net7.0
7d580fc
@mattleibow @dotnet-maestro
Update to Preview 7 (#8884)
0119a5e 
* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220719.7 (#8880)

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.906-preview.7 -> To Version 15.4.907-preview.7

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

* Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-preview7-3387f5e16d6a98627fbb3c63bc62d004e3d0d6e7-1 (#8869)

Microsoft.Android.Sdk.Windows
 From Version 33.0.0-preview.6.74 -> To Version 33.0.0-preview.7.97

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.100-preview.6.22316.8 -> To Version 7.0.100-preview.7.22362.31 (parent: Microsoft.Android.Sdk.Windows

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

* Update Tizen workload.

* Add more logging

* Try log the logging

* logging

* Disable interpreter (UseInterpreter=False)

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@mattleibow
Merge branch 'main' into net7.0
e731c38 
# Conflicts:
#	eng/Versions.props
@mattleibow
Merge branch 'main' into net7.0
1742a63 
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
@mattleibow
net7.0 is Preview 7 now
2098748
@mattleibow
Update the .NET 6 Version of MAUI (#8924)
3796b40
@mattleibow
Merge remote-tracking branch 'origin/main' into net7.0
54101ef
@dotnet-maestro @mattleibow @TanayParikh
[net7.0] Update dependencies from dotnet/aspnetcore (#8784)
e004c88 
* Update dependencies from https://github.com/dotnet/aspnetcore build 20220715.8

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 6.0.7 -> To Version 7.0.0-preview.7.22365.8

* Update dependencies from https://github.com/dotnet/aspnetcore build 20220718.5

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 6.0.7 -> To Version 7.0.0-preview.7.22368.5

* Update dependencies from https://github.com/dotnet/aspnetcore build 20220719.2

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 6.0.7 -> To Version 7.0.0-preview.7.22369.2

* Update dependencies from https://github.com/dotnet/aspnetcore build 20220719.8

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 6.0.7 -> To Version 7.0.0-preview.7.22369.8

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220719.7 (#8880)

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.906-preview.7 -> To Version 15.4.907-preview.7

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

* Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-preview7-3387f5e16d6a98627fbb3c63bc62d004e3d0d6e7-1 (#8869)

Microsoft.Android.Sdk.Windows
 From Version 33.0.0-preview.6.74 -> To Version 33.0.0-preview.7.97

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.100-preview.6.22316.8 -> To Version 7.0.100-preview.7.22362.31 (parent: Microsoft.Android.Sdk.Windows

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

* Update Tizen workload.

* Add more logging

* Try log the logging

* logging

* Disable interpreter (UseInterpreter=False)

* Update the Extensions packages

* where TState : notnull

* IChangeToken Nullability Fix (#8937)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matthew Leibowitz <[email protected]>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Tanay Parikh <[email protected]>
@PureWeen
Shell tab aot (#8939)
3596afd 
* Add Shell Parts to AOT Profile

* - second aot run

* - sort

* - blazor profile
@mattleibow
Merge remote-tracking branch 'origin/main' into net7.0
fd960e2 
# Conflicts:
#	Directory.Build.props
#	eng/Version.Details.xml
#	eng/Versions.props
#	src/Controls/Foldable/src/Controls.Foldable.csproj
#	src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj
@mattleibow
Merge remote-tracking branch 'origin/main' into net7.0
b10f7ba
@PureWeen
Generate AOT Profilers for Non Shell based apps (#8941)
15df4ed 
* Add non shell pages to AOT stack

* - AOT Profiles

* - update aot from merge

* - rerun after merge

* - add delay

* - run on physical device

* - remove old page listener
@jfversluis
Make CalendarDatePickerExtensions public (#9038) fixes #8931
7445c6f
@mattleibow
Merge remote-tracking branch 'origin/main' into net7.0
a8dc9b2
@mattleibow
Merge remote-tracking branch 'origin/main' into net7.0
7fee09d 
# Conflicts:
#	eng/Versions.props
@mattleibow
Merge remote-tracking branch 'origin/main' into net7.0
ef39644
@mattleibow
Use the latest .NET version
576ef4d
@mattleibow
net7.0 is now RC 1
7b769f7
mattleibow and others added 24 commits October 27, 2022 12:15
@mattleibow
Merge branch 'main' into net7.0
ee9a2e1
@dotnet-maestro @mattleibow
Squashed commit of the following: (#10942)
c4fea78 
commit 22b3033
Merge: 50866a7 95ee1a3
Author: Matthew Leibowitz <[email protected]>
Date:   Thu Oct 27 11:10:47 2022 +0200

    Merge branch 'net7.0' into darc-net7.0-45fa6a48-68f2-4992-95f2-e40e8e14afd5

commit 50866a7
Author: Jonathan Dick <[email protected]>
Date:   Wed Oct 26 21:22:02 2022 -0400

    Bump net6 version for SR7

commit 8edadd3
Author: Rui Marinho <[email protected]>
Date:   Wed Oct 26 18:55:17 2022 +0100

    Update NuGet.config

commit b7c5411
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 17:48:49 2022 +0000

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

    Microsoft.tvOS.Sdk
     From Version 16.0.1475 -> To Version 16.0.1477

commit 4c57036
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 17:48:09 2022 +0000

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

    Microsoft.iOS.Sdk
     From Version 16.0.1475 -> To Version 16.0.1477

commit 89f722e
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 16:51:31 2022 +0000

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

    Microsoft.tvOS.Sdk
     From Version 16.0.1475 -> To Version 16.0.1476

commit 9dc4a41
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 16:51:01 2022 +0000

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

    Microsoft.iOS.Sdk
     From Version 16.0.1475 -> To Version 16.0.1476

commit dde2135
Author: Rui Marinho <[email protected]>
Date:   Wed Oct 26 17:46:35 2022 +0100

    Add Nuget.config feed

commit bad3509
Author: GitHub Actions Autoformatter <[email protected]>
Date:   Wed Oct 26 16:41:26 2022 +0000

    Auto-format source code

commit 6d56d6c
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 16:40:27 2022 +0000

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

    Microsoft.MacCatalyst.Sdk
     From Version 15.4.2370 -> To Version 15.4.2371

commit 2da2d4d
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Wed Oct 26 16:40:10 2022 +0000

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

    Microsoft.macOS.Sdk
     From Version 12.3.2370 -> To Version 12.3.2371

Co-authored-by: Matthew Leibowitz <[email protected]>
@mattleibow @rmarinho
Dispose empty sets and try/catch exceptions (#10955)
c94e11e 
Workaround for xamarin/xamarin-macios#13704
@mattleibow
Update .NET 6 MAUI version (#10962)
b7eb8c1
@dotnet-maestro @rmarinho
[net7.0] Update dependencies from xamarin/xamarin-macios (#10959)
5d57117 
* Update dependencies from https://github.com/xamarin/xamarin-macios build 20221027.8

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

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

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

* Update NuGet.config

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

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

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

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

* Update NuGet.config

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Rui Marinho <[email protected]>
@etvorun @mattleibow
Design time converters should return TRUE for CanConvertFrom(typeof(s…
033bc87 
…tring)) (#10969)
@mattleibow
Update Microsoft.Maui-mac.slnf (#10954)
e433fb3
@mattleibow
Merge branch 'main' into net7.0
e9f8ac6
@mattleibow
Merge AndroidX from main
a8186c0
@rmarinho @PureWeen
@Redth @cadsit
Cherry pick net7 (#11056)
ad91996 
* Fix Author Name (#11015)

* Add await for color check to avoid crash (#11022)

* Remove unused reference (#11048)

* Invoke provisionator with AUTH_TOKEN_GITHUB_COM set (#11041)

# Conflicts:
#	eng/pipelines/common/provision.yml

Co-authored-by: Shane Neuville <[email protected]>
Co-authored-by: Jonathan Dick <[email protected]>
Co-authored-by: Connor Adsit <[email protected]>
@rmarinho
Continue if provisionator fails (#11068) (#11081)
6ded1cb 
* Continue if provisionator fails

* Try not fail with agent-cleanser

* Centralize the agent-cleanser

* Remove extra   agent-cleanser

* agent-cleanser is on provisionator.yml now
@jfversluis @conceptdev
[foldable] XML doc additions (#10972) (#11091)
02a4d8e 
Co-authored-by: Craig Dunn <[email protected]>
@github-actions @rmarinho
Bump provisionator task to version 2 (#11095)
1803dce 
Co-authored-by: Rui Marinho <[email protected]>
@jfversluis @rmarinho
Extract Maps, Graphics & Foldable docs during build (#10909) (#11142)
fae4c51 
* Extract Maps, Graphics & Foldable docs during build (#10909)

* Extract Maps and Graphics docs during build

* Update dotnet.cake

* Add Foldable & Markdig

* Update Controls.Foldable.csproj

* Fix MarkDig

* Update Graphics.Skia.csproj

* Update dotnet.cake

* Update dotnet.cake

* Update dotnet.cake

* Fix bad merge on provisionator version

Co-authored-by: Rui Marinho <[email protected]>
@rmarinho
Ignore Authenticate Reunion NuGet sources - net7 (#11150)
e91a855 
* Ignore Authenticate Reunion NuGet sources (#11145)

* Ignore Authenticate Reunion NuGet sources

* Try install .net after provisioning run

* Fix identation
# Conflicts:
#	eng/pipelines/common/provision.yml

* Fix bad merge on provisionator version
@rmarinho
Merge branch 'net7.0' into merge-net7
f930c40 
# Conflicts:
#	eng/Versions.props
#	eng/pipelines/common/provision.yml
#	src/Controls/Foldable/src/Controls.Foldable.csproj
#	src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml
#	src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj
#	src/Essentials/src/Platform/PlatformUtils.android.cs
#	src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
#	src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj
@rmarinho
Merge branch 'bump-analyzer' into merge-net7
16b6171 
# Conflicts:
#	eng/Versions.props
@rmarinho
Fix more api warnings
197dfe8
@rmarinho
Merge branch 'main' into merge-net7
5dfd606
@rmarinho
Fix more warnings
a5f1fe9
@rmarinho
We hope last warnings
c49a86d
@rmarinho
Increase timeout to 240 minutes of azdo stages (#11226)
6c15e16 
* Increase timeout to 240 minutes of azdo stages

* Fix pipeline
@rmarinho
Merge branch 'net7.0' into merge-net7
e78fa1e
@rmarinho
Merge branch 'copy-main' into merge-net7
bb996a9
@rmarinho rmarinho marked this pull request as ready for review November 11, 2022 11:59
@rmarinho rmarinho requested a review from a team as a code owner November 11, 2022 11:59
@rmarinho rmarinho merged commit 22a7cc9 into copy-main Nov 11, 2022
@rmarinho rmarinho deleted the merge-net7 branch November 11, 2022 15:46
@samhouts samhouts added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Jul 20, 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.
Reviewers
No reviews
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.