[net9.0] Merge main into net9.0
#23890
Merged
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
* Generate Android 7 round icon * Add images * Fix the paths * regen images
# Conflicts: # src/SingleProject/Resizetizer/test/UnitTests/BaseTest.cs
* Change default BlazorWebView address to localhost on iOS/MacCatalyst * Update BlazorWebView.cs * Update BlazorWebView.cs * Update BlazorWebView.cs
* Update dependencies from https://github.com/dotnet/xharness build 20240617.3 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.24312.3 -> To Version 9.0.0-prerelease.24317.3 * Update dependencies from https://github.com/dotnet/xharness build 20240626.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.24312.3 -> To Version 9.0.0-prerelease.24326.1 * Update dependencies from https://github.com/dotnet/xharness build 20240704.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.24312.3 -> To Version 9.0.0-prerelease.24354.1 * Update dependencies from https://github.com/dotnet/xharness build 20240708.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.24312.3 -> To Version 9.0.0-prerelease.24358.1 * Update dependencies from https://github.com/dotnet/xharness build 20240716.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.24312.3 -> To Version 9.0.0-prerelease.24366.1 * Update dependencies from https://github.com/dotnet/xharness build 20240724.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.24312.3 -> To Version 9.0.0-prerelease.24374.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
# Conflicts: # eng/Version.Details.xml
# Conflicts: # .config/dotnet-tools.json # eng/Version.Details.xml # eng/Versions.props
# Conflicts: # Directory.Build.props # eng/Version.Details.xml # eng/Versions.props # eng/common/post-build/publish-using-darc.ps1 # eng/common/templates-official/job/publish-build-assets.yml # eng/common/templates-official/job/source-build.yml # eng/common/templates-official/jobs/source-build.yml # eng/common/templates-official/post-build/post-build.yml # eng/common/templates-official/steps/enable-internal-runtimes.yml # eng/common/templates-official/steps/execute-sdl.yml # eng/common/templates-official/steps/get-delegation-sas.yml # eng/common/templates-official/steps/get-federated-access-token.yml # eng/common/templates/job/publish-build-assets.yml # eng/common/templates/job/source-build.yml # eng/common/templates/jobs/source-build.yml # eng/common/templates/post-build/post-build.yml # eng/common/templates/post-build/setup-maestro-vars.yml # eng/common/templates/steps/enable-internal-runtimes.yml # eng/common/templates/steps/execute-sdl.yml # eng/common/templates/steps/get-delegation-sas.yml # eng/common/templates/steps/get-federated-access-token.yml # eng/pipelines/common/ui-tests-build-sample.yml # global.json
samhouts
added
the
fixed-in-net9.0-nightly
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
Merge main into net9.0