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.

Sign up for GitHub

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

Jump to bottom

[automated] Merge branch 'vs16.11' => 'main' #6476

Merged
merged 8 commits into from
Jun 1, 2021
Merged

[automated] Merge branch 'vs16.11' => 'main' #6476

merged 8 commits into from
Jun 1, 2021

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the vs16.11 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 vs16.11 by the following committers:

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 vs16.11
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff vs16.11

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

@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on vs16.11 by the following committers:

@rainersigwald
Use packaged C# compiler (dotnet#6431)
0d1f270 
This avoids diffs in the genapi-generated public interface that are happening
because of changes in generated code for records in Roslyn 3.10.
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on vs16.11 by the following committers:

@Forgind
Switch to File.OpenRead (dotnet#6393)
1c6e7ad 
Context
The precomputed cache from dotnet/installer#10037 lives in Program Files after it's installed on a new computer. Program Files can only be accessed with admin privileges, which not all users have and those that have generally wouldn't expect. This permits reading the precomputed cache even without admin rights.

Changes Made
new FileStream(stateFile, FileMode.Open) opens the file as if you had read/write access but only actually grants you read permissions. It still requires administrator privileges, however, if a file requires administrator privileges to write to. This removes that requirement.
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on vs16.11 by the following committers:

@Forgind
Remove KeyPair deserialization (dotnet#6395)
c1d3185 
Fixes dotnet#6389

Context
Strong Name Key Pairs aren't available on .NET 6+, and although it's fine to serialize null and remember that's what it is, deserializing involves assigning null to something that shouldn't exist, which is throwing an error, invalidating all RAR caches.

This fixes that problem.

Changes Made
No longer serialize or deserialize a null value for KeyPair.

Testing
Allowed precomputed cache to function properly. (Local test only)
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on vs16.11 by the following committers:

@Forgind Forgind added the merge-when-branch-open PRs that are approved, except that there is a problem that means we are not merging stuff right now. label May 24, 2021
@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs16.11, but I could not automatically push those to merge/vs16.11-to-main to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

5 similar comments
@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs16.11, but I could not automatically push those to merge/vs16.11-to-main to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs16.11, but I could not automatically push those to merge/vs16.11-to-main to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs16.11, but I could not automatically push those to merge/vs16.11-to-main to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs16.11, but I could not automatically push those to merge/vs16.11-to-main to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@dotnet-maestro-bot
Copy link
Contributor Author

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to vs16.11, but I could not automatically push those to merge/vs16.11-to-main to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

@Forgind Forgind merged commit f9c4fd3 into dotnet:main Jun 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Forgind Forgind Forgind approved these changes

Assignees
No one assigned
Labels
merge-when-branch-open PRs that are approved, except that there is a problem that means we are not merging stuff right now.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dotnet-maestro-bot @Forgind @ladipro @cdmihai @rainersigwald