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

[release/9.0] Merging changes from main into release branch for November release #5602

Merged
merged 14 commits into from
Nov 6, 2024

Conversation

joperezr
Copy link
Member

@joperezr joperezr commented Nov 5, 2024

cc: @stephentoub @mgravell

This is cherry-picking changes made on main branch after the snap for M.E.AI and HybridCache.

PRs that are getting merged are:

Microsoft Reviewers: Open in CodeFlow

stephentoub and others added 13 commits November 5, 2024 10:24
* Add NativeAOT testapp project for M.E.AI

* Address PR feedback
…otnet#5582)

* Lower AIJsonUtilities to STJv8 and move to Abstractions library.

* Add README.md
…t#5590)

* Plug JsonSchemaExporter test data to the AIJsonUtilities tests

* Update src/LegacySupport/DiagnosticAttributes/README.md

* Update src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Schema.cs

* Address feedback.
* Improve JsonSchemaExporter trimmer safety.

* Remove var

* Address feedback.

* Remove DynamicallyAccessedMemberTypes.All

* Extract reflection helpers into separate file and remove a number of warning suppressions.

* Re-enable failing tests that were patched in .NET 9
- Add a strongly-typed Enumerator
- Add a TryAdd method
- Add a DebuggerDisplay for Count
- Add a DebuggerTypeProxy for the collection of properties
* Add UseEmbeddingGenerationOptions

Counterpart to UseChatOptions

* Document/test null options returned from callback
* - handle serialization failures
- enforce payload quota
- enforce key validity
- add proper logging (infrastructure failure: needs attn)

# Conflicts:
#	src/Libraries/Microsoft.Extensions.Caching.Hybrid/Microsoft.Extensions.Caching.Hybrid.csproj

* - add "callback" to .dic
- log deserialization failures
- expose serialization failures
- tests for serialization logging scenarios

* support and tests for stability despite unreliable L2

* nit

* Compile for NS2.0

* include enabled check in our log output

* add event-source tracing and counters

* explicitly specify event-source guid

* satisfy the stylebot overloads

* nix SDT

* fix failing CI test

* limit to net462

* PR feedback (all except event tests)

* naming

* add event source tests

* fix redundant comment

* add clarification

* more clarifications

* dance for our robot overlords

* drop Microsoft.Extensions.Telemetry.Abstractions package-ref

* fix glitchy L2 test

* better tracking for invalid event-source state

* reserve non-printable characters from keys, to prevent L2 abuse

* improve test output for ETW

* tyop

* ETW tests: allow longer if needed

* whitespace

* more ETW fixins

---------

Co-authored-by: Jose Perez Rodriguez <joperezr@microsoft.com>
@joperezr joperezr requested review from a team as code owners November 5, 2024 18:33
@joperezr
Copy link
Member Author

joperezr commented Nov 5, 2024

This should be merged and not squashed.

@stephentoub
Copy link
Member

I skimmed through and it looks good to me. If #5603 looks good to you, could we also cherry-pick that one? Thanks!

Copy link
Member

@mgravell mgravell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved re Caching.Hybrid

@joperezr joperezr merged commit d468173 into dotnet:release/9.0 Nov 6, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants