[automated] Merge branch 'vs17.0' => 'main'#6978

ladipro merged 2 commits into

dotnet:maindotnet/msbuild:mainfrom

dotnet-maestro-bot:merge/vs17.0-to-maindotnet-maestro-bot/msbuild:merge/vs17.0-to-mainCopy head branch name to clipboard