[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #28367
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
…f supported targets.
… run on 17.4 and up
…uild 20220930.1 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.3.4-beta1.22476.2 -> To Version 3.3.4-beta1.22480.1
…uild 20220930.2 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.3.4-beta1.22476.2 -> To Version 3.3.4-beta1.22480.2
…uild 20221001.1 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.3.4-beta1.22476.2 -> To Version 3.3.4-beta1.22501.1
…0221003.8 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22479.5 -> To Version 7.0.100-rtm.22503.8
…uild 20221003.1 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.3.4-beta1.22476.2 -> To Version 3.3.4-beta1.22503.1
…uild 20221003.2 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.3.4-beta1.22476.2 -> To Version 3.3.4-beta1.22503.2
…0221003.18 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22479.5 -> To Version 7.0.100-rtm.22503.18
…a2af-5d6e-48c0-9192-09daaa881ed5 [release/7.0.1xx] Update dependencies from dotnet/roslyn-analyzers
…0823-d35d-4e65-ae06-021bf6b2f2d1 [release/7.0.1xx] Update dependencies from dotnet/templating
…0221003.5 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22501.6 -> To Version 7.0.0-rtm.22503.5
…6.4.0.107 NuGet.Build.Tasks From Version 6.4.0-preview.3.100 -> To Version 6.4.0-preview.3.107
…0221003.10 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22501.6 -> To Version 7.0.0-rtm.22503.10
…0221003.15 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22501.6 -> To Version 7.0.0-rtm.22503.15
…uild 20221004.1 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.3.4-beta1.22503.2 -> To Version 3.3.4-beta1.22504.1
…nals build 20221003.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22463.5 -> To Version 7.0.0-alpha.1.22503.1
…0221004.2 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22503.18 -> To Version 7.0.100-rtm.22504.2
…ce48-f37e-41bd-bb5b-cd2a03b21a38 [release/7.0.1xx] Update dependencies from dotnet/roslyn-analyzers
…5798-8a80-4ba7-9147-f5f2e0de7e7d [release/7.0.1xx] Update dependencies from dotnet/aspnetcore
…1fe8-0c83-4f3e-9079-df7304506ffc [release/7.0.1xx] Update dependencies from nuget/nuget.client
…c7af-36da-4eec-acdc-ac5d19d48d21 [release/7.0.1xx] Update dependencies from dotnet/templating
…0221004.5 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22504.2 -> To Version 7.0.100-rtm.22504.5
…0046-6aff-4d68-b82a-44856e824298 [release/7.0.1xx] Update dependencies from dotnet/source-build-externals
…0221004.5 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22503.15 -> To Version 7.0.0-rtm.22504.5
… 17.4. Switching to check msbuild version as that works here though not sure what we do in the future if we truly need vs version.
…960f-f727-45dc-8b76-3cd6003db71a [release/7.0.1xx] Update dependencies from dotnet/templating
…1004.4 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rtm.22480.10 -> To Version 7.0.0-rtm.22504.4
…0221004.25 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22503.15 -> To Version 7.0.0-rtm.22504.25
…0221004.29 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0 From Version 7.0.0-rtm.22503.15 -> To Version 7.0.0-rtm.22504.29
…c3a2-ef28-4b98-85f6-7b3046b40b9d [release/7.0.1xx] Update dependencies from dotnet/aspnetcore
…1443-bc79-4a74-b42c-61cba8a43879 [release/7.0.1xx] Update dependencies from dotnet/runtime
…r bad VSVersion logic. Update the logic to consistently use the three part version (even though it doesn't matter)
…005.9 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.4.0-3.22480.9 -> To Version 4.4.0-3.22505.9
…1005.5 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rtm.22504.4 -> To Version 7.0.0-rtm.22505.5
…005.14 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.4.0-3.22480.9 -> To Version 4.4.0-3.22505.14
…1005.15 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rtm.22504.4 -> To Version 7.0.0-rtm.22505.15
…005.18 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.4.0-3.22480.9 -> To Version 4.4.0-3.22505.18
…nals build 20221005.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22503.1 -> To Version 7.0.0-alpha.1.22505.1
…006.1 dotnet-format From Version 7.0.347901 -> To Version 7.0.350601
…7ebe-da8c-4503-9d88-9eb894868414 [release/7.0.1xx] Update dependencies from dotnet/roslyn
…7658-7937-4f2f-a217-36aec551f4be [release/7.0.1xx] Update dependencies from dotnet/runtime
…38b4-57ec-478b-88f2-47a923e38604 [release/7.0.1xx] Update dependencies from dotnet/source-build-externals
…39f4-9445-46f0-9266-16963d890a27 [release/7.0.1xx] Update dependencies from dotnet/format
dotnet-maestro-bot
requested review from
ericstj,
a team and
joperezr
as code owners
…erty (dotnet#28338) * Add missing EnableRuleAttributesMustMatch task parameter Backport of dotnet#28336 * Update Microsoft.NET.ApiCompat.ValidatePackage.targets
…rtedtargeting Add warning when targeting 7.0 in 17.3 and remove 7.0 from the list of supported targets
# for free
to join this conversation on GitHub.
Already have an account?
# 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.2xx. I'm a robot and am configured to help you automatically keep release/7.0.2xx 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.2xx'. 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.