Merge pull request #148 from SainsburyWellcomeCentre/aeon-environment

Split environment specific operators into separate package
SainsburyWellcomeCentre · Sep 27, 2023 · 07ba9d9 · 07ba9d9
2 parents 8bf58ff + 1551f59
commit 07ba9d9
Show file tree

Hide file tree

Showing 58 changed files with 133 additions and 534 deletions.
diff --git a/src/Aeon.Acquisition/Aeon.Acquisition.csproj b/src/Aeon.Acquisition/Aeon.Acquisition.csproj
@@ -1,13 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <UseWindowsForms>true</UseWindowsForms>
     <Title>Project Aeon - Acquisition</Title>
     <Description>A package providing common acquisition and control functionality for all Project Aeon experiments.</Description>
     <PackageTags>Bonsai Rx Project Aeon Acquisition</PackageTags>
     <TargetFramework>net472</TargetFramework>
     <VersionPrefix>0.5.0</VersionPrefix>
-    <VersionSuffix>build230922</VersionSuffix>
+    <VersionSuffix>build230923</VersionSuffix>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,13 +20,11 @@
     <PackageReference Include="Harp.CameraControllerGen2" Version="0.1.0" />
     <PackageReference Include="Harp.ClockSynchronizer" Version="0.1.0" />
     <PackageReference Include="Harp.OutputExpander" Version="0.2.0-build230803" />
-    <PackageReference Include="Harp.RfidReader" Version="0.1.0" />
     <PackageReference Include="Harp.TimestampGeneratorGen3" Version="0.1.0" />
     <PackageReference Include="Bonsai.Osc" Version="2.7.0" />
     <PackageReference Include="Bonsai.Pylon" Version="0.3.0" />
     <PackageReference Include="Bonsai.Sleap" Version="0.2.0" />
     <PackageReference Include="Bonsai.Spinnaker" Version="0.7.1" />
-    <PackageReference Include="Bonsai.Design" Version="2.8.0" />
     <PackageReference Include="Bonsai.System" Version="2.8.0" />
     <PackageReference Include="Bonsai.Scripting.Expressions" Version="2.8.0" />
     <PackageReference Include="Bonsai.ZeroMQ" Version="0.2.0" />

diff --git a/src/Aeon.Acquisition/Aeon.Acquisition.csproj.user b/src/Aeon.Acquisition/Aeon.Acquisition.csproj.user
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup />
-  <ItemGroup>
-    <Compile Update="AnnotationControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="EnvironmentStateControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="EnvironmentSubjectStateControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="TareWeightControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-  </ItemGroup>
+  <ItemGroup />
 </Project>
diff --git a/src/Aeon.Acquisition/CreateMetadata.cs b/src/Aeon.Acquisition/CreateMetadata.cs
diff --git a/src/Aeon.Acquisition/Experiment.cs b/src/Aeon.Acquisition/Experiment.cs
diff --git a/src/Aeon.Acquisition/MetadataReader.cs b/src/Aeon.Acquisition/MetadataReader.cs
diff --git a/src/Aeon.Acquisition/MetadataWriter.cs b/src/Aeon.Acquisition/MetadataWriter.cs
diff --git a/src/Aeon.Acquisition/SubjectLog.cs b/src/Aeon.Acquisition/SubjectLog.cs