-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #219 from SainsburyWellcomeCentre/vision-refactor
Refactor project structure and split vision operators into separate packages
- Loading branch information
Showing
69 changed files
with
382 additions
and
870 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <PackageConfiguration xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <Packages> | ||
| <Package id="Bonsai" version="2.8.5" /> | ||
| <Package id="Bonsai.Core" version="2.8.5" /> | ||
| <Package id="Bonsai.Design" version="2.8.5" /> | ||
| <Package id="Bonsai.Editor" version="2.8.5" /> | ||
| <Package id="jacobslusser.ScintillaNET" version="3.6.3" /> | ||
| <Package id="Markdig" version="0.18.1" /> | ||
| <Package id="Microsoft.Web.WebView2" version="1.0.1823.32" /> | ||
| <Package id="Rx-Core" version="2.2.5" /> | ||
| <Package id="Rx-Interfaces" version="2.2.5" /> | ||
| <Package id="Rx-Linq" version="2.2.5" /> | ||
| <Package id="Rx-PlatformServices" version="2.2.5" /> | ||
| <Package id="SvgNet" version="3.3.3" /> | ||
| <Package id="System.Buffers" version="4.5.1" /> | ||
| <Package id="System.Memory" version="4.5.5" /> | ||
| <Package id="System.Numerics.Vectors" version="4.5.0" /> | ||
| <Package id="System.Resources.Extensions" version="8.0.0" /> | ||
| <Package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" /> | ||
| <Package id="YamlDotNet" version="13.1.1" /> | ||
| </Packages> | ||
| <AssemblyReferences> | ||
| <AssemblyReference assemblyName="Bonsai" /> | ||
| <AssemblyReference assemblyName="Bonsai.Core" /> | ||
| <AssemblyReference assemblyName="Bonsai.Design" /> | ||
| <AssemblyReference assemblyName="Bonsai.Editor" /> | ||
| </AssemblyReferences> | ||
| <AssemblyLocations> | ||
| <AssemblyLocation assemblyName="Bonsai" processorArchitecture="MSIL" location="Packages/Bonsai.2.8.5/lib/net48/Bonsai.exe" /> | ||
| <AssemblyLocation assemblyName="Bonsai.Core" processorArchitecture="MSIL" location="Packages/Bonsai.Core.2.8.5/lib/net462/Bonsai.Core.dll" /> | ||
| <AssemblyLocation assemblyName="Bonsai.Design" processorArchitecture="MSIL" location="Packages/Bonsai.Design.2.8.5/lib/net462/Bonsai.Design.dll" /> | ||
| <AssemblyLocation assemblyName="Bonsai.Editor" processorArchitecture="MSIL" location="Packages/Bonsai.Editor.2.8.5/lib/net472/Bonsai.Editor.dll" /> | ||
| <AssemblyLocation assemblyName="Markdig" processorArchitecture="MSIL" location="Packages/Markdig.0.18.1/lib/net40/Markdig.dll" /> | ||
| <AssemblyLocation assemblyName="Microsoft.Web.WebView2.Core" processorArchitecture="MSIL" location="Packages/Microsoft.Web.WebView2.1.0.1823.32/lib/net45/Microsoft.Web.WebView2.Core.dll" /> | ||
| <AssemblyLocation assemblyName="Microsoft.Web.WebView2.WinForms" processorArchitecture="MSIL" location="Packages/Microsoft.Web.WebView2.1.0.1823.32/lib/net45/Microsoft.Web.WebView2.WinForms.dll" /> | ||
| <AssemblyLocation assemblyName="Microsoft.Web.WebView2.Wpf" processorArchitecture="MSIL" location="Packages/Microsoft.Web.WebView2.1.0.1823.32/lib/net45/Microsoft.Web.WebView2.Wpf.dll" /> | ||
| <AssemblyLocation assemblyName="ScintillaNET" processorArchitecture="MSIL" location="Packages/jacobslusser.ScintillaNET.3.6.3/lib/net40/ScintillaNET.dll" /> | ||
| <AssemblyLocation assemblyName="SVG" processorArchitecture="MSIL" location="Packages/SvgNet.3.3.3/lib/net462/SVG.dll" /> | ||
| <AssemblyLocation assemblyName="System.Buffers" processorArchitecture="MSIL" location="Packages/System.Buffers.4.5.1/lib/net461/System.Buffers.dll" /> | ||
| <AssemblyLocation assemblyName="System.Memory" processorArchitecture="MSIL" location="Packages/System.Memory.4.5.5/lib/net461/System.Memory.dll" /> | ||
| <AssemblyLocation assemblyName="System.Numerics.Vectors" processorArchitecture="MSIL" location="Packages/System.Numerics.Vectors.4.5.0/lib/net46/System.Numerics.Vectors.dll" /> | ||
| <AssemblyLocation assemblyName="System.Reactive.Core" processorArchitecture="MSIL" location="Packages/Rx-Core.2.2.5/lib/net45/System.Reactive.Core.dll" /> | ||
| <AssemblyLocation assemblyName="System.Reactive.Interfaces" processorArchitecture="MSIL" location="Packages/Rx-Interfaces.2.2.5/lib/net45/System.Reactive.Interfaces.dll" /> | ||
| <AssemblyLocation assemblyName="System.Reactive.Linq" processorArchitecture="MSIL" location="Packages/Rx-Linq.2.2.5/lib/net45/System.Reactive.Linq.dll" /> | ||
| <AssemblyLocation assemblyName="System.Reactive.PlatformServices" processorArchitecture="MSIL" location="Packages/Rx-PlatformServices.2.2.5/lib/net45/System.Reactive.PlatformServices.dll" /> | ||
| <AssemblyLocation assemblyName="System.Resources.Extensions" processorArchitecture="MSIL" location="Packages/System.Resources.Extensions.8.0.0/lib/net462/System.Resources.Extensions.dll" /> | ||
| <AssemblyLocation assemblyName="System.Runtime.CompilerServices.Unsafe" processorArchitecture="MSIL" location="Packages/System.Runtime.CompilerServices.Unsafe.4.5.3/lib/net461/System.Runtime.CompilerServices.Unsafe.dll" /> | ||
| <AssemblyLocation assemblyName="YamlDotNet" processorArchitecture="MSIL" location="Packages/YamlDotNet.13.1.1/lib/net47/YamlDotNet.dll" /> | ||
| </AssemblyLocations> | ||
| <LibraryFolders> | ||
| <LibraryFolder path="Packages/Microsoft.Web.WebView2.1.0.1823.32/runtimes/win-arm64/native" platform="arm64" /> | ||
| <LibraryFolder path="Packages/Microsoft.Web.WebView2.1.0.1823.32/runtimes/win-arm64/native_uap" platform="arm64" /> | ||
| <LibraryFolder path="Packages/Microsoft.Web.WebView2.1.0.1823.32/runtimes/win-x64/native" platform="x64" /> | ||
| <LibraryFolder path="Packages/Microsoft.Web.WebView2.1.0.1823.32/runtimes/win-x64/native_uap" platform="x64" /> | ||
| <LibraryFolder path="Packages/Microsoft.Web.WebView2.1.0.1823.32/runtimes/win-x86/native" platform="x86" /> | ||
| <LibraryFolder path="Packages/Microsoft.Web.WebView2.1.0.1823.32/runtimes/win-x86/native_uap" platform="x86" /> | ||
| </LibraryFolders> | ||
| </PackageConfiguration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| @echo off | ||
| pushd %~dp0 | ||
| powershell -ExecutionPolicy Bypass -File ./Setup.ps1 | ||
| popd |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| Push-Location $PSScriptRoot | ||
| if (!(Test-Path "./Bonsai.exe")) { | ||
| $release = "https://github.com/bonsai-rx/bonsai/releases/latest/download/Bonsai.zip" | ||
| $configPath = "./Bonsai.config" | ||
| if (Test-Path $configPath) { | ||
| [xml]$config = Get-Content $configPath | ||
| $bootstrapper = $config.PackageConfiguration.Packages.Package.where{$_.id -eq 'Bonsai'} | ||
| if ($bootstrapper) { | ||
| $version = $bootstrapper.version | ||
| $release = "https://github.com/bonsai-rx/bonsai/releases/download/$version/Bonsai.zip" | ||
| } | ||
| } | ||
| Invoke-WebRequest $release -OutFile "temp.zip" | ||
| Move-Item -Path "NuGet.config" "temp.config" -ErrorAction SilentlyContinue | ||
| Expand-Archive "temp.zip" -DestinationPath "." -Force | ||
| Move-Item -Path "temp.config" "NuGet.config" -Force -ErrorAction SilentlyContinue | ||
| Remove-Item -Path "temp.zip" | ||
| Remove-Item -Path "Bonsai32.exe" | ||
| } | ||
| & .\Bonsai.exe --no-editor | ||
| Pop-Location |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,28 +6,39 @@ on: | |
| pull_request: | ||
| branches: [ main ] | ||
| workflow_dispatch: | ||
|
|
||
| env: | ||
| DOTNET_NOLOGO: true | ||
| DOTNET_CLI_TELEMETRY_OPTOUT: true | ||
| DOTNET_GENERATE_ASPNET_CERTIFICATE: false | ||
| ContinuousIntegrationBuild: true | ||
| jobs: | ||
| audit: | ||
| runs-on: windows-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| configuration: [debug, release] | ||
| os: [ubuntu-latest, windows-latest] | ||
| include: | ||
| - os: ubuntu-latest | ||
| test-filter: --filter TestCategory!=DriverDependent | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/[email protected] | ||
|
|
||
| - name: Setup MSBuild | ||
| uses: microsoft/setup-msbuild@v1 | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup VSTest | ||
| uses: darenm/Setup-VSTest@v1 | ||
|
|
||
| - name: Setup NuGet | ||
| uses: NuGet/[email protected] | ||
| - name: Setup .NET | ||
| uses: actions/setup-dotnet@v4 | ||
| with: | ||
| dotnet-version: 8.x | ||
|
|
||
| - name: Restore NuGet Packages | ||
| run: nuget restore src/Aeon.sln | ||
| - name: Restore | ||
| run: dotnet restore | ||
|
|
||
| - name: Build Project | ||
| run: msbuild src/Aeon.sln /p:Configuration=Release | ||
| - name: Build | ||
| run: dotnet build --no-restore --configuration ${{ matrix.configuration }} | ||
|
|
||
| - name: Pack | ||
| run: dotnet pack --no-build --configuration ${{ matrix.configuration }} | ||
|
|
||
| - name: Run Tests | ||
| run: vstest.console.exe src/Aeon.Tests/bin/Release/net472/Aeon.Tests.dll | ||
| - name: Test | ||
| run: dotnet test --no-build --configuration ${{ matrix.configuration }} ${{ matrix.test-filter }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,5 @@ | ||
| # State recovery files | ||
| ~* | ||
|
|
||
| # Bonsai scripting and environment files | ||
| .vs | ||
| bin | ||
| obj | ||
| Packages | ||
| *.bin | ||
| *.avi | ||
| *.dll | ||
| *.exe | ||
| *.exe.settings | ||
| SessionSummary | ||
|
|
||
| # Byte-compiled / optimized / DLL files | ||
| __pycache__/ | ||
| *.py[cod] | ||
| *$py.class | ||
|
|
||
| # Environments | ||
| .venv | ||
| winpython | ||
| .vs/ | ||
| /artifacts/ | ||
| .bonsai/Packages/ | ||
| .bonsai/*.exe | ||
| .bonsai/*.exe.settings |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
Oops, something went wrong.