made the project compatible with netstandard2.0

DomCR · Nov 4, 2024 · d02da37 · d02da37
1 parent 3be9c45
commit d02da37
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/src/ACadSharp/ACadSharp.csproj b/src/ACadSharp/ACadSharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net5.0;net6.0;net7.0;net48;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks>net5.0;net6.0;net7.0;net48;netstandard2.0</TargetFrameworks>
 		<Authors>DomCr</Authors>
 		<PackageId>ACadSharp</PackageId>
 		<PackageTags>C# Dwg Dxf</PackageTags>
@@ -36,7 +36,7 @@
 		<PackageReference Include="System.Memory" Version="4.5.5" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 		<PackageReference Include="System.Memory" Version="4.5.5" />
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
 	</ItemGroup>

diff --git a/src/ACadSharp/IO/DWG/DwgStreamWriters/DwgHandleWriter.cs b/src/ACadSharp/IO/DWG/DwgStreamWriters/DwgHandleWriter.cs
@@ -30,7 +30,7 @@ public DwgHandleWriter(ACadVersion version, MemoryStream stream, Dictionary<ulon
 				this._handleMap.Add(item.Key, item.Value);
 			}
 #else
-			this._handleMap = new Dictionary<ulong, long>(map.OrderBy(o => o.Key));
+			this._handleMap = new Dictionary<ulong, long>(map);
 #endif
 		}
 

diff --git a/src/ACadSharp/Objects/CadDictionary.cs b/src/ACadSharp/Objects/CadDictionary.cs
@@ -283,7 +283,14 @@ public bool ContainsKey(string key)
 		/// <returns>true if the element is successfully removed; otherwise, false.</returns>
 		public bool Remove(string key, out NonGraphicalObject item)
 		{
-			if (this._entries.Remove(key, out item))
+			item = default;
+
+			if (!this._entries.ContainsKey(key))
+				return false;
+
+			item = this._entries[key];
+
+			if (this._entries.Remove(key))
 			{
 				item.Owner = null;
 				OnRemove?.Invoke(this, new CollectionChangedEventArgs(item));

diff --git a/src/ACadSharp/Tables/Collections/Table.cs b/src/ACadSharp/Tables/Collections/Table.cs
@@ -103,7 +103,12 @@ public T Remove(string key)
 			if (this.defaultEntries.Contains(key))
 				return null;
 
-			if (this.entries.Remove(key, out T item))
+			if(!this.entries.ContainsKey(key))
+				return null;
+
+			var item = this.entries[key];
+
+			if (this.entries.Remove(key))
 			{
 				item.Owner = null;
 				OnRemove?.Invoke(this, new CollectionChangedEventArgs(item));