[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' #33067
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
…0518.3 Microsoft.Build , Microsoft.Build.Localization From Version 17.4.3 -> To Version 17.4.4
Backport of dotnet#32426 Context: https://aka.ms/maui-support-policy Context: dotnet/android#8030 For out-of-support .NET 6 MAUI projects, we'd like to emit the warning: Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.EolTargetFrameworks.targets(35,5): warning NETSDK1202: The workload 'android' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/maui-support-policy for more information about the support policy. Where each optional workload can opt into this warning via `AutoImport.props`: <ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) "> <EolWorkload Include="android" Url="https://aka.ms/maui-support-policy" /> </ItemGroup> We would add to this MSBuild item group in the `android`, `ios`, `macos`, `maccatalyst`, `tvos` and `maui` workloads. In the future, `wasm-tools` could opt into the warning and leave `%(Url)` blank if desired. Customers can opt out of the warning in their `.csproj` by either: <PropertyGroup> <CheckEolWorkloads>false</CheckEolWorkloads> </PropertyGroup> <ItemGroup> <EolWorkload Remove="android" /> </ItemGroup> See dotnet/android#8030 for the exact changes we'd make in optional workloads.
…519.1 dotnet-format From Version 7.0.357101 -> To Version 7.0.426901
…519.3 dotnet-format From Version 7.0.357101 -> To Version 7.0.426903
…519.5 dotnet-format From Version 7.0.357101 -> To Version 7.0.426905
…519.10 dotnet-format From Version 7.0.357101 -> To Version 7.1.426910
dotnet-maestro-bot
force-pushed
the
merge/release/7.0.1xx-to-release/7.0.3xx
branch
from
5ffc9c8
to
7f0590e
Compare
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
v-wuzhai
force-pushed
the
merge/release/7.0.1xx-to-release/7.0.3xx
branch
from
ceeea5b
to
132c38c
Compare
|
@jonathanpeppers would you be able to review these changes please? |
marcpopMSFT
approved these changes
Jun 7, 2023
|
@dotnet/sdk-container-builds-maintainers a bunch of containers tests failed with the same error: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I detected changes in the release/7.0.1xx branch which have not been merged yet to release/7.0.3xx. I'm a robot and am configured to help you automatically keep release/7.0.3xx up to date, so I've opened this PR.
This PR merges commits made on release/7.0.1xx by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/7.0.1xx-to-release/7.0.3xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.