Skip to content
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

[automated] Merge branch 'release/8.0.3xx' => 'main' #39786

Merged
merged 153 commits into from
Apr 19, 2024

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/8.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/8.0.3xx by the following committers:

  • marcpopMSFT
  • baronfel
  • invalid-email-address
  • v-wuzhai
  • dotnet-maestro[bot]
  • dotnet-bot
  • JL03-Yue
  • Forgind
  • dsplaisted
  • nagilson
  • jeffkl
  • github-actions[bot]

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/8.0.3xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/8.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/sdk HEAD:merge/release/8.0.3xx-to-main
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/8.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/8.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/8.0.3xx-to-main main
git pull https://github.com/dotnet-maestro-bot/sdk merge/release/8.0.3xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/sdk HEAD:merge/release/8.0.3xx-to-main
or if you are using SSH
git checkout -b merge/release/8.0.3xx-to-main main
git pull git@github.com:dotnet-maestro-bot/sdk merge/release/8.0.3xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/8.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.

baronfel and others added 30 commits March 6, 2024 10:11
…mage.Interface.cs

Co-authored-by: Rainer Sigwald <raines@microsoft.com>
Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 7.0.0-preview.24164.2 -> To Version 7.0.0-preview.24164.4
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.10.0-3.24164.1 -> To Version 4.10.0-3.24164.3
This PR should enable installing and updating via workload sets. In particular, if you have mode set to workload sets (and don't use a rollback file), it will now look for the latest workload set (or latest stable if you don't specify to use previews) and install/update to that rather than updating manifests individually.

It now also supports dotnet workload update --version x where it will update the workload set version x.

Finally, it now will display the workload set it is using if it's set to use workload sets in the install state file when the user runs dotnet workload list.

All functionality was manually tested at some point, and there's a new unit test.
dotnet-maestro bot and others added 10 commits March 28, 2024 13:10
…0328.7

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.10.0-preview-24177-05 -> To Version 17.11.0-preview-24178-07
…240327.7

Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI
 From Version 17.10.0-preview-24170-01 -> To Version 17.10.0-release-24177-07
…327.10

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.11.0-1.24176.16 -> To Version 4.11.0-1.24177.10
…327.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24176.8 -> To Version 8.0.0-beta.24177.1
…39720)

[release/8.0.3xx] Update dependencies from dotnet/templating
[release/8.0.3xx] Update dependencies from dotnet/razor
@v-wuzhai v-wuzhai force-pushed the merge/release/8.0.3xx-to-main branch from 628ad20 to c68dc87 Compare April 1, 2024 06:56
@v-wuzhai v-wuzhai force-pushed the merge/release/8.0.3xx-to-main branch from c8bba37 to 43f3248 Compare April 1, 2024 07:38
@v-wuzhai
Copy link
Member

v-wuzhai commented Apr 1, 2024

@Forgind @dsplaisted would you be able to review these changes? Thanks!

@nagilson
Copy link
Member

nagilson commented Apr 1, 2024

I was surprised to see workload vm testing had not made it to main yet, not sure why this codeflow took so long to generate

@v-wuzhai
Copy link
Member

v-wuzhai commented Apr 2, 2024

Waiting for the code flow from #39573 to first be integrated into the main branch.

@MiYanni
Copy link
Member

MiYanni commented Apr 12, 2024

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@marcpopMSFT
Copy link
Member

C:\h\w\9FF208F4\t\dotnetSdkTests\ikyiv2ra.lys\ItCanBuildWit---0E92473C\MSBuildSdk\MSBuildSdk.csproj : error MSB4014: The build stopped unexpectedly because of an internal failure.
C:\h\w\9FF208F4\t\dotnetSdkTests\ikyiv2ra.lys\ItCanBuildWit---0E92473C\MSBuildSdk\MSBuildSdk.csproj : error MSB4014: Microsoft.Build.BackEnd.SdkResolution.SdkResolverException: The SDK resolver "Microsoft.DotNet.MSBuildSdkResolver" failed while attempting to resolve the SDK "Microsoft.Build.Artifacts". Exception: "System.IO.FileNotFoundException: Could not load file or assembly 'Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. The system cannot find the file specified.
C:\h\w\9FF208F4\t\dotnetSdkTests\ikyiv2ra.lys\ItCanBuildWit---0E92473C\MSBuildSdk\MSBuildSdk.csproj : error MSB4014: File name: 'Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'

@marcpopMSFT
Copy link
Member

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@MiYanni MiYanni merged commit edc51ee into dotnet:main Apr 19, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants