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

[manual] Merge release/7.0-staging into release/7.0 #91911

Merged
merged 12 commits into from
Sep 12, 2023

Conversation

carlossanlop
Copy link
Member

Merge commit.

DrewScoggins and others added 12 commits August 17, 2023 16:04
…0768)

* Put crossgen perf into "Ubuntu.1804.Amd64.Tiger.Perf". (dotnet#90091)

* Because crossgen need LTTng and 22.04 is not compatible.
* Windows using same queue.

* Remove artifacts of bad merge

* Add 22.04 queue

---------

Co-authored-by: Jiri Cincura ↹ <jiri@cincura.net>
…/7.0-to-release/7.0-staging

[automated] Merge branch 'release/7.0' => 'release/7.0-staging'
…24.2 (dotnet#91083)

Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.11 -> To Version 7.0.11

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…/7.0-to-release/7.0-staging

[automated] Merge branch 'release/7.0' => 'release/7.0-staging'
…31.2 (dotnet#91431)

Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.11 -> To Version 7.0.12

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Revert "Merged PR 26484: Restrict named mutex files permissions"

This reverts commit 7e10421.

* Restore a change to improve backward compatibility
…/7.0-to-release/7.0-staging

[automated] Merge branch 'release/7.0' => 'release/7.0-staging'
… rows in update (dotnet#90172)

* Add test that deletes a custom attribute from a class

* just ignore modified MONO_TABLE_TYPEDEF rows in updates

We may want to validate that Parent, Interfaces and Attributes columns
haven't changed, but it's tricky and might be overly restrictive

* simplify pass1 code.

It's just two branches with comments. Remove the `if` entirely

---------

Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
… System.Net.Http (dotnet#91817)

* [release/7.0-staging] [maccatalyst] Make sure MacProxy is included in System.Net.Http

Backport of dotnet#91473 to release/7.0

* Additional conditions

---------

Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
…r Release (dotnet#90561)

* Microsoft.Windows.Compatibility

* System.DirectoryServices.AccountManagement

* System.Threading.RateLimiting
@ghost
Copy link

ghost commented Sep 12, 2023

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

Issue Details

Merge commit.

Author: carlossanlop
Assignees: carlossanlop
Labels:

Servicing-approved, area-Infrastructure

Milestone: 7.0.x

@carlossanlop carlossanlop merged commit 6aac1e9 into dotnet:release/7.0 Sep 12, 2023
@ghost ghost locked as resolved and limited conversation to collaborators Oct 12, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-Infrastructure Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants