Merging internal changes into the release/10.6 branch#7523
Merged
Conversation
**SQUASH COMMIT** **UPDATE COMMIT MESSAGE TO "_Prepare 10.6 release_" WHEN MERGING** **CLEAR OUT THE DETAILED COMMIT MESSAGE WHEN MERGING** Note that the internal/release/10.6 branch already has a commit for preparing the internal branch. This PR updates dependencies.
Merging the latest changes from `release/10.6` into `internal/release/10.6` to pick up: - dotnet#7520: [release/10.6] Graduate HostedFileContent.SizeInBytes and HostedFileContent.CreatedAt This is a no-ff merge to keep the public/internal branches in sync. ---- #### AI description (iteration 1) #### PR Classification API stabilization: Promoting experimental properties to stable by removing `[Experimental]` attributes and simplifying implementation. #### PR Summary This PR stabilizes the `SizeInBytes` and `CreatedAt` properties of `HostedFileContent` by removing their experimental status and internal backing implementations. Test files are updated to suppress experimental warnings for remaining experimental features (`Purpose` and `Scope`) rather than globally. - `HostedFileContent.cs`: Simplified `SizeInBytes` and `CreatedAt` properties by removing `[Experimental]` attributes, `[JsonIgnore]`, and internal backing fields (`SizeInBytesCore`, `CreatedAtCore`) - `HostedFileContentTests.cs`: Added targeted `#pragma warning disable MEAI001` suppressions for experimental `Purpose` and `Scope` properties while removing the global suppression - `Microsoft.Extensions.AI.Abstractions.json`: Updated API stage from "Experimental" to "Stable" for `CreatedAt` and `SizeInBytes` properties - `ImageGenerationOptionsTests.cs`: Added targeted warning suppressions for experimental `IImageGenerator` and `ImageGenerationResponseFormat.Hosted` usages - `Microsoft.Extensions.AI.Stabilization.Tests.csproj`: Added `HostedFileContentTests.cs` and `ImageGenerationOptionsTests.cs` to stabilization test suite <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
Restores Directory.Build.props, NuGet.config, azure-pipelines.yml, and eng/pipelines/templates/BuildAndTest.yml to the state on upstream/release/10.6. These changes are internal-only and should not flow to the public release branch. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merging internal changes from
internal/release/10.6intorelease/10.6for the 10.6.0 release.Important
Please merge this PR with the "Create a merge commit" option (no-ff). Do NOT squash.
The internal tip commit (
c8437bc222c86c535ef6d763468d655737b1261d) is what we shipped and is tagged asv10.6.0; squashing would rewrite that commit and break the tag.Microsoft Reviewers: Open in CodeFlow