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/9.0.1xx' => 'main' #43326

Merged
merged 398 commits into from
Sep 19, 2024

Conversation

github-actions[bot]
Copy link
Contributor

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

  • marcpopMSFT
  • github-actions[bot]
  • MiYanni
  • manodasanW
  • tmat
  • javiercn
  • dotnet-maestro[bot]
  • dotnet-sb-bot
  • v-wuzhai
  • invalid-email-address
  • mthalman
  • jjonescz
  • v-codyguan
  • Sergio0694
  • Forgind
  • rainersigwald
  • vseanreesermsft
  • MichalPavlik
  • dsplaisted
  • ellahathaway
  • dotnet-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/9.0.1xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/9.0.1xx

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

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

dotnet-maestro bot and others added 30 commits August 29, 2024 12:46
…828.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.11.0-3.24427.13 -> To Version 4.11.0-3.24428.4
…828.8

Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.12.0-3.24427.16 -> To Version 4.12.0-3.24428.8
…0828.6

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.12.0-preview-24427-01 -> To Version 17.12.0-preview-24428-06
…0240828.1

Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab
 From Version 9.0.0-beta.24427.2 -> To Version 9.0.0-beta.24428.1
…0828.8

Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64
 From Version 9.0.0-rc.2.24427.10 -> To Version 9.0.0-rc.2.24428.8
…ld 20240829.1

Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0
 From Version 1.1.0-rc.24427.1 -> To Version 1.1.0-rc.24429.1
…6.12.0.87

Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning
 From Version 6.12.0-preview.1.85 -> To Version 6.12.0-preview.1.87
Progress on #42367

This adds three new parameters to the dotnet workload list command: version, --take, and --format. If version is specified, it will print the most recent `--take` workload sets (within the feature band; default (or if you specify a value < 1) is 5) and output them in --format (which can be json or csv; default (unspecified or other) is to put each version on its own line).

```terminal
> dotnet workload search version
9.0.105
9.0.104
9.0.103
9.0.102
9.0.101
```

```terminal
> dotnet workload search version --format json --take 2
[{ "workloadVersion": "9.0.105"},{ "workloadVersion": "9.0.104" }]
```

### Converting the json output to lines/other formats

#### sh (with jq)
```bash
> dotnet workload search version --format json --take 2 | jq 'map(.workloadVersion) | .[]'
9.0.105
9.0.104
```

#### Powershell core
```powershell
> dotnet workload search version --format json --take 2 | ConvertFrom-Json | ForEach-Object { Write-Host $_.workloadVersion }
9.0.105
9.0.104
```
…darc-release/9.0.1xx-6796712a-f84f-4e2c-9eeb-ec99533ad294
…darc-release/8.0.4xx-5cb8ba0e-3ce7-46ee-8d3c-cd34aa7dba2f
…darc-release/8.0.1xx-885b5ccf-a4f7-43e9-9ac5-b04b4aed280d
…darc-release/8.0.4xx-c4c06c96-a774-4f9a-9db6-46c9fa46cecd
…darc-release/8.0.4xx-ec41b5f3-2e76-454d-b615-033e8de271a1
…darc-release/8.0.3xx-1741877a-60dd-4027-aca4-87f8a7109480
@github-actions github-actions bot requested review from a team, tmat and arkalyanms as code owners September 10, 2024 20:30
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Sep 10, 2024
@v-wuzhai
Copy link
Member

@dotnet/domestic-cat Could you please help with the review?

@marcpopMSFT marcpopMSFT merged commit a4c23bf into main Sep 19, 2024
37 checks passed
@marcpopMSFT marcpopMSFT deleted the merge/release/9.0.1xx-to-main branch September 19, 2024 22:07
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.