Move datalog to its own library

ThadHouse · ThadHouse · commit 6c333dcba1e8 · 2025-04-27T18:09:11.000-07:00
diff --git a/WPILib.sln b/WPILib.sln
diff --git a/src/cscore/cscore.csproj b/src/cscore/cscore.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FRC.CsCore.runtime" Version="2025.1.1-beta-1-127-gd1de766" />
+    <PackageReference Include="FRC.CsCore.runtime" Version="2025.3.2-114-g3681121" />
   </ItemGroup>
 
 </Project>
diff --git a/src/datalog/Assembly.cs b/src/datalog/Assembly.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: DisableRuntimeMarshalling]
diff --git a/src/datalog/BooleanArrayLogEntry.cs b/src/datalog/BooleanArrayLogEntry.cs
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 /// <summary>
 /// Log BooleanArray values.
diff --git a/src/datalog/BooleanLogEntry.cs b/src/datalog/BooleanLogEntry.cs
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 /// <summary>
 /// Log Boolean values.
diff --git a/src/datalog/DataLog.cs b/src/datalog/DataLog.cs
@@ -1,10 +1,12 @@
 using System.Collections.Concurrent;
+using WPI.Logging.Natives;
+using WPIUtil;
 using WPIUtil.Handles;
 using WPIUtil.Natives;
 using WPIUtil.Serialization.Protobuf;
 using WPIUtil.Serialization.Struct;
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 public unsafe class DataLog : IDisposable
 {
diff --git a/src/datalog/DataLogBackgroundWriter.cs b/src/datalog/DataLogBackgroundWriter.cs
@@ -1,8 +1,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using WPIUtil.Natives;
+using WPI.Logging.Natives;
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 public sealed unsafe class DataLogBackgroundWriter : DataLog
 {
diff --git a/src/datalog/DataLogEntry.cs b/src/datalog/DataLogEntry.cs
@@ -1,6 +1,6 @@
 using WPIUtil.Handles;
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 public abstract class DataLogEntry(DataLog log, string name, string type, string metadata = "", long timestamp = 0)
 {
diff --git a/src/datalog/DataLogWriter.cs b/src/datalog/DataLogWriter.cs
@@ -1,6 +1,6 @@
-using WPIUtil.Natives;
+using WPI.Logging.Natives;
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 public unsafe class DataLogWriter : DataLog
 {
diff --git a/src/datalog/DoubleArrayLogEntry.cs b/src/datalog/DoubleArrayLogEntry.cs
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 /// <summary>
 /// Log DoubleArray values.
diff --git a/src/datalog/DoubleLogEntry.cs b/src/datalog/DoubleLogEntry.cs
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 /// <summary>
 /// Log Double values.
diff --git a/src/datalog/FloatArrayLogEntry.cs b/src/datalog/FloatArrayLogEntry.cs
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 /// <summary>
 /// Log FloatArray values.
diff --git a/src/datalog/FloatLogEntry.cs b/src/datalog/FloatLogEntry.cs
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 /// <summary>
 /// Log Float values.
diff --git a/src/datalog/IntegerArrayLogEntry.cs b/src/datalog/IntegerArrayLogEntry.cs
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 /// <summary>
 /// Log IntegerArray values.
diff --git a/src/datalog/IntegerLogEntry.cs b/src/datalog/IntegerLogEntry.cs
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 /// <summary>
 /// Log Integer values.
diff --git a/src/datalog/Natives/DataLogNative.cs b/src/datalog/Natives/DataLogNative.cs
@@ -1,10 +1,11 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.Marshalling;
+using WPIUtil;
 using WPIUtil.Handles;
 using WPIUtil.Marshal;
 
-namespace WPIUtil.Natives;
+namespace WPI.Logging.Natives;
 
 public struct OpaqueDataLog { }
 
diff --git a/src/datalog/ProtobufLogEntry.cs b/src/datalog/ProtobufLogEntry.cs
@@ -1,6 +1,6 @@
 using WPIUtil.Serialization.Protobuf;
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 public sealed class ProtobufLogEntry<T> : DataLogEntry where T : IProtobufSerializable<T>
 {
diff --git a/src/datalog/RawLogEntry.cs b/src/datalog/RawLogEntry.cs
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 /// <summary>
 /// Log Raw values.
diff --git a/src/datalog/StringArrayLogEntry.cs b/src/datalog/StringArrayLogEntry.cs
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 /// <summary>
 /// Log StringArray values.
diff --git a/src/datalog/StringLogEntry.cs b/src/datalog/StringLogEntry.cs
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 /// <summary>
 /// Log String values.
diff --git a/src/datalog/StructArrayLogEntry.cs b/src/datalog/StructArrayLogEntry.cs
@@ -1,6 +1,6 @@
 using WPIUtil.Serialization.Struct;
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 public sealed class StructArrayLogEntry<T> : DataLogEntry where T : IStructSerializable<T>
 {
diff --git a/src/datalog/StructLogEntry.cs b/src/datalog/StructLogEntry.cs
@@ -1,6 +1,6 @@
 using WPIUtil.Serialization.Struct;
 
-namespace WPIUtil.Logging;
+namespace WPI.Logging;
 
 public sealed class StructLogEntry<T> : DataLogEntry where T : IStructSerializable<T>
 {
diff --git a/src/datalog/datalog.csproj b/src/datalog/datalog.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <RootNamespace>WPI.Logging</RootNamespace>
+    <AssemblyName>FRC.DataLog</AssemblyName>
+    <NoWarn>1591;CA1401;1570</NoWarn>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisLevel>latest</AnalysisLevel>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\wpiutil\wpiutil.csproj" />
+    <ProjectReference Include="..\wpinet\wpinet.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FRC.DataLog.runtime" Version="2025.3.2-114-g3681121" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/hal/hal.csproj b/src/hal/hal.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FRC.WPIHal.runtime" Version="2025.1.1-beta-1-127-gd1de766" />
+    <PackageReference Include="FRC.WPIHal.runtime" Version="2025.3.2-114-g3681121" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ntcore/Natives/NtCore.Datalog.cs b/src/ntcore/Natives/NtCore.Datalog.cs
@@ -1,8 +1,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using NetworkTables.Handles;
+using WPI.Logging.Natives;
 using WPIUtil;
-using WPIUtil.Natives;
 
 namespace NetworkTables.Natives;
 
diff --git a/src/ntcore/NetworkTableInstance.cs b/src/ntcore/NetworkTableInstance.cs
@@ -13,9 +13,9 @@
 using NetworkTables.Handles;
 using NetworkTables.Natives;
 using UnitsNet;
+using WPI.Logging;
 using WPIUtil.Concurrent;
 using WPIUtil.Handles;
-using WPIUtil.Logging;
 using WPIUtil.Natives;
 using WPIUtil.Serialization.Protobuf;
 using WPIUtil.Serialization.Struct;
diff --git a/src/ntcore/ntcore.csproj b/src/ntcore/ntcore.csproj
@@ -12,10 +12,11 @@
   <ItemGroup>
     <ProjectReference Include="..\wpiutil\wpiutil.csproj" />
     <ProjectReference Include="..\wpinet\wpinet.csproj" />
+    <ProjectReference Include="..\datalog\datalog.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FRC.NetworkTables.runtime" Version="2025.1.1-beta-1-127-gd1de766" />
+    <PackageReference Include="FRC.NetworkTables.runtime" Version="2025.3.2-114-g3681121" />
   </ItemGroup>
 
 </Project>
diff --git a/src/stereologue/Stereologuer.cs b/src/stereologue/Stereologuer.cs
@@ -1,7 +1,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using NetworkTables;
-using WPIUtil.Logging;
+using WPI.Logging;
 using WPIUtil.Serialization.Protobuf;
 using WPIUtil.Serialization.Struct;
 
diff --git a/src/wpilibsharp/DataLogManager.cs b/src/wpilibsharp/DataLogManager.cs
@@ -3,8 +3,8 @@
 using NetworkTables;
 using NetworkTables.Handles;
 using UnitsNet.NumberExtensions.NumberToDuration;
+using WPI.Logging;
 using WPIUtil.Concurrent;
-using WPIUtil.Logging;
 
 namespace WPILib;
 
diff --git a/src/wpilibsharp/DriverStation.cs b/src/wpilibsharp/DriverStation.cs
@@ -2,12 +2,12 @@
 using NetworkTables;
 using UnitsNet;
 using UnitsNet.NumberExtensions.NumberToDuration;
+using WPI.Logging;
 using WPIHal;
 using WPIHal.Natives;
 using WPIUtil;
 using WPIUtil.Concurrent;
 using WPIUtil.Handles;
-using WPIUtil.Logging;
 using WPIUtil.Natives;
 using MatchType = WPIHal.MatchType;
 
diff --git a/src/wpinet/wpinet.csproj b/src/wpinet/wpinet.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FRC.WPINet.runtime" Version="2025.1.1-beta-1-127-gd1de766" />
+    <PackageReference Include="FRC.WPINet.runtime" Version="2025.3.2-114-g3681121" />
   </ItemGroup>
 
 </Project>
diff --git a/src/wpiutil/wpiutil.csproj b/src/wpiutil/wpiutil.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
-    <PackageReference Include="FRC.WPIUtil.runtime" Version="2025.1.1-beta-1-127-gd1de766" />
+    <PackageReference Include="FRC.WPIUtil.runtime" Version="2025.3.2-114-g3681121" />
     <PackageReference Include="Google.Protobuf" Version="3.21.12" />
     <PackageReference Include="UnitsNet" Version="5.42.0" />
     <PackageReference Include="UnitsNet.NumberExtensions" Version="5.42.0" />
diff --git a/test/datalog.test/DataLogTest.cs b/test/datalog.test/DataLogTest.cs
@@ -1,7 +1,7 @@
-using WPIUtil.Logging;
+using WPI.Logging;
 using Xunit;
 
-namespace WPIUtil.Test;
+namespace Datalog.Test;
 
 internal class CallbackData
 {
diff --git a/test/datalog.test/datalog.test.csproj b/test/datalog.test/datalog.test.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\datalog\datalog.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.8.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+using System.Runtime.CompilerServices;`
	`2`	`+`
	`3`	`+[assembly: DisableRuntimeMarshalling]`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System.Runtime.CompilerServices;`
`2`	`2`	`using System.Runtime.InteropServices;`
`3`		`-using WPIUtil.Natives;`
	`3`	`+using WPI.Logging.Natives;`
`4`	`4`
`5`		`-namespace WPIUtil.Logging;`
	`5`	`+namespace WPI.Logging;`
`6`	`6`
`7`	`7`	`public sealed unsafe class DataLogBackgroundWriter : DataLog`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using WPIUtil.Handles;`
`2`	`2`
`3`		`-namespace WPIUtil.Logging;`
	`3`	`+namespace WPI.Logging;`
`4`	`4`
`5`	`5`	`public abstract class DataLogEntry(DataLog log, string name, string type, string metadata = "", long timestamp = 0)`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using WPIUtil.Serialization.Protobuf;`
`2`	`2`
`3`		`-namespace WPIUtil.Logging;`
	`3`	`+namespace WPI.Logging;`
`4`	`4`
`5`	`5`	`public sealed class ProtobufLogEntry<T> : DataLogEntry where T : IProtobufSerializable<T>`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using WPIUtil.Serialization.Struct;`
`2`	`2`
`3`		`-namespace WPIUtil.Logging;`
	`3`	`+namespace WPI.Logging;`
`4`	`4`
`5`	`5`	`public sealed class StructArrayLogEntry<T> : DataLogEntry where T : IStructSerializable<T>`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using WPIUtil.Logging;`
	`1`	`+using WPI.Logging;`
`2`	`2`	`using Xunit;`
`3`	`3`
`4`		`-namespace WPIUtil.Test;`
	`4`	`+namespace Datalog.Test;`
`5`	`5`
`6`	`6`	`internal class CallbackData`
`7`	`7`	`{`