Merge net7 to main #11202
Merged
Merge net7 to main #11202
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # eng/Version.Details.xml # eng/Versions.props
Co-authored-by: Matthew Leibowitz <[email protected]>
# Conflicts: # eng/Version.Details.xml # eng/Versions.props
# Conflicts: # eng/Versions.props
* 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>
# Conflicts: # eng/Versions.props
# Conflicts: # eng/Version.Details.xml # eng/Versions.props
* 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]>
* Add Shell Parts to AOT Profile * - second aot run * - sort * - blazor profile
# 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
* 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
# Conflicts: # eng/Versions.props
Co-authored-by: Craig Dunn <[email protected]>
Co-authored-by: Rui Marinho <[email protected]>
* 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]>
* 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
# 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
# Conflicts: # eng/Versions.props
Eilon
added
the
area-infrastructure
* Increase timeout to 240 minutes of azdo stages * Fix pipeline
|
If we squash merge this we lose the net7 history. |
Redth
approved these changes
Nov 11, 2022
samhouts
added
the
fixed-in-8.0.0-preview.1.7762
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
Merging net7.0 branch to main