Skip to content

Conversation

@dotnet-maestro-bot
Copy link

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:

  • dotnet-maestro[bot]
  • v-wuzhai
  • marcpopMSFT
  • lbussell

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.

merge button instructions

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.

git fetch
git checkout release/7.0.3xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/7.0.3xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/core-sdk HEAD:merge/release/7.0.3xx-to-main
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/core-sdk HEAD:merge/release/7.0.3xx-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

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.

git checkout -b merge/release/7.0.3xx-to-main main
git pull https://github.com/dotnet-maestro-bot/core-sdk merge/release/7.0.3xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/core-sdk HEAD:merge/release/7.0.3xx-to-main
or if you are using SSH
git checkout -b merge/release/7.0.3xx-to-main main
git pull git@github.com:dotnet-maestro-bot/core-sdk merge/release/7.0.3xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/core-sdk HEAD:merge/release/7.0.3xx-to-main

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.

marcpopMSFT and others added 27 commits January 13, 2023 15:42
…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)
@dotnet-maestro-bot dotnet-maestro-bot requested a review from a team as a code owner February 4, 2023 00:35
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/7.0.3xx-to-main branch from 50ba0db to 7347226 Compare February 4, 2023 00:35
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
dotnet-maestro bot and others added 3 commits February 4, 2023 02:02
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
@v-wuzhai v-wuzhai force-pushed the merge/release/7.0.3xx-to-main branch from a8f03a9 to 1cee656 Compare February 6, 2023 03:06
@v-wuzhai v-wuzhai merged commit d25a3bb into dotnet:main Feb 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants