Skip to content

Merging release/9.3 branch into main #6082

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 13 commits into from
Mar 11, 2025
Merged

Merging release/9.3 branch into main #6082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
092d941
Merged PR 48132: Flowing dependencies and getting ready for 9.3 release
joperezr Mar 5, 2025
be25c10
Merged PR 48137: Force EF Sqlite down to version 9.0.2 in the MEAI.Te…
jeffhandley Mar 5, 2025
9fea0aa
Update IChatClient to support multiple return messages
stephentoub Mar 6, 2025
4c789c9
Merged PR 48177: Update IChatClient to support multiple return messages
stephentoub Mar 6, 2025
3ebaddf
Merged PR 48215: ME.AI.Eval retain preview branding
RussKie Mar 10, 2025
6883e99
Merged PR 48250: [internal/release/9.3] Fix report generation
Mar 10, 2025
5ebe949
Address M.E.VectorData feedback for IEmbeddingGenerator (#6058)
stephentoub Mar 10, 2025
c2f0174
Merged PR 48268: Address M.E.VectorData feedback for IEmbeddingGenera…
stephentoub Mar 10, 2025
f663faf
Fix grouping of ChatResponseUpdate into ChatMessage (#6074)
SteveSandersonMS Mar 11, 2025
f1f17e6
Merged PR 48301: Fix grouping of ChatResponseUpdate into ChatMessage …
stephentoub Mar 11, 2025
2272b89
Merge Internal Changes
joperezr Mar 11, 2025
1b362f2
Merging internal changes (#6081)
joperezr Mar 11, 2025
cd557a7
Merge branch 'release/9.3' into main
joperezr Mar 11, 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
82 changes: 37 additions & 45 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-704f7cb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-9/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-8/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-7/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-15/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-14/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-13/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-12/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-11/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-10/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-b96167f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-b96167fb-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-25ef4aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-68c7e19" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-68c7e194/nuget/v3/index.json" />
<add key="darc-int-dotnet-efcore-68c7e19-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-68c7e194-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-efcore-68c7e19-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-68c7e194-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-efcore-d009555" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d0095554/nuget/v3/index.json" />
<add key="darc-int-dotnet-efcore-d009555-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d0095554-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-efcore-d009555-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d0095554-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-80aa709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-80aa709-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-80aa709-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-15/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-80aa709-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-14/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-80aa709-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-12/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-80aa709-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-10/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-831d23e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-831d23e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-831d23e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-1584e49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-1584e49-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
Expand Down Expand Up @@ -63,30 +59,26 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-704f7cb-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-10" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-11" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-12" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-13" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-14" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-15" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-3" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-4" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-5" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-6" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-7" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-8" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-9" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb" value="true" />
<add key="darc-int-dotnet-aspnetcore-b96167f-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-25ef4aa" value="true" />
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-68c7e19-1" value="true" />
<add key="darc-int-dotnet-efcore-68c7e19-2" value="true" />
<add key="darc-int-dotnet-efcore-68c7e19" value="true" />
<add key="darc-int-dotnet-efcore-d009555-1" value="true" />
<add key="darc-int-dotnet-efcore-d009555-2" value="true" />
<add key="darc-int-dotnet-efcore-d009555" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-80aa709-10" value="true" />
<add key="darc-int-dotnet-runtime-80aa709-12" value="true" />
<add key="darc-int-dotnet-runtime-80aa709-14" value="true" />
<add key="darc-int-dotnet-runtime-80aa709-15" value="true" />
<add key="darc-int-dotnet-runtime-80aa709-2" value="true" />
<add key="darc-int-dotnet-runtime-80aa709" value="true" />
<add key="darc-int-dotnet-runtime-831d23e-1" value="true" />
<add key="darc-int-dotnet-runtime-831d23e-2" value="true" />
<add key="darc-int-dotnet-runtime-831d23e" value="true" />
<add key="darc-int-dotnet-runtime-1584e49-1" value="true" />
<add key="darc-int-dotnet-runtime-1584e49-2" value="true" />
<add key="darc-int-dotnet-runtime-1584e49" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
24 changes: 5 additions & 19 deletions eng/MSBuild/ProjectStaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,6 @@
<!-- Preview packages: do not use stable branding and do not warn about lack of [Experimental] -->
<SuppressFinalPackageVersion Condition="'$(Stage)' == 'preview'">true</SuppressFinalPackageVersion>
<NoWarn Condition="'$(Stage)' == 'preview'">$(NoWarn);LA0003</NoWarn>

<!-- Amend the description based on stage -->
<Description Condition="'$(Stage)' == 'dev'">Experimental package. $(Description)</Description>
<Description Condition="'$(Stage)' == 'obsolete'">Obsolete Package. $(Description)</Description>
</PropertyGroup>

<PropertyGroup>
<!--
Makes it such that the package version won't be stabilized even when the rest of the repo is going stable.
https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Versioning.md#package-version
-->
<SuppressFinalPackageVersion />
<SuppressFinalPackageVersion Condition="'$(Stage)' == 'dev' or '$(Stage)' == 'preview'">true</SuppressFinalPackageVersion>
</PropertyGroup>

<!-- Produce errors if we don't have all the right properties defined -->
Expand All @@ -35,11 +22,10 @@
<Error Condition="'$(MinMutationScore)' != 'n/a' AND ('$(MinMutationScore)' &lt; 50)" Text="MinMutationScore property must be >= 50 for normal stage." />
</Target>

<Target Name="_ValidateVersion" AfterTargets="GenerateNuspec" Condition="'$(Stage)' == 'dev' or '$(Stage)' == 'preview'">
<PropertyGroup>
<_ExpectedVersionSuffix>$(_PreReleaseLabel)$(_BuildNumberLabels)</_ExpectedVersionSuffix>
</PropertyGroup>
<!-- Amend the description based on stage -->
<PropertyGroup>
<Description Condition="'$(Stage)' == 'dev'">Experimental package. $(Description)</Description>
<Description Condition="'$(Stage)' == 'obsolete'">Obsolete Package. $(Description)</Description>
</PropertyGroup>

<Error Condition=" '$(VersionSuffix)' != '$(_ExpectedVersionSuffix)' " Text="Unexpected package version suffix. Expected suffix for '$(Stage)' stage: '$(_ExpectedVersionSuffix)', received: '$(VersionSuffix)'." />
</Target>
</Project>
Loading
Loading