Skip to content

Restore Scriptoria bump on net10 #2650

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
caohai merged 2 commits into from
Apr 9, 2026
+10 −7
Merged

Restore Scriptoria bump on net10 #2650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d9c79a
Restore Scriptoria bump on net10
caohai Apr 6, 2026
4bce8d7
Override Microsoft.Bcl.Memory to 10.0.5
caohai Apr 9, 2026
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
9 changes: 5 additions & 4 deletions Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,11 @@
<PackageReference Update="SkiaSharp" Version="2.88.6" />
<PackageReference Update="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.6" Condition="$([MSBuild]::IsOsPlatform('Linux'))" />
<PackageReference Update="TextCopy" Version="6.2.1" />
<PackageReference Update="Microsoft.SemanticKernel" Version="1.46.0" />
<PackageReference Update="Microsoft.SemanticKernel" Version="1.71.0" />

<PackageReference Update="OpenAI" Version="2.2.0-beta.4" />
<PackageReference Update="System.ClientModel" Version="1.5.1" />
<PackageReference Update="OpenAI" Version="2.7.0" />
<PackageReference Update="Microsoft.Bcl.Memory" Version="10.0.5" />
<PackageReference Update="System.ClientModel" Version="1.8.1" />
</ItemGroup>

<!-- When updating version of Dependencies in the below section, please also update the version in the following files:
Expand Down Expand Up @@ -91,4 +92,4 @@
<ItemGroup>
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>
</Project>
</Project>
Binary file modified bin/ref/Scriptoria.dll
View file
Open in desktop
Binary file not shown.
Binary file modified bin/ref/ScriptoriaCommonDefs.dll
View file
Open in desktop
Binary file not shown.
Binary file modified bin/ref/SqlCopilotCommon.dll
View file
Open in desktop
Binary file not shown.
Binary file modified bin/ref/SqlScriptoria.dll
View file
Open in desktop
Binary file not shown.
Binary file modified bin/ref/SqlScriptoriaCommon.dll
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions src/Microsoft.SqlTools.Connectors.VSCode/Microsoft.SqlTools.Connectors.VSCode.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
</ItemGroup>

<ItemGroup Label="Package references">
<PackageReference Include="Microsoft.Bcl.Memory" />
<PackageReference Include="Microsoft.SemanticKernel" />
<PackageReference Include="OpenAI" />
<PackageReference Include="System.ClientModel" />
Expand Down
4 changes: 4 additions & 0 deletions src/Microsoft.SqlTools.ServiceLayer/Copilot/CopilotConversationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ private async Task InitConversation(CopilotConversation conversation)
services.AddSingleton<ICartridgeDataAccess>((sp) => sqlService!);
services.AddSingleton<ICartridgeListener>((sp) => sqlService!);
services.AddSingleton<ITokenRateLimiter, TokenRateLimiter>();
services.AddSingleton<IToolsetFactory, ToolsetFactory>();

// Register VS Code-specific minion LLM invoker that uses DirectRequest to prevent streaming to users
// This is used by minions (AccessChecker, KnowledgeLibrarian, etc.) via dependency injection
Expand Down Expand Up @@ -229,6 +230,9 @@ private async Task InitConversation(CopilotConversation conversation)
{
CartridgeExperience = CartridgeExperienceKeyNames.VSCode_MSSQL_TsqlEditorChat,
ContextSettings = new Dictionary<string, string>()
{
{ SqlExecutionContextKeys.EnableAgentsMd, "no" }
}
};
await _executionContext.LoadExecutionContextAsync(cartridgeContextSettings, sqlService!, CancellationToken.None);

Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.SqlTools.ServiceLayer/Microsoft.SqlTools.ServiceLayer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
</ItemGroup>

<ItemGroup>
<Reference Include="SqlCopilotCommon">
<HintPath>..\..\bin\ref\SqlCopilotCommon.dll</HintPath>
</Reference>
<Reference Include="ScriptoriaCommonDefs">
<HintPath>..\..\bin\ref\ScriptoriaCommonDefs.dll</HintPath>
</Reference>
Expand Down
Loading