Update test fx

unosquare · Mar 5, 2019 · c865f84 · c865f84
1 parent cd13f2f
commit c865f84
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 21 deletions.
diff --git a/src/Unosquare.Swan.Lite/Components/ObjectMapper.cs b/src/Unosquare.Swan.Lite/Components/ObjectMapper.cs
@@ -279,14 +279,12 @@ private static bool TrySetValue(PropertyInfo propertyInfo, Tuple<Type, object> p
                     return true;
                 }
 
-                if (!type.IsValueType() && propertyInfo.PropertyType == type)
-                {
-                    propertyInfo.SetValue(target, GetValue(value, propertyInfo.PropertyType));
+                if (type.IsValueType() || propertyInfo.PropertyType != type)
+                    return propertyInfo.TrySetBasicType(value, target);
+
+                propertyInfo.SetValue(target, GetValue(value, propertyInfo.PropertyType));
 
-                    return true;
-                }
-
-                return propertyInfo.TrySetBasicType(value, target);
+                return true;
             }
             catch
             {

diff --git a/src/Unosquare.Swan.Lite/Extensions.ValueTypes.cs b/src/Unosquare.Swan.Lite/Extensions.ValueTypes.cs
@@ -127,7 +127,7 @@ public static byte[] ToBytes<T>(this T obj)
         /// contained in longBytes.
         /// </returns>
         public static uint SwapEndianness(this ulong longBytes)
-            => (uint) (((longBytes & 0x000000ff) << 24) +
+            => (uint)(((longBytes & 0x000000ff) << 24) +
                        ((longBytes & 0x0000ff00) << 8) +
                        ((longBytes & 0x00ff0000) >> 8) +
                        ((longBytes & 0xff000000) >> 24));

diff --git a/src/Unosquare.Swan.Lite/Terminal.cs b/src/Unosquare.Swan.Lite/Terminal.cs
@@ -229,7 +229,7 @@ public static void Flush(TimeSpan? timeout = null)
         /// <param name="top">The top.</param>
         public static void SetCursorPosition(int left, int top)
         {
-            if (IsConsolePresent == false) return;
+            if (!IsConsolePresent) return;
 
             lock (SyncLock)
             {

diff --git a/src/Unosquare.Swan.Lite/Unosquare.Swan.Lite.csproj b/src/Unosquare.Swan.Lite/Unosquare.Swan.Lite.csproj
@@ -27,13 +27,13 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
     <PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
   </ItemGroup>

diff --git a/src/Unosquare.Swan/Components/CircularBuffer.cs b/src/Unosquare.Swan/Components/CircularBuffer.cs
@@ -13,7 +13,7 @@ namespace Unosquare.Swan.Components
     public sealed class CircularBuffer : IDisposable
     {
         private readonly object _syncLock = new object();
-        private IntPtr _buffer = IntPtr.Zero;
+        private IntPtr _buffer;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CircularBuffer"/> class.

diff --git a/src/Unosquare.Swan/Components/DelayProvider.cs b/src/Unosquare.Swan/Components/DelayProvider.cs
@@ -34,7 +34,9 @@ public sealed class DelayProvider : IDisposable
         private readonly Stopwatch _delayStopwatch = new Stopwatch();
 
         private bool _isDisposed;
+#if !NETSTANDARD1_3 
         private IWaitEvent _delayEvent;
+#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DelayProvider"/> class.
@@ -111,7 +113,9 @@ public void Dispose()
             {
                 if (_isDisposed) return;
                 _isDisposed = true;
+#if !NETSTANDARD1_3 
                 _delayEvent?.Dispose();
+#endif
             }
         }
 

diff --git a/src/Unosquare.Swan/Exceptions/JsonRequestException.cs b/src/Unosquare.Swan/Exceptions/JsonRequestException.cs
@@ -12,7 +12,6 @@
     public class JsonRequestException
         : Exception
     {
-        /// <inheritdoc />
         /// <summary>
         /// Initializes a new instance of the <see cref="T:Unosquare.Swan.Exceptions.JsonRequestException" /> class.
         /// </summary>

diff --git a/src/Unosquare.Swan/Network.cs b/src/Unosquare.Swan/Network.cs
@@ -190,7 +190,7 @@ public static Task<IPAddress[]> GetDnsHostEntryAsync(string fqdn)
         /// <returns>
         /// An array of local ip addresses of the result produced by this task.
         /// </returns>
-        /// <exception cref="ArgumentNullException">fqdn</exception>
+        /// <exception cref="ArgumentNullException">fqdn.</exception>
         public static async Task<IPAddress[]> GetDnsHostEntryAsync(string fqdn, IPAddress dnsServer, int port)
         {
             if (fqdn == null)

diff --git a/src/Unosquare.Swan/Networking/Enums.Smtp.cs b/src/Unosquare.Swan/Networking/Enums.Smtp.cs
@@ -2,9 +2,8 @@
 namespace Unosquare.Swan.Networking
 {
 #if NETSTANDARD1_3
-
     /// <summary>
-    /// Defines the different SMTP status codes
+    /// Defines the different SMTP status codes.
     /// </summary>
     public enum SmtpStatusCode
     {

diff --git a/src/Unosquare.Swan/Unosquare.Swan.csproj b/src/Unosquare.Swan/Unosquare.Swan.csproj
@@ -18,7 +18,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>

diff --git a/test/Unosquare.Swan.Test/Unosquare.Swan.Test.csproj b/test/Unosquare.Swan.Test/Unosquare.Swan.Test.csproj
@@ -15,17 +15,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.4.0">
+    <PackageReference Include="coverlet.msbuild" Version="2.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <packagereference Include="NUnit3TestAdapter" Version="3.11.2"></packagereference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <packagereference Include="NUnit3TestAdapter" Version="3.13.0"></packagereference>
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Portable.BouncyCastle" Version="1.8.4" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.5" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">