Do not use generic interface

sebgod · sebgod · commit 2f536b8bb6ab · 2026-01-04T11:21:58.000+11:00
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -7,7 +7,7 @@ on:
     branches: [ main ]
     
 env:
-  VERSION_PREFIX: 1.0.${{ github.run_number }}
+  VERSION_PREFIX: 1.1.${{ github.run_number }}
   VERSION_REV: ${{ github.run_attempt }}
   VERSION_SUFFIX: +${{ github.sha }}
   BUILD_CONF: Release
diff --git a/INativeDeviceInfo.cs b/INativeDeviceInfo.cs
@@ -2,8 +2,7 @@
 
 namespace TianWen.DAL
 {
-    public interface INativeDeviceInfo<TSerialNumber>
-        where TSerialNumber : struct
+    public interface INativeDeviceInfo
     {
         int ID { get; }
 
@@ -18,7 +17,7 @@ public interface INativeDeviceInfo<TSerialNumber>
 
         bool Close();
 
-        TSerialNumber? SerialNumber { get; }
+        string SerialNumber { get; }
 
         bool IsUSB3Device { get; }
     }
diff --git a/INativeDeviceIterator.cs b/INativeDeviceIterator.cs
@@ -2,9 +2,8 @@
 
 namespace TianWen.DAL
 {
-    public interface INativeDeviceIterator<TDeviceInfo, TSerialNumber> : IEnumerable<(int DeviceId, TDeviceInfo DeviceInfo)>
-        where TDeviceInfo : INativeDeviceInfo<TSerialNumber>
-        where TSerialNumber : struct
+    public interface INativeDeviceIterator<TDeviceInfo> : IEnumerable<(int DeviceId, TDeviceInfo DeviceInfo)>
+        where TDeviceInfo : INativeDeviceInfo
     {
     }
 }
diff --git a/NativeDeviceIteratorBase.cs b/NativeDeviceIteratorBase.cs
@@ -3,11 +3,10 @@
 
 namespace TianWen.DAL
 {
-    public abstract class NativeDeviceIteratorBase<TDeviceInfo, TSerialNumber> : INativeDeviceIterator<INativeDeviceInfo<TSerialNumber>, TSerialNumber>
-        where TDeviceInfo : struct, INativeDeviceInfo<TSerialNumber>
-        where TSerialNumber : struct
+    public abstract class NativeDeviceIteratorBase<TDeviceInfo> : INativeDeviceIterator<TDeviceInfo>
+        where TDeviceInfo : struct, INativeDeviceInfo
     {
-        public IEnumerator<(int DeviceId, INativeDeviceInfo<TSerialNumber> DeviceInfo)> GetEnumerator()
+        public IEnumerator<(int DeviceId, TDeviceInfo DeviceInfo)> GetEnumerator()
         {
             var count = DeviceCount();
 
diff --git a/TianWen.DAL.sln b/TianWen.DAL.sln
@@ -1,10 +1,15 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.14.36811.4 d17.14
+VisualStudioVersion = 17.14.36811.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TianWen.DAL", "TianWen.DAL.csproj", "{2BB275F5-E3BB-4807-8FBF-08611FECC504}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace TianWen.DAL`
`4`	`4`	`{`
`5`		`- public interface INativeDeviceInfo<TSerialNumber>`
`6`		`- where TSerialNumber : struct`
	`5`	`+ public interface INativeDeviceInfo`
`7`	`6`	`{`
`8`	`7`	`int ID { get; }`
`9`	`8`
`@@ -18,7 +17,7 @@ public interface INativeDeviceInfo<TSerialNumber>`
`18`	`17`
`19`	`18`	`bool Close();`
`20`	`19`
`21`		`- TSerialNumber? SerialNumber { get; }`
	`20`	`+ string SerialNumber { get; }`
`22`	`21`
`23`	`22`	`bool IsUSB3Device { get; }`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace TianWen.DAL`
`4`	`4`	`{`
`5`		`- public interface INativeDeviceIterator<TDeviceInfo, TSerialNumber> : IEnumerable<(int DeviceId, TDeviceInfo DeviceInfo)>`
`6`		`- where TDeviceInfo : INativeDeviceInfo<TSerialNumber>`
`7`		`- where TSerialNumber : struct`
	`5`	`+ public interface INativeDeviceIterator<TDeviceInfo> : IEnumerable<(int DeviceId, TDeviceInfo DeviceInfo)>`
	`6`	`+ where TDeviceInfo : INativeDeviceInfo`
`8`	`7`	`{`
`9`	`8`	`}`
`10`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,10 @@`
`3`	`3`
`4`	`4`	`namespace TianWen.DAL`
`5`	`5`	`{`
`6`		`- public abstract class NativeDeviceIteratorBase<TDeviceInfo, TSerialNumber> : INativeDeviceIterator<INativeDeviceInfo<TSerialNumber>, TSerialNumber>`
`7`		`- where TDeviceInfo : struct, INativeDeviceInfo<TSerialNumber>`
`8`		`- where TSerialNumber : struct`
	`6`	`+ public abstract class NativeDeviceIteratorBase<TDeviceInfo> : INativeDeviceIterator<TDeviceInfo>`
	`7`	`+ where TDeviceInfo : struct, INativeDeviceInfo`
`9`	`8`	`{`
`10`		`- public IEnumerator<(int DeviceId, INativeDeviceInfo<TSerialNumber> DeviceInfo)> GetEnumerator()`
	`9`	`+ public IEnumerator<(int DeviceId, TDeviceInfo DeviceInfo)> GetEnumerator()`
`11`	`10`	`{`
`12`	`11`	`var count = DeviceCount();`
`13`	`12`