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/6.0' => 'release/6.0-staging' #104565

Merged

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jul 8, 2024

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

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

  • f-alizada
  • dotnet-maestro[bot]
  • vseanreesermsft

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/6.0
git pull --ff-only
git checkout release/6.0-staging
git pull --ff-only
git merge --no-ff release/6.0

# 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/runtime HEAD:merge/release/6.0-to-release/6.0-staging
or if you are using SSH
git push git@github.com:dotnet/runtime HEAD:merge/release/6.0-to-release/6.0-staging

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/6.0-to-release/6.0-staging'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0-to-release/6.0-staging release/6.0-staging
git pull https://github.com/dotnet/runtime merge/release/6.0-to-release/6.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/runtime HEAD:merge/release/6.0-to-release/6.0-staging
or if you are using SSH
git checkout -b merge/release/6.0-to-release/6.0-staging release/6.0-staging
git pull git@github.com:dotnet/runtime merge/release/6.0-to-release/6.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/runtime HEAD:merge/release/6.0-to-release/6.0-staging

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-bot and others added 16 commits May 2, 2024 00:50
## Description

Since Windows 10 Build 20348, there is a new API to get the temporary files path called [`GetTempPath2`](https://learn.microsoft.com/windows/win32/api/fileapi/nf-fileapi-gettemppath2w). This API returns a directory inaccessible to non-SYSTEM processes if the calling process runs as SYSTEM, and [it is recommended to call this function instead of `GetTempPath`](https://learn.microsoft.com/windows/win32/api/fileapi/nf-fileapi-gettemppathw#remarks).

This PR tries to find `GetTempPath2A` / `GetTempPath2W` and uses that, otherwise it falls back to `GetTempPathA` / `GetTempPathW`.

*Note:* this PR removes an unused function called `WszGetTempPath` that which referenced GetTempPathW

## Customer Impact

- [ ] Customer reported
- [X] Found internally

This was found by code inspection.

## Regression

- [ ] Yes
- [X] No

## Testing

PR validation

## Risk

Low

Cherry picked from !40221

Cherry-picked from commit `c845a53e`.
CHILD: .NET CORE | ElevationOfPrivilege: Microsoft.IO.Redist part (and a build fix)

It turned out that https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/pullrequest/39614 was incomplete and caused a build break. The code was compiling fine for the default config (.NET 6), but not Full Framework, which includes Microsoft.IO.Redist which compiles the affected files.

I could not use exact same fix for Framework as for 6.0 as the code was using umanaged function pointers and causing error CS8889, so I've applied the same fix I did for Full Framework.
Co-authored-by: Farhad Alizada <falizada@microsoft.com>
@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jul 8, 2024
vseanreesermsft and others added 4 commits July 9, 2024 10:43
…-merge-6.0-2024-07-09-1042-98fecf81-edc8-4572-91c4-980c898d80b1
…24-07-09-1042-98fecf81-edc8-4572-91c4-980c898d80b1

Merging internal commits for release/6.0
…03.1 (#104631)

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.32 -> To Version 6.0.33

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…710.7 (#104747)

Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 6.0.0-beta.24266.4 -> To Version 6.0.0-beta.24360.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@carlossanlop carlossanlop merged commit 50f436d into release/6.0-staging Jul 15, 2024
138 of 155 checks passed
@carlossanlop carlossanlop deleted the merge/release/6.0-to-release/6.0-staging branch July 15, 2024 20:29
@github-actions github-actions bot locked and limited conversation to collaborators Aug 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants