Skip to content

Commit 9f874a1

Browse files
colombodcolombod
committed
update
1 parent 6039f81 commit 9f874a1

13 files changed

Lines changed: 44 additions & 58 deletions

File tree

‎dotnetInteractiveExtensions.sln‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "lobe.InteractiveExtension",
2020
EndProject
2121
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data.Analysis.InteractiveExtension", "src\Data.Analysis.InteractiveExtension\Data.Analysis.InteractiveExtension.csproj", "{4CEF8D0B-D884-4DEA-A7FF-DE86F2F9F939}"
2222
EndProject
23-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DuckDB.InteractiveExtension", "src\DuckDB.InteractiveExtension\DuckDB.InteractiveExtension.csproj", "{D6175D0B-0081-4B6A-AFBD-A1D1F69487C7}"
24-
EndProject
25-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DuckDB.InteractiveExtension.Tests", "src\DuckDB.InteractiveExtension.Tests\DuckDB.InteractiveExtension.Tests.csproj", "{871EB7AE-24D9-41A4-A2FF-3895B9FC17F1}"
26-
EndProject
2723
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SandDance.InteractiveExtension.Tests", "src\SandDance.InteractiveExtension.Tests\SandDance.InteractiveExtension.Tests.csproj", "{EEE21697-836A-4FC4-AB25-80D6E6DB40E3}"
2824
EndProject
2925
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data.Analysis.InteractiveExtension.Tests", "src\Data.Analysis.InteractiveExtension.Tests\Data.Analysis.InteractiveExtension.Tests.csproj", "{049378CC-F499-4CD5-B9E4-537B11830605}"
@@ -66,14 +62,6 @@ Global
6662
{4CEF8D0B-D884-4DEA-A7FF-DE86F2F9F939}.Debug|Any CPU.Build.0 = Debug|Any CPU
6763
{4CEF8D0B-D884-4DEA-A7FF-DE86F2F9F939}.Release|Any CPU.ActiveCfg = Release|Any CPU
6864
{4CEF8D0B-D884-4DEA-A7FF-DE86F2F9F939}.Release|Any CPU.Build.0 = Release|Any CPU
69-
{D6175D0B-0081-4B6A-AFBD-A1D1F69487C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70-
{D6175D0B-0081-4B6A-AFBD-A1D1F69487C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
71-
{D6175D0B-0081-4B6A-AFBD-A1D1F69487C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
72-
{D6175D0B-0081-4B6A-AFBD-A1D1F69487C7}.Release|Any CPU.Build.0 = Release|Any CPU
73-
{871EB7AE-24D9-41A4-A2FF-3895B9FC17F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74-
{871EB7AE-24D9-41A4-A2FF-3895B9FC17F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
75-
{871EB7AE-24D9-41A4-A2FF-3895B9FC17F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
76-
{871EB7AE-24D9-41A4-A2FF-3895B9FC17F1}.Release|Any CPU.Build.0 = Release|Any CPU
7765
{EEE21697-836A-4FC4-AB25-80D6E6DB40E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7866
{EEE21697-836A-4FC4-AB25-80D6E6DB40E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
7967
{EEE21697-836A-4FC4-AB25-80D6E6DB40E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -88,7 +76,6 @@ Global
8876
EndGlobalSection
8977
GlobalSection(NestedProjects) = preSolution
9078
{E8D06DD3-47C6-4D5F-AFB8-CF9AD2804D25} = {20C4282E-81DE-47F2-838A-C820F746C04A}
91-
{871EB7AE-24D9-41A4-A2FF-3895B9FC17F1} = {20C4282E-81DE-47F2-838A-C820F746C04A}
9279
{EEE21697-836A-4FC4-AB25-80D6E6DB40E3} = {20C4282E-81DE-47F2-838A-C820F746C04A}
9380
{049378CC-F499-4CD5-B9E4-537B11830605} = {20C4282E-81DE-47F2-838A-C820F746C04A}
9481
EndGlobalSection

‎src/Data.Analysis.InteractiveExtension.Tests/Data.Analysis.InteractiveExtension.Tests.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<NoWarn>$(NoWarn);8002;VSTHRD002;VSTHRD200</NoWarn>
66
<!-- Assent isn't strongly signed -->
@@ -10,14 +10,14 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="FluentAssertions" Version="6.9.0" />
13-
<PackageReference Include="Assent" Version="2.1.0" />
14-
<PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
16-
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.24530.1" />
17-
<PackageReference Include="Microsoft.DotNet.Interactive.CSharp" Version="1.0.0-beta.24530.1" />
18-
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.24530.1" />
19-
<PackageReference Include="xunit" Version="2.4.2" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
13+
<PackageReference Include="Assent" Version="2.3.2" />
14+
<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
16+
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.25070.1" />
17+
<PackageReference Include="Microsoft.DotNet.Interactive.CSharp" Version="1.0.0-beta.25070.1" />
18+
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.25070.1" />
19+
<PackageReference Include="xunit" Version="2.9.3" />
20+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>

‎src/Data.Analysis.InteractiveExtension/Data.Analysis.InteractiveExtension.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.Data.Analysis" Version="0.21.0" />
26-
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.24530.1" />
27-
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.24530.1" />
25+
<PackageReference Include="Microsoft.Data.Analysis" Version="0.22.1" />
26+
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.25070.1" />
27+
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.25070.1" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎src/DataView.InteractiveExtension/DataView.InteractiveExtension.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.24530.1" />
26-
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.24530.1" />
27-
<PackageReference Include="Microsoft.ML.DataView" Version="3.0.0" />
25+
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.25070.1" />
26+
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.25070.1" />
27+
<PackageReference Include="Microsoft.ML.DataView" Version="4.0.1" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎src/DotLanguage.InteractiveExtension/DotLanguage.InteractiveExtension.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.24530.1" />
26-
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.24530.1" />
25+
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.25070.1" />
26+
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.25070.1" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

‎src/DotLanguage.InteractiveExtension/DotLanguageKernel.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public override KernelSpecifierDirective KernelSpecifierDirective
4242

4343
public Task HandleAsync(SubmitCode command, KernelInvocationContext context)
4444
{
45-
var layoutEngine = LayoutEngine.dot;
4645
command.Parameters.TryGetValue("--width", out var width);
4746
if (string.IsNullOrWhiteSpace(width))
4847
{
@@ -58,7 +57,7 @@ public Task HandleAsync(SubmitCode command, KernelInvocationContext context)
5857
{
5958
layoutEngineString = "dot";
6059
}
61-
layoutEngine = Enum.Parse<LayoutEngine>(layoutEngineString, true);
60+
var layoutEngine = Enum.Parse<LayoutEngine>(layoutEngineString, true);
6261

6362

6463
var code = GenerateHtml(command.Code, new Uri("https://cdn.jsdelivr.net/npm/@hpcc-js/wasm@1.16.1/dist/index.min.js", UriKind.Absolute), new Uri("https://cdn.jsdelivr.net/npm/@hpcc-js/wasm@1.16.1/dist", UriKind.Absolute), "1.16.1", _cacheBuster, width, height, layoutEngine);
@@ -72,7 +71,7 @@ private IHtmlContent GenerateHtml(string commandCode, Uri libraryUri, Uri wasmFo
7271
string cacheBuster, string? width, string? height, LayoutEngine layoutEngine)
7372
{
7473
var requireUri = new Uri("https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js");
75-
var divId = $"hppc_{Guid.NewGuid().ToString("N")}";
74+
var divId = $"hppc_{Guid.NewGuid():N}";
7675
var code = new StringBuilder();
7776
var renderingFunctionName = $"loadHpcc_{divId}";
7877
code.AppendLine("<div>");

‎src/DuckDB.InteractiveExtension/KernelExtension.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static void Load(Kernel kernel)
1414

1515
KernelInvocationContext.Current?.Display(
1616
new HtmlString(@"<details><summary>Query DuckDB databases.</summary>
17-
<p>This extension adds support for connecting to <a href=""https://duckdb.org/"">DuckDB</a> databases using the <code>#!connect duckdb</code> magic command. ADO.NET support via <a href=""https://github.com/Giorgi/DuckDB.NET"">DuckDB.NET</a> project</p>
17+
<p>This extension adds support for connecting to <a href=""https://duckdb.org/"">DuckDB</a> databases using the <code>#!connect duckdb</code> magic command.
1818
</details>"),
1919
"text/html");
2020
}

‎src/ImageSharp.InteractiveExtension/ImageSharp.InteractiveExtension.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<PackageVersion>0.0.1</PackageVersion>
66
<IsPackable>true</IsPackable>
77
<PackageProjectUrl>https://github.com/colombod/dotnet-interactive-extension-lab</PackageProjectUrl>
@@ -21,9 +21,9 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.24530.1" />
25-
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.24530.1" />
26-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
24+
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.25070.1" />
25+
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.25070.1" />
26+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

‎src/OpenCvSharp4.InteractiveExtension/OpenCvSharp4.InteractiveExtension.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.24530.1" />
26-
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.24530.1" />
27-
<PackageReference Include="OpenCvSharp4" Version="4.9.0.20240103" />
25+
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.25070.1" />
26+
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.25070.1" />
27+
<PackageReference Include="OpenCvSharp4" Version="4.10.0.20241108" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎src/SandDance.InteractiveExtension.Tests/SandDance.InteractiveExtension.Tests.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<NoWarn>$(NoWarn);8002;VSTHRD002;VSTHRD200</NoWarn>
77
<!-- Assent isn't strongly signed -->
@@ -11,14 +11,14 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="FluentAssertions" Version="6.9.0" />
14-
<PackageReference Include="Assent" Version="2.1.0" />
15-
<PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
17-
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.24530.1" />
18-
<PackageReference Include="Microsoft.DotNet.Interactive.CSharp" Version="1.0.0-beta.24530.1" />
19-
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.24530.1" />
20-
<PackageReference Include="xunit" Version="2.4.2" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
14+
<PackageReference Include="Assent" Version="2.3.2" />
15+
<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
17+
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.25070.1" />
18+
<PackageReference Include="Microsoft.DotNet.Interactive.CSharp" Version="1.0.0-beta.25070.1" />
19+
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.25070.1" />
20+
<PackageReference Include="xunit" Version="2.9.3" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>

0 commit comments

Comments
 (0)