Merge pull request #3 from Meloong-Git/copilot/update-dotnet-framework-to-standard-2-0

Migrate MeloongCore (Shared) from net462 to netstandard2.0

Shared/General/ConcurrentList.cs

@@ -2,25 +2,64 @@
 
 /// <summary>
 /// 线程安全的 <see cref="List{T}"/> 实现。
-/// 在 <see cref="SynchronizedCollection{T}"/> 的基础上，当调用枚举器时返回一个临时副本，以避免列表在枚举过程中被修改导致异常。
+/// 当调用枚举器时返回一个临时副本，以避免列表在枚举过程中被修改导致异常。
 /// </summary>
-public class ConcurrentList<T> : SynchronizedCollection<T>, IEnumerable, IEnumerable<T> {
+public class ConcurrentList<T> : IList<T>, IList, IEnumerable, IEnumerable<T> {
+
+    private readonly List<T> _items = [];
+    private readonly object _lock = new();
 
     // 构造函数
-    public ConcurrentList() : base() { }
-    public ConcurrentList(IEnumerable<T> data) : base(new object(), data) { }
+    public ConcurrentList() { }
+    public ConcurrentList(IEnumerable<T> data) { _items = new List<T>(data); }
     public static implicit operator ConcurrentList<T>(List<T> data) => new(data);
-    public static implicit operator List<T>(ConcurrentList<T> data) => new(data);
+    public static implicit operator List<T>(ConcurrentList<T> data) { lock (data._lock) { return new List<T>(data._items); } }
+
+    public int Count { get { lock (_lock) { return _items.Count; } } }
+    public bool IsReadOnly => false;
+    bool IList.IsFixedSize => false;
+    bool ICollection.IsSynchronized => true;
+    object ICollection.SyncRoot => _lock;
+
+    public T this[int index] {
+        get { lock (_lock) { return _items[index]; } }
+        set { lock (_lock) { _items[index] = value; } }
+    }
+    object? IList.this[int index] {
+        get => this[index];
+        set { lock (_lock) { _items[index] = (T)value!; } }
+    }
+
+    public void Add(T item) { lock (_lock) { _items.Add(item); } }
+    int IList.Add(object? value) { lock (_lock) { _items.Add((T)value!); return _items.Count - 1; } }
+
+    public void Insert(int index, T item) { lock (_lock) { _items.Insert(index, item); } }
+    void IList.Insert(int index, object? value) { lock (_lock) { _items.Insert(index, (T)value!); } }
+
+    public bool Remove(T item) { lock (_lock) { return _items.Remove(item); } }
+    void IList.Remove(object? value) { lock (_lock) { if (value is T t) _items.Remove(t); } }
+
+    public void RemoveAt(int index) { lock (_lock) { _items.RemoveAt(index); } }
+    public void Clear() { lock (_lock) { _items.Clear(); } }
+
+    public bool Contains(T item) { lock (_lock) { return _items.Contains(item); } }
+    bool IList.Contains(object? value) { lock (_lock) { return value is T t && _items.Contains(t); } }
+
+    public int IndexOf(T item) { lock (_lock) { return _items.IndexOf(item); } }
+    int IList.IndexOf(object? value) { lock (_lock) { return value is T t ? _items.IndexOf(t) : -1; } }
+
+    public void CopyTo(T[] array, int arrayIndex) { lock (_lock) { _items.CopyTo(array, arrayIndex); } }
+    void ICollection.CopyTo(Array array, int index) { lock (_lock) { ((ICollection)_items).CopyTo(array, index); } }
 
     // 对枚举器进行覆写，返回一个临时副本
-    public new IEnumerator<T> GetEnumerator() {
-        lock (SyncRoot) {
-            return Items.ToList().GetEnumerator();
+    public IEnumerator<T> GetEnumerator() {
+        lock (_lock) {
+            return _items.ToList().GetEnumerator();
         }
     }
     IEnumerator IEnumerable.GetEnumerator() {
-        lock (SyncRoot) {
-            return Items.ToList().GetEnumerator();
+        lock (_lock) {
+            return _items.ToList().GetEnumerator();
         }
     }
 

Shared/MeloongCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net462</TargetFramework>
+		<TargetFramework>netstandard2.0</TargetFramework>
 		<OutputType>Library</OutputType>
 		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 		<OutDir>bin\</OutDir>
@@ -23,11 +23,6 @@
 	  <PackageReference Include="System.ValueTuple" Version="4.6.1" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Reference Include="System.IO.Compression" />
-	  <Reference Include="System.ServiceModel" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<Using Include="System" />
 		<Using Include="System.ComponentModel" />

Wpf/MeloongCoreWpf.csproj

@@ -31,7 +31,6 @@
 
 	<ItemGroup>
 	  <Reference Include="PresentationFramework" />
-	  <Reference Include="System.ServiceModel" />
 	</ItemGroup>
 
 	<ItemGroup>