-
Notifications
You must be signed in to change notification settings - Fork 440
[automated] Merge branch 'release/7.0.3xx' => 'main' #15425
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
v-wuzhai
merged 31 commits into
dotnet:main
from
dotnet-maestro-bot:merge/release/7.0.3xx-to-main
Feb 6, 2023
Merged
[automated] Merge branch 'release/7.0.3xx' => 'main' #15425
v-wuzhai
merged 31 commits into
dotnet:main
from
dotnet-maestro-bot:merge/release/7.0.3xx-to-main
Feb 6, 2023
Conversation
This file contains hidden or 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
…ence-packages build 20230113.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22608.2 -> To Version 7.0.0-alpha.1.23063.1
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23063.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23065.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23065.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23066.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23066.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23067.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23067.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23067.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23067.10 -> To Version 7.0.300-preview.23067.31 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23064.1 -> To Version 12.5.0-beta.23067.1 (parent: Microsoft.NET.Sdk
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23067.10 -> To Version 7.0.300-preview.23068.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.23064.1 -> To Version 12.5.0-beta.23067.1 (parent: Microsoft.NET.Sdk
…123.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23060.4 -> To Version 7.0.0-beta.23073.6
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…into darc-release/7.0.3xx-24373c5d-c29d-41b0-80ef-506b70ac92d5
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23101.10 -> To Version 7.0.300-preview.23101.17 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230131-02 -> To Version 17.6.0-preview-20230201-01 (parent: Microsoft.NET.Sdk
[release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230201-01 to 17.6.0-preview-20230202-01 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.6.0-1.23081.20 to 4.6.0-1.23101.17 (parent: Microsoft.NET.Sdk) - Remove backported source-build razor patch
[release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.5.0-beta.23101.1 to 12.5.0-beta.23103.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23101.1 to 7.0.300-beta.23103.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230202-01 to 17.6.0-preview-20230202-02 (parent: Microsoft.NET.Sdk)
50ba0db to
7347226
Compare
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23103.9 -> To Version 7.0.300-preview.23103.12
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23103.9 -> To Version 7.0.300-preview.23103.15 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23103.1 -> To Version 12.5.0-beta.23103.4 (parent: Microsoft.NET.Sdk
a8f03a9 to
1cee656
Compare
v-wuzhai
approved these changes
Feb 6, 2023
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.3xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on release/7.0.3xx 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.3xx-to-main'. 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.