Skip to content
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.

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

Update ScintillaNET to support modern .NET #1924

Merged
merged 2 commits into from
Jul 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Bonsai.Audio/Bonsai.Audio.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Title>Bonsai - Audio Library</Title>
<Description>Bonsai Audio Library containing modules for sound capture and playback.</Description>
<PackageTags>Bonsai Rx Audio</PackageTags>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="openal.redist" Version="2.0.7" />
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Core.Tests/Bonsai.Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>false</IsPackable>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="**\*.bonsai" />
Expand Down
4 changes: 2 additions & 2 deletions Bonsai.Core/Bonsai.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<Title>Bonsai - Core Library</Title>
<Description>Bonsai Core Library containing base classes and workflow infrastructure.</Description>
<PackageTags>Bonsai Rx Reactive Extensions</PackageTags>
<TargetFrameworks>net462;netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
<RootNamespace>Bonsai</RootNamespace>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageReference Include="Rx-Linq" Version="2.2.5" />
<PackageReference Include="Rx-PlatformServices" Version="2.2.5" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Design.Visualizers/Bonsai.Design.Visualizers.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>Bonsai Visualizers Library containing base visualizer classes and editor infrastructure.</Description>
<PackageTags>Bonsai Rx Visualizers</PackageTags>
<UseWindowsForms>true</UseWindowsForms>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ZedGraph" Version="5.1.7" />
Expand Down
4 changes: 2 additions & 2 deletions Bonsai.Design/Bonsai.Design.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<Description>Bonsai Design Library containing base visualizer classes and editor infrastructure.</Description>
<PackageTags>Bonsai Design Rx Reactive Extensions</PackageTags>
<UseWindowsForms>true</UseWindowsForms>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="jacobslusser.ScintillaNET" Version="3.6.3" />
<PackageReference Include="fernandreu.ScintillaNET" Version="4.2.0" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Dsp.Design/Bonsai.Dsp.Design.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>Bonsai Design Library containing visualizer and editor classes for signal processing data types.</Description>
<PackageTags>Bonsai Rx Dsp Visualizers</PackageTags>
<UseWindowsForms>true</UseWindowsForms>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Bonsai.Design.Visualizers\Bonsai.Design.Visualizers.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Dsp/Bonsai.Dsp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>Bonsai Dsp Library containing reactive algorithms for digital signal processing.</Description>
<PackageTags>Bonsai Rx Dsp Signal Processing</PackageTags>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OpenCV.Net" Version="3.4.2" />
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Osc/Bonsai.Osc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Title>Bonsai - Osc Library</Title>
<Description>Bonsai Osc Library containing reactive infrastructure to interface with devices using the Open Sound Control protocol.</Description>
<PackageTags>Bonsai Rx Osc</PackageTags>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Bonsai.System\Bonsai.System.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
<Description>Bonsai Design Library containing editor classes for expression scripting in Bonsai.</Description>
<PackageTags>Bonsai Rx Scripting Expressions Design</PackageTags>
<UseWindowsForms>true</UseWindowsForms>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="jacobslusser.ScintillaNET" Version="3.6.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bonsai.Design\Bonsai.Design.csproj" />
<ProjectReference Include="..\Bonsai.Scripting.Expressions\Bonsai.Scripting.Expressions.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Title>Bonsai - Expression Scripting Library</Title>
<Description>Bonsai Scripting Library containing expression scripting infrastructure for Bonsai.</Description>
<PackageTags>Bonsai Rx Scripting Expressions</PackageTags>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Linq.Dynamic" Version="1.0.7" />
Expand Down
5 changes: 1 addition & 4 deletions Bonsai.Shaders.Design/Bonsai.Shaders.Design.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
<Description>Bonsai Design Library containing editor classes for shader configuration.</Description>
<PackageTags>Bonsai Rx Shaders Design Graphics OpenGL</PackageTags>
<UseWindowsForms>true</UseWindowsForms>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="jacobslusser.ScintillaNET" Version="3.6.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bonsai.Design\Bonsai.Design.csproj" />
<ProjectReference Include="..\Bonsai.Shaders\Bonsai.Shaders.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Shaders.Rendering/Bonsai.Shaders.Rendering.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Title>Bonsai - Shaders Rendering Library</Title>
<Description>Bonsai Shaders Rendering Library containing modules for rendering complex 3D scenes.</Description>
<PackageTags>Bonsai Rx Shaders Rendering Assets Graphics OpenGL</PackageTags>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AssimpNet" Version="4.1.0" />
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Shaders/Bonsai.Shaders.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Title>Bonsai - Shaders Library</Title>
<Description>Bonsai Shaders Library containing modules for dynamic control of shader primitives.</Description>
<PackageTags>Bonsai Rx Shaders Graphics OpenGL</PackageTags>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OpenCV.Net" Version="3.4.2" />
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.StarterPack/Bonsai.StarterPack.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>

<!--
This warning basically happens because this package has no assemblies but does have dependencies
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.System.Design/Bonsai.System.Design.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>Bonsai Design Library containing editor classes for IO and other system configurations.</Description>
<PackageTags>Bonsai Rx Reactive Extensions IO Resources Design</PackageTags>
<UseWindowsForms>true</UseWindowsForms>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Bonsai.Design\Bonsai.Design.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.System.Tests/Bonsai.System.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>false</IsPackable>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.System/Bonsai.System.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Title>Bonsai - System Library</Title>
<Description>Bonsai System Library containing reactive infrastructure to interface with the underlying operating system.</Description>
<PackageTags>Bonsai Rx Reactive Extensions IO Serial Port Resources</PackageTags>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Vision.Design/Bonsai.Vision.Design.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>Bonsai Design Library containing visualizer and editor classes for image processing types.</Description>
<PackageTags>Bonsai Rx Vision Visualizers</PackageTags>
<UseWindowsForms>true</UseWindowsForms>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OpenTK.GLControl" Version="3.1.0" />
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Vision/Bonsai.Vision.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Title>Bonsai - Vision Library</Title>
<Description>Bonsai Vision Library containing reactive algorithms for computer vision and image processing.</Description>
<PackageTags>Bonsai Rx Image Processing Computer Vision</PackageTags>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OpenCV.Net" Version="3.4.2" />
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Windows.Input/Bonsai.Windows.Input.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>Bonsai Windows Library containing reactive interfaces to the standard operating system input devices.</Description>
<PackageTags>Bonsai Rx Windows Input</PackageTags>
<UseWindowsForms>true</UseWindowsForms>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Bonsai.Core\Bonsai.Core.csproj" />
Expand Down