Add ReactiveUI condition

HMBSbige · HMBSbige · commit 596da3016749 · 2021-03-05T10:18:59.000+08:00
diff --git a/STUN/Client/StunClient3489.cs b/STUN/Client/StunClient3489.cs
@@ -1,4 +1,6 @@
+#if ReactiveUI
 using ReactiveUI.Fody.Helpers;
+#endif
 using STUN.DnsClients;
 using STUN.Enums;
 using STUN.Message;
@@ -35,7 +37,9 @@ public TimeSpan Timeout
 
 		protected readonly IUdpProxy Proxy;
 
+#if ReactiveUI
 		[Reactive]
+#endif
 		public ClassicStunResult Status { get; } = new();
 
 		public StunClient3489(string server, ushort port = 3478, IPEndPoint? local = null, IUdpProxy? proxy = null, IDnsQuery? dnsQuery = null)
diff --git a/STUN/Client/StunClient5389UDP.cs b/STUN/Client/StunClient5389UDP.cs
@@ -1,4 +1,6 @@
+#if ReactiveUI
 using ReactiveUI.Fody.Helpers;
+#endif
 using STUN.DnsClients;
 using STUN.Enums;
 using STUN.Message;
@@ -18,7 +20,9 @@ namespace STUN.Client
 	/// </summary>
 	public class StunClient5389UDP : StunClient3489
 	{
+#if ReactiveUI
 		[Reactive]
+#endif
 		public new StunResult5389 Status { get; } = new();
 
 		public StunClient5389UDP(string server, ushort port = 3478, IPEndPoint? local = null, IUdpProxy? proxy = null, IDnsQuery? dnsQuery = null)
diff --git a/STUN/STUN.csproj b/STUN/STUN.csproj
@@ -6,8 +6,16 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;ReactiveUI</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;ReactiveUI</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="ReactiveUI.Fody" Version="13.2.2" />
+    <PackageReference Include="ReactiveUI.Fody" Version="13.2.2" Condition="$(DefineConstants.Contains('ReactiveUI'))" />
   </ItemGroup>
 
 </Project>
diff --git a/STUN/StunResult/ClassicStunResult.cs b/STUN/StunResult/ClassicStunResult.cs
@@ -1,11 +1,15 @@
+#if ReactiveUI
 using ReactiveUI.Fody.Helpers;
+#endif
 using STUN.Enums;
 
 namespace STUN.StunResult
 {
 	public class ClassicStunResult : StunResult
 	{
+#if ReactiveUI
 		[Reactive]
+#endif
 		public NatType NatType { get; set; } = NatType.Unknown;
 	}
 }
diff --git a/STUN/StunResult/StunResult.cs b/STUN/StunResult/StunResult.cs
@@ -1,15 +1,24 @@
+#if ReactiveUI
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+#endif
 using System.Net;
 
 namespace STUN.StunResult
 {
-	public abstract class StunResult : ReactiveObject
+	public abstract class StunResult
+#if ReactiveUI
+		: ReactiveObject
+#endif
 	{
+#if ReactiveUI
 		[Reactive]
+#endif
 		public IPEndPoint? PublicEndPoint { get; set; }
 
+#if ReactiveUI
 		[Reactive]
+#endif
 		public IPEndPoint? LocalEndPoint { get; set; }
 	}
 }
diff --git a/STUN/StunResult/StunResult5389.cs b/STUN/StunResult/StunResult5389.cs
@@ -1,21 +1,31 @@
+#if ReactiveUI
 using ReactiveUI.Fody.Helpers;
+#endif
 using STUN.Enums;
 using System.Net;
 
 namespace STUN.StunResult
 {
 	public class StunResult5389 : StunResult
 	{
+#if ReactiveUI
 		[Reactive]
+#endif
 		public IPEndPoint? OtherEndPoint { get; set; }
 
+#if ReactiveUI
 		[Reactive]
+#endif
 		public BindingTestResult BindingTestResult { get; set; } = BindingTestResult.Unknown;
 
+#if ReactiveUI
 		[Reactive]
+#endif
 		public MappingBehavior MappingBehavior { get; set; } = MappingBehavior.Unknown;
 
+#if ReactiveUI
 		[Reactive]
+#endif
 		public FilteringBehavior FilteringBehavior { get; set; } = FilteringBehavior.Unknown;
 
 		public void Clone(StunResult5389 result)
diff --git a/STUN/Utils/BitUtils.cs b/STUN/Utils/BitUtils.cs
@@ -1,4 +1,3 @@
-using DynamicData.Kernel;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,12 +26,12 @@ public static ushort FromBe(byte b1, byte b2)
 
 		public static ushort FromBe(IEnumerable<byte> b)
 		{
-			return BitConverter.ToUInt16(BitConverter.IsLittleEndian ? b.Reverse().AsArray() : b.AsArray(), 0);
+			return BitConverter.ToUInt16(BitConverter.IsLittleEndian ? b.Reverse().ToArray() : b.ToArray(), 0);
 		}
 
 		public static int FromBeToInt(IEnumerable<byte> b)
 		{
-			return BitConverter.ToInt32(BitConverter.IsLittleEndian ? b.Reverse().AsArray() : b.AsArray(), 0);
+			return BitConverter.ToInt32(BitConverter.IsLittleEndian ? b.Reverse().ToArray() : b.ToArray(), 0);
 		}
 
 		public static IEnumerable<byte> GetRandomBytes(int n)

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,15 @@`
	`1`	`+#if ReactiveUI`
`1`	`2`	`using ReactiveUI.Fody.Helpers;`
	`3`	`+#endif`
`2`	`4`	`using STUN.Enums;`
`3`	`5`
`4`	`6`	`namespace STUN.StunResult`
`5`	`7`	`{`
`6`	`8`	`public class ClassicStunResult : StunResult`
`7`	`9`	`{`
	`10`	`+#if ReactiveUI`
`8`	`11`	`[Reactive]`
	`12`	`+#endif`
`9`	`13`	`public NatType NatType { get; set; } = NatType.Unknown;`
`10`	`14`	`}`
`11`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,24 @@`
	`1`	`+#if ReactiveUI`
`1`	`2`	`using ReactiveUI;`
`2`	`3`	`using ReactiveUI.Fody.Helpers;`
	`4`	`+#endif`
`3`	`5`	`using System.Net;`
`4`	`6`
`5`	`7`	`namespace STUN.StunResult`
`6`	`8`	`{`
`7`		`- public abstract class StunResult : ReactiveObject`
	`9`	`+ public abstract class StunResult`
	`10`	`+#if ReactiveUI`
	`11`	`+ : ReactiveObject`
	`12`	`+#endif`
`8`	`13`	`{`
	`14`	`+#if ReactiveUI`
`9`	`15`	`[Reactive]`
	`16`	`+#endif`
`10`	`17`	`public IPEndPoint? PublicEndPoint { get; set; }`
`11`	`18`
	`19`	`+#if ReactiveUI`
`12`	`20`	`[Reactive]`
	`21`	`+#endif`
`13`	`22`	`public IPEndPoint? LocalEndPoint { get; set; }`
`14`	`23`	`}`
`15`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using DynamicData.Kernel;`
`2`	`1`	`using System;`
`3`	`2`	`using System.Collections.Generic;`
`4`	`3`	`using System.Linq;`
`@@ -27,12 +26,12 @@ public static ushort FromBe(byte b1, byte b2)`
`27`	`26`
`28`	`27`	`public static ushort FromBe(IEnumerable<byte> b)`
`29`	`28`	`{`
`30`		`- return BitConverter.ToUInt16(BitConverter.IsLittleEndian ? b.Reverse().AsArray() : b.AsArray(), 0);`
	`29`	`+ return BitConverter.ToUInt16(BitConverter.IsLittleEndian ? b.Reverse().ToArray() : b.ToArray(), 0);`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`public static int FromBeToInt(IEnumerable<byte> b)`
`34`	`33`	`{`
`35`		`- return BitConverter.ToInt32(BitConverter.IsLittleEndian ? b.Reverse().AsArray() : b.AsArray(), 0);`
	`34`	`+ return BitConverter.ToInt32(BitConverter.IsLittleEndian ? b.Reverse().ToArray() : b.ToArray(), 0);`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`public static IEnumerable<byte> GetRandomBytes(int n)`