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 branch 'release/9.0' => 'release/9.0-staging' #111565

Merged
merged 74 commits into from
Jan 18, 2025

Conversation

carlossanlop
Copy link
Member

@carlossanlop carlossanlop commented Jan 18, 2025

###MERGE COMMIT!

This is the only manual PR intended from base to staging. It should be automated after this is merged since we updated the interbranch flow: #111549

cc @steveisok @hoyosjs

rzikm and others added 30 commits August 28, 2024 15:50
# Description

Use explicit full-path for loading MsQuic.dll - it prevents accidental load of MsQuic.dll from another unintended directory (e.g. CWD = Current Working Directory) if the bundled MsQuic.dll fails to load (which can happen e.g. on WinServer 2012, where MsQuic is not supported).

# Customer Impact

Defense-in-depth

# Regression

No

# Testing

Targeted manual test on affected OS (Windows Server 2012), including self-contained and single-file publish scenarios.

# Risk

Low, changes are contained and have been thoroughly tested manually and in CI suite.
…bstract array types

Jagged arrays in the payload can contain cycles. In that scenario, no value is correct for `ArrayRecord.FlattenedLength`, and `ArrayRecord.GetArray` does not have enough context to know how to handle the cycles. To address these issues, jagged array handling is simplified so that calling code can handle the cycles in the most appropriate way for the application.

Single-dimension arrays can be represented in the payload using abstract types such as `IComparable[]` where the concrete element type is not known. When the concrete element type is known, `ArrayRecord.GetArray` could return either `SZArrayRecord<ClassRecord>` or `SZArrayRecord<object>`; without a concrete type, we need to return something that represents the element abstractly.

1. `ArrayRecord.FlattenedLength` is removed from the API
2. `ArrayRecord.GetArray` now returns `ArrayRecord[]` for jagged arrays instead of trying to populate them
3. `ArrayRecord.GetArray` now returns `SZArrayRecord<SerializationRecord>` for single-dimension arrays instead of either `SZArrayRecord<ClassRecord>` or `SZArrayRecord<object>`
vseanreesermsft and others added 9 commits January 10, 2025 09:52
* Fix Encoding regression

* Feedback addressing

* Fix the test

---------

Co-authored-by: Tarek Mahmoud Sayed <[email protected]>
[manual] Merge release/9.0-staging into release/9.0
[manual] Merge release/9.0-staging into release/9.0 (second pass)
…, libClang.so is no longer found in the place we expect. As a result, the android aot offsets won't be generated and the dedicated CI leg will fail. (dotnet#111426)

This change fixes the path.
…net#111467)

* Support generic fields in PersistedAssemblyBuilder

* Add the pragmas for unused fields

* Add the pragmas for unused fields 2

* Fix test for the non-generic case

* Re-use existing GetOriginalMemberIfConstructedType()

---------

Co-authored-by: Steve Harter <[email protected]>
Update DIA to 17.12.0-beta1.24603.5

----
#### AI description  (iteration 1)
#### PR Classification
Dependency update

#### PR Summary
This pull request updates the version of the `MicrosoftDiaSymReaderNative` dependency.
- `eng/Versions.props`: Updated `MicrosoftDiaSymReaderNativeVersion` to `17.12.0-beta1.24603.5`.

Co-authored-by: Mirroring <[email protected]>
Co-authored-by: Tom McDonald <[email protected]>
@dotnet-issue-labeler dotnet-issue-labeler bot added needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners new-api-needs-documentation labels Jan 18, 2025
Copy link

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

1 similar comment
Copy link

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow and removed new-api-needs-documentation needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jan 18, 2025
@carlossanlop
Copy link
Member Author

/ba-g build timeouts and test bad exits.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants