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' => 'release/8.0.4xx' #44037

Merged
merged 107 commits into from
Oct 10, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Oct 9, 2024

I detected changes in the release/8.0.3xx branch which have not been merged yet to release/8.0.4xx. I'm a robot and am configured to help you automatically keep release/8.0.4xx up to date, so I've opened this PR.

This PR merges commits made on release/8.0.3xx by the following committers:

  • mmitche
  • vseanreesermsft
  • nagilson
  • dotnet-maestro[bot]
  • marcpopMSFT
  • dotnet-bot
  • v-wuzhai

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 release/8.0.4xx
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/sdk HEAD:merge/release/8.0.3xx-to-release/8.0.4xx
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/8.0.3xx-to-release/8.0.4xx

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

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.

Mirroring and others added 30 commits August 6, 2024 20:31
…3 repositories

This pull request updates the following dependencies

[marker]: <> (Begin:1adb2556-0120-43d1-c468-08dc11e32ec2)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 1adb2556-0120-43d1-c468-08dc11e32ec2
- **Build**: 20240816.2
- **Date Produced**: August 16, 2024 7:13:25 PM UTC
- **Commit**: 5ef9b9449afda303871855df529a3ea2ac7a9bbd
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.9 to 8.0.9][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.9 to 8.0.9][3]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.9-servicing.24413.4 to 8.0.9-servicing.24416.2][3]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.9-servicing.24413.4 to 8.0.9-servicing.24416.2][3]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.8-servicing.24366.7 to 8.0.9-servicing.24416.4][4]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC286a1780eb7cedf1d441d19dd9e91396bcb84eee&targetVersion=GC5ef9b9449afda303871855df529a3ea2ac7a9bbd&_a=files
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC883fc207bb50622d4458ff09ae6a62548783826a&targetVersion=GCf0d6934ff6cfe796b114fbc4cce13fb2ce79668f&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1adb2556-0120-43d1-c468-08dc11e32ec2)

[marker]: <> (Begin:911684f3-0faa-4fc9-de45-08dc11e85c3a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 911684f3-0faa-4fc9-de45-08dc11e85c3a
- **Build**: 20240816.3
- **Date Produced**: August 16, 2024 7:27:15 PM UTC
- **Commit**: 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][5]
  - **dotnet-user-jwts**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][5]
  - **dotnet-user-secrets**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][5]
  - **Microsoft.AspNetCore.Analyzers**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][5]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.9 to 8.0.9][5]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][5]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.9 to 8.0.9][5]
  - **Microsoft.AspNetCore.Authorization**: [from 8.0.9 to 8.0.9][5]
  - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][5]
  - **Microsoft.AspNetCore.Components.Web**: [from 8.0.9 to 8.0.9][5]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][5]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][5]
 ...
Add System.Diagnostics.EventLog to CPM

Cherry-picked from commit `f423d4b6`.
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:471db9b4-49ec-4921-de46-08dc11e85c3a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 471db9b4-49ec-4921-de46-08dc11e85c3a
- **Build**: 20240815.9
- **Date Produced**: August 16, 2024 2:25:38 AM UTC
- **Commit**: 3c8202d88deea14a87c7665190286d2a67e464c0
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **System.Diagnostics.EventLog**: [from 8.0.0 to 8.0.1][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5535e31a712343a63f5d7d796cd874e563e5ac14&targetVersion=GC3c8202d88deea14a87c7665190286d2a67e464c0&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:471db9b4-49ec-4921-de46-08dc11e85c3a)
…otnet-runtime build 20240831.6

Microsoft.Extensions.DependencyModel , 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.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Diagnostics.EventLog , System.Text.Json , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0
 From Version 8.0.1 -> To Version 8.0.2

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100
 From Version 8.0.9 -> To Version 8.0.9 (parent: Microsoft.NETCore.App.Runtime.win-x64
…otnet-aspnetcore build 20240903.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.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0
 From Version 8.0.9-servicing.24416.3 -> To Version 8.0.10-servicing.24453.5
…otnet-aspnetcore build 20240903.12

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.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0
 From Version 8.0.10-servicing.24453.5 -> To Version 8.0.10-servicing.24453.12
…904.3

dotnet-format
 From Version 6.4.525606 -> To Version 6.4.545403
dotnet-maestro bot and others added 19 commits October 4, 2024 12:42
…003.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.10.0-3.24453.2 -> To Version 4.10.0-3.24503.14
…925.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24463.3 -> To Version 8.0.0-beta.24475.3
…004.5

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.24503.14 -> To Version 4.10.0-3.24504.5
…004.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24504.2
…004.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24504.2
…0241008.7

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.307-servicing.24502.5 -> To Version 8.0.307-servicing.24508.7
@github-actions github-actions bot force-pushed the merge/release/8.0.3xx-to-release/8.0.4xx branch from 36741a7 to f0b0912 Compare October 9, 2024 18:35
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Oct 9, 2024
@github-actions github-actions bot requested a review from a team as a code owner October 9, 2024 19:34
@nagilson nagilson merged commit e383a9f into release/8.0.4xx Oct 10, 2024
17 checks passed
@nagilson nagilson deleted the merge/release/8.0.3xx-to-release/8.0.4xx branch October 10, 2024 00:13
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.

7 participants