Merge net7 #11279
Merged
Merge net7 #11279
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 <mattleibow@live.com>
# 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 <mattleibow@live.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tanay Parikh <TanayParikh@users.noreply.github.com>
* 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
commit 22b3033 Merge: 50866a7 95ee1a3 Author: Matthew Leibowitz <mattleibow@live.com> 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 <jondick@gmail.com> Date: Wed Oct 26 21:22:02 2022 -0400 Bump net6 version for SR7 commit 8edadd3 Author: Rui Marinho <me@ruimarinho.net> 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 <me@ruimarinho.net> Date: Wed Oct 26 17:46:35 2022 +0100 Add Nuget.config feed commit bad3509 Author: GitHub Actions Autoformatter <autoformat@example.com> 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 <mattleibow@live.com>
* 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 <me@ruimarinho.net>
* 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 <shneuvil@microsoft.com> Co-authored-by: Jonathan Dick <jondick@gmail.com> Co-authored-by: Connor Adsit <connor.adsit@gmail.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
* 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 <me@ruimarinho.net>
* 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
* Increase timeout to 240 minutes of azdo stages * Fix pipeline
samhouts
added
the
area-infrastructure
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
Issues Fixed
Fixes #