Skip to content

Commit 4b6db65

Browse files
Merge pull request #41 from ShawnLaMountain/Net10-Upgrade
Updated ObjectExtention Compare code. Also building for .NET 10
2 parents c60e34e + d067960 commit 4b6db65

3 files changed

Lines changed: 16 additions & 1 deletion

File tree

‎src/ThunderDesign.Net-PCL.Threading.Shared/Extentions/ObjectExtention.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
using System.Collections.Generic;
2+
#if NETSTANDARD2_0_OR_GREATER || NET6_0_OR_GREATER
3+
using ThunderDesign.Net_PCL.ToolBox.Helpers;
4+
#endif
25

36
namespace ThunderDesign.Net.Threading.Extentions
47
{
@@ -34,9 +37,14 @@ public static bool SetProperty<T>(
3437
{
3538
if (lockObj != null)
3639
System.Threading.Monitor.Enter(lockObj, ref lockWasTaken);
40+
41+
#if NETSTANDARD2_0_OR_GREATER || NET6_0_OR_GREATER
42+
if (EqualityHelper.Equality<T>(ref backingStore, value))
43+
return false;
44+
#else
3745
if (EqualityComparer<T>.Default.Equals(backingStore, value))
3846
return false;
39-
47+
#endif
4048
backingStore = value;
4149
}
4250
finally

‎src/ThunderDesign.Net-PCL.Threading.Shared/ThunderDesign.Net-PCL.Threading.Shared.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@
1515
<None Include="**\*.config" Pack="true" PackagePath="contentFiles\any\any\" />
1616
</ItemGroup>
1717

18+
<ItemGroup>
19+
<PackageReference Include="ThunderDesign.Net-PCL.ToolBox" Version="1.1.1" />
20+
</ItemGroup>
21+
1822
</Project>

‎src/ThunderDesign.Net-PCL.Threading.nuspec.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<group targetFramework="net461" />
2222
<group targetFramework="net6.0" />
2323
<group targetFramework="net8.0" />
24+
<group targetFramework="net10.0" />
2425
</dependencies>
2526
</metadata>
2627
<files>
@@ -30,12 +31,14 @@
3031
<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net461/ThunderDesign.Net-PCL.Threading.dll" target="lib/net461/" />
3132
<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net6.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/net6.0/" />
3233
<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net8.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/net8.0/" />
34+
<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net10.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/net10.0/" />
3335
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/netstandard1.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/netstandard1.0/" />
3436
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/netstandard1.3/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/netstandard1.3/" />
3537
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/netstandard2.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/netstandard2.0/" />
3638
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net461/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net461/" />
3739
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net6.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net6.0/" />
3840
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net8.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net8.0/" />
41+
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net10.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net10.0/" />
3942
<file src="src/ThunderDesign.Net-PCL.SourceGenerators/bin/Release/netstandard2.0/ThunderDesign.Net-PCL.SourceGenerators.dll" target="analyzers/dotnet/cs/" />
4043
<file src="README.md" target="" />
4144
</files>

0 commit comments

Comments
 (0)