Skip to content

Merging changes from the internal fork #6508

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

Merged
merged 6 commits into from
Jun 11, 2025
Merged

Merging changes from the internal fork #6508

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f2a3fd
Merged PR 50646: Getting ready for the 9.6 Release
joperezr Jun 5, 2025
7f20a52
Fix name of genai input/output tokens tag (#6494)
stephentoub Jun 7, 2025
20e8e09
Merged PR 50699: [release/9.6] Fix name of genai input/output tokens …
jeffhandley Jun 8, 2025
0629e19
Merged PR 50714: Port 6500 and 6501 to internal/release/9.6
stephentoub Jun 10, 2025
f58862a
Merge commits from internal
joperezr Jun 10, 2025
2481e9e
Fix template tests
joperezr Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/ProjectTemplates/GeneratedContent.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
- Use specific version numbers to pin to already-released packages
-->
<PropertyGroup>
<TemplatePackageVersion_MicrosoftExtensionsAI>$(Version)</TemplatePackageVersion_MicrosoftExtensionsAI>
<TemplatePackageVersion_MicrosoftExtensionsAI_Preview>$(Version)</TemplatePackageVersion_MicrosoftExtensionsAI_Preview>
<TemplatePackageVersion_MicrosoftExtensionsHttpResilience>$(Version)</TemplatePackageVersion_MicrosoftExtensionsHttpResilience>
<TemplatePackageVersion_MicrosoftExtensionsAI>9.6.0</TemplatePackageVersion_MicrosoftExtensionsAI>
<TemplatePackageVersion_MicrosoftExtensionsAI_Preview>9.6.0-preview.1.25310.2</TemplatePackageVersion_MicrosoftExtensionsAI_Preview>
<TemplatePackageVersion_MicrosoftExtensionsHttpResilience>9.6.0</TemplatePackageVersion_MicrosoftExtensionsHttpResilience>
Copy link
Member

Choose a reason for hiding this comment

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

This is just for the release/9.6 branch I guess?

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct, this will be undone on the PR against main.

</PropertyGroup>

<!-- External dependency packages -->
Expand Down
Loading