Skip to content

Upgrade Squad.Agents.AI Copilot SDK and MAF bridge #1560

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

Closed
tamirdresher wants to merge 1 commit into from
Closed

Upgrade Squad.Agents.AI Copilot SDK and MAF bridge #1560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
"$(NuGetPackageRoot)/github.copilot.sdk/$(_MicrosoftAgentsAICopilotSdkVersion)/build/GitHub.Copilot.SDK.targets"
and, when $(_MicrosoftAgentsAICopilotSdkVersion) is unset, defaults it to the SDK
version the adapter itself was packed against, its nuspec's dependency FLOOR
(1.0.5 for Microsoft.Agents.AI.GitHub.Copilot 1.14.0-rc1), NOT the version this repo
actually depends on ($(SquadCopilotSdkVersion), i.e. 1.0.7). Left unset, any project
(still 1.0.5 in Microsoft.Agents.AI.GitHub.Copilot 1.15.0-rc1), NOT the version this repo
actually depends on ($(SquadCopilotSdkVersion)). Left unset, any project
that pulls in the adapter WITHOUT a direct PackageReference to GitHub.Copilot.SDK
(test/Squad.Agents.AI.Tests, src/Squad.Agents.AI/samples/Squad.Agents.AI.Sample here,
and any real external NuGet consumer of Squad.Agents.AI) downloads and bundles the
OLDER Copilot CLI build pinned to SDK 1.0.5 (Copilot CLI 1.0.67) instead of the CLI
pinned to SDK 1.0.7 (Copilot CLI 1.0.71); verified against this repo's own CI logs
pinned to this repo's requested SDK / CLI pair; verified against the repo's own CI logs
for PR #1519 (run 29856026557): "Build package" (src/Squad.Agents.AI, which DOES have
the direct PackageReference) downloaded CLI 1.0.71, while "Build tests" and
the direct PackageReference) downloaded the requested CLI, while "Build tests" and
"Build sample" (no direct PackageReference) downloaded CLI 1.0.67, on both
ubuntu-latest and windows-latest.

Expand All @@ -51,14 +51,15 @@
(generated at pack time from this same property, see Squad.Agents.AI.csproj)
unconditionally overwrites it again for real external consumers.

Excluded for the Squad.Agents.AI project itself: it already gets the right SDK
version via its own direct PackageReference to GitHub.Copilot.SDK (whose build/
import happens unconditionally, ahead of the adapter's fallback), so setting the
override there too would just make NuGet import the SAME
github.copilot.sdk/$(SquadCopilotSdkVersion)/build/GitHub.Copilot.SDK.targets file
twice, and MSBuild warns (MSB4011) about the resulting harmless-but-noisy duplicate
import.
This override is applied to the package project itself too because the MAF buildTransitive bridge otherwise
imports the SDK targets a second time using its packaged floor (1.0.5), which can override the direct
reference during target execution. A duplicate-import warning is acceptable; the
important invariant is that every project resolves the same SDK-backed native payload rather than the
adapter's stale floor.


-->
<_MicrosoftAgentsAICopilotSdkVersion Condition="'$(MSBuildProjectName)' != 'Squad.Agents.AI'">$(SquadCopilotSdkVersion)</_MicrosoftAgentsAICopilotSdkVersion>
<_MicrosoftAgentsAICopilotSdkVersion>$(SquadCopilotSdkVersion)</_MicrosoftAgentsAICopilotSdkVersion>
</PropertyGroup>
</Project>

15 changes: 8 additions & 7 deletions src/Squad.Agents.AI/Squad.Agents.AI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageReadmeFile>README.md</PackageReadmeFile>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<!--
Prerelease because Microsoft.Agents.AI.GitHub.Copilot 1.14.0-rc1 (below) is itself a
Prerelease because Microsoft.Agents.AI.GitHub.Copilot 1.15.0-rc1 (below) is itself a
prerelease package. A STABLE Squad.Agents.AI depending on a prerelease package makes
`dotnet pack` emit NU5104 ("A stable release ... should not have a prerelease
dependency"). Prior releases (0.2.0 through 0.5.5) stayed stable and carried that
Expand All @@ -35,7 +35,7 @@
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="Squad.Agents.AI.Tests" />
<PackageReference Include="Microsoft.Agents.AI.GitHub.Copilot" Version="1.14.0-rc1" />
<PackageReference Include="Microsoft.Agents.AI.GitHub.Copilot" Version="1.15.0-rc1" />
<!--
Direct reference to GitHub.Copilot.SDK so its build/ targets fire during our build.
Without this, the SDK's MSBuild download/copy targets only flow to projects with a
Expand All @@ -52,11 +52,11 @@
project (see Directory.Build.props for the full explanation).
-->
<PackageReference Include="GitHub.Copilot.SDK" Version="$(SquadCopilotSdkVersion)" />
<PackageReference Include="Microsoft.Extensions.AI" Version="10.8.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.AI" Version="10.7.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.9" />
</ItemGroup>
<ItemGroup>
<None Include="README.md" Pack="true" PackagePath="\" />
Expand Down Expand Up @@ -134,3 +134,4 @@
</ItemGroup>
</Target>
</Project>

Loading