Tidy

LanguageExt.Core/Immutable Collections/Prelude_Collections.cs

@@ -546,6 +546,13 @@ public static AtomHashMap<K, V> AtomHashMap<K, V>() =>
         public static AtomHashMap<K, V> AtomHashMap<K, V>((K, V) head, params (K, V)[] tail) =>
             LanguageExt.HashMap.create(head, tail).ToAtom();
 
+        /// <summary>
+        /// Create an immutable hash-map
+        /// </summary>
+        [Pure]
+        public static AtomHashMap<K, V> AtomHashMap<K, V>(HashMap<K, V> items) =>
+            new (items);
+
         /// <summary>
         /// Create an immutable hash-map
         /// </summary>
@@ -568,7 +575,6 @@ public static AtomHashMap<K, V> toAtomHashMap<K, V>(IEnumerable<KeyValuePair<K,
             LanguageExt.HashMap.createRange(items).ToAtom();
 
 
-
         /// <summary>
         /// Create an immutable hash-map
         /// </summary>
@@ -590,6 +596,13 @@ public static AtomHashMap<EqK, K, V> AtomHashMap<EqK, K, V>((K, V) head, params
         public static AtomHashMap<EqK, K, V> AtomHashMap<EqK, K, V>(KeyValuePair<K, V> head, params KeyValuePair<K, V>[] tail) where EqK : struct, Eq<K> =>
             LanguageExt.HashMap.create<EqK, K, V>(head, tail).ToAtom();
 
+        /// <summary>
+        /// Create an immutable hash-map
+        /// </summary>
+        [Pure]
+        public static AtomHashMap<EqK, K, V> AtomHashMap<EqK, K, V>(HashMap<EqK, K, V> items) where EqK : struct, Eq<K> =>
+            new (items);
+
         /// <summary>
         /// Create an immutable hash-map
         /// </summary>
@@ -603,8 +616,6 @@ public static AtomHashMap<EqK, K, V> toAtomHashMap<EqK, K, V>(IEnumerable<(K, V)
         [Pure]
         public static AtomHashMap<EqK, K, V> toAtomHashMap<EqK, K, V>(IEnumerable<KeyValuePair<K, V>> items) where EqK : struct, Eq<K> =>
             LanguageExt.HashMap.createRange<EqK, K, V>(items).ToAtom();
-
-
 
         /// <summary>
         /// Create an immutable list

LanguageExt.Core/Monads/Alternative Value Monads/Either/Either/Either.cs

@@ -51,7 +51,7 @@ namespace LanguageExt
 
         internal readonly R right;
         internal readonly L left;
-
+        
         private Either(R right)
         {
             if (isnull(right))
@@ -72,7 +72,6 @@ private Either(L left)
             this.left = left;
         }
 
-
         Either(SerializationInfo info, StreamingContext context)
         {
             State = (EitherStatus)info.GetValue("State", typeof(EitherStatus));

LanguageExt.Core/Monads/Alternative Value Monads/Fin/Fin.cs

@@ -58,11 +58,11 @@ value is null
 
         [Pure, MethodImpl(Opt.Default)]
         public static Fin<A> Fail(Error error) => 
-            new Fin<A>(error);
+            new (error);
 
         [Pure, MethodImpl(Opt.Default)]
         public static Fin<A> Fail(string error) => 
-            new Fin<A>(Error.New(error));
+            new (Error.New(error));
 
         [Pure]
         public bool IsFail

LanguageExt.Core/Monads/Alternative Value Monads/Option/OptionUnsafe/OptionUnsafe.cs

@@ -70,7 +70,6 @@ internal OptionUnsafe(A value, bool isSome)
         /// Ctor that facilitates serialisation
         /// </summary>
         /// <param name="option">None or Some A.</param>
-        [Pure]
         public OptionUnsafe(IEnumerable<A> option)
         {
             var first = option.Take(1).ToArray();
@@ -80,7 +79,6 @@ public OptionUnsafe(IEnumerable<A> option)
                 : default;
         }
 
-        [Pure]
         OptionUnsafe(SerializationInfo info, StreamingContext context)
         {
             isSome = (bool)info.GetValue("IsSome", typeof(bool));
@@ -97,7 +95,7 @@ public OptionUnsafe(IEnumerable<A> option)
         public void GetObjectData(SerializationInfo info, StreamingContext context)
         {
             info.AddValue("IsSome", IsSome);
-            if (IsSome) info.AddValue("Value", Value);
+            if (IsSome) info.AddValue("Value", (object)Value);
         }
 
         /// <summary>

LanguageExt.Tests/ArrayTests.cs

@@ -1,7 +1,6 @@
 using Xunit;
 using System;
 using System.Linq;
-using LanguageExt;
 using static LanguageExt.Prelude;
 using static LanguageExt.List;
 

LanguageExt.Tests/AtomTests.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using LanguageExt;
 using static LanguageExt.Prelude;
 using Xunit;
 using System.Diagnostics;

LanguageExt.Tests/ChoiceTests.cs

@@ -1,5 +1,4 @@
 using System;
-using LanguageExt;
 using LanguageExt.ClassInstances;
 using static LanguageExt.Prelude;
 using Xunit;

LanguageExt.Tests/CollectionOrderingTests.cs

@@ -1,6 +1,5 @@
 using System;
 using Xunit;
-using LanguageExt;
 using static LanguageExt.Prelude;
 
 namespace LanguageExt.Tests

LanguageExt.Tests/CompositionTests.cs

@@ -1,5 +1,4 @@
-using LanguageExt;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

LanguageExt.Tests/CompositionsTests.cs

@@ -1,5 +1,4 @@
-using LanguageExt;
-using static LanguageExt.Prelude;
+using static LanguageExt.Prelude;
 using static LanguageExt.TypeClass;
 using static LanguageExt.Compositions;
 using LanguageExt.ClassInstances;

LanguageExt.Tests/CondTest.cs

@@ -4,7 +4,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
-using LanguageExt;
 using static LanguageExt.Prelude;
 using static LanguageExt.CondExt;
 using Newtonsoft.Json;

LanguageExt.Tests/DelayTests.cs

@@ -1,5 +1,4 @@
-using LanguageExt;
-using static LanguageExt.Prelude;
+using static LanguageExt.Prelude;
 using static LanguageExt.PreludeRx;
 using System.Reactive;
 using System;

LanguageExt.Tests/DistinctTests.cs

@@ -1,5 +1,4 @@
 using System;
-using LanguageExt;
 using LanguageExt.ClassInstances;
 using static LanguageExt.Prelude;
 using Xunit;

LanguageExt.Tests/EitherApply.cs

@@ -1,6 +1,5 @@
 using System;
 using Xunit;
-using LanguageExt;
 using LanguageExt.TypeClasses;
 using static LanguageExt.Prelude;
 using static LanguageExt.TypeClass;

LanguageExt.Tests/EitherCoalesceTests.cs

@@ -1,5 +1,4 @@
 using Xunit;
-using LanguageExt;
 using static LanguageExt.Prelude;
 
 namespace LanguageExt.Tests

LanguageExt.Tests/EitherTests.cs

@@ -1,5 +1,4 @@
 using Xunit;
-using LanguageExt;
 using static LanguageExt.Prelude;
 
 namespace LanguageExt.Tests

LanguageExt.Tests/EitherUnsafeApply.cs

@@ -1,6 +1,5 @@
 using System;
 using Xunit;
-using LanguageExt;
 using static LanguageExt.Prelude;
 
 namespace LanguageExt.Tests

LanguageExt.Tests/EnumerableTTests.cs

@@ -1,6 +1,5 @@
 using System.Collections;
 using System.Linq;
-using LanguageExt;
 using LanguageExt.ClassInstances;
 //using LanguageExt.Trans;
 using static LanguageExt.Prelude;

LanguageExt.Tests/EqualityTests.cs

@@ -1,5 +1,4 @@
 using Xunit;
-using LanguageExt;
 using static LanguageExt.Prelude;
 using System;
 using System.Linq;

LanguageExt.Tests/ExceptionMatching.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Reflection.Metadata;
 using System.Runtime.CompilerServices;
-using LanguageExt;
 using static LanguageExt.Prelude;
 
 namespace LanguageExt.Tests

LanguageExt.Tests/FloatTypeExtensionsTests.cs

@@ -1,5 +1,4 @@
-using LanguageExt;
-using LanguageExt.ClassInstances;
+using LanguageExt.ClassInstances;
 using Xunit;
 using System.Linq;
 

LanguageExt.Tests/HashMapTests.cs

@@ -1,5 +1,4 @@
-using LanguageExt;
-//using LanguageExt.Trans;
+//using LanguageExt.Trans;
 using static LanguageExt.Prelude;
 using static LanguageExt.HashMap;
 using Xunit;

LanguageExt.Tests/HashSetTests.cs

@@ -1,5 +1,4 @@
-using LanguageExt;
-using static LanguageExt.Prelude;
+using static LanguageExt.Prelude;
 using static LanguageExt.HashSet;
 using Xunit;
 using System;

LanguageExt.Tests/IssuesTests.cs

@@ -48,7 +48,6 @@ static Try<int> addUser2(UserMapping user) => () =>
         static Try<UserMapping> createUserMapping2(ADUser user) => () =>
             UserMapping.New(user.ToString() + " mapped");
 
-        [Fact]
         public TryAsync<int> Issue207_5() =>
             from us in TryAsync<ADUser>(() => throw new Exception("fail"))
             from mu in createUserMapping2(us).ToAsync()

LanguageExt.Tests/LanguageExt.Tests.csproj

@@ -4,7 +4,7 @@
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <LangVersion>default</LangVersion>
     <RoslynCodeGenVersion>0.6.1</RoslynCodeGenVersion>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="dotnet-codegen" Version="$(RoslynCodeGenVersion)" />
@@ -18,15 +18,15 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="FluentAssertions" Version="6.7.0" />
-      <PackageReference Include="System.Reactive" Version="5.0.0" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+      <PackageReference Include="FluentAssertions" Version="6.11.0" />
+      <PackageReference Include="System.Reactive" Version="6.0.0" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
     <PackageReference Include="System.ValueTuple" Version="[4.5.0,)" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

LanguageExt.Tests/LensTests.cs

@@ -1,5 +1,4 @@
 using System;
-using LanguageExt;
 using Xunit;
 using static LanguageExt.Prelude;
 

LanguageExt.Tests/LinqTests.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using Xunit;
-using LanguageExt;
 using static LanguageExt.Prelude;
 using static LanguageExt.TypeClass;
 using LanguageExt.ClassInstances;

LanguageExt.Tests/ListMatchingTests.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Xunit;
-using LanguageExt;
 using static LanguageExt.Prelude;
 
 namespace LanguageExt.Tests

LanguageExt.Tests/ListTests.cs

@@ -1,7 +1,6 @@
 using Xunit;
 using System;
 using System.Linq;
-using LanguageExt;
 using static LanguageExt.Prelude;
 using static LanguageExt.List;
 

LanguageExt.Tests/MapTests.cs

@@ -1,5 +1,4 @@
-using LanguageExt;
-using static LanguageExt.Prelude;
+using static LanguageExt.Prelude;
 using static LanguageExt.Map;
 using Xunit;
 using System;

LanguageExt.Tests/MemoTests.cs

@@ -1,7 +1,6 @@
 using Xunit;
 using System;
 using System.Linq;
-using LanguageExt;
 using static LanguageExt.List;
 using static LanguageExt.Prelude;
 

LanguageExt.Tests/MemoryConsoleTests.cs

@@ -1,6 +1,5 @@
 using Xunit;
 using System.IO;
-using LanguageExt;
 using LanguageExt.Sys;
 using LanguageExt.Sys.IO;
 using LanguageExt.Sys.Test;

LanguageExt.Tests/MonadTests.cs

@@ -1,6 +1,5 @@
 using Xunit;
 using System;
-using LanguageExt;
 using static LanguageExt.List;
 using static LanguageExt.Prelude;
 using static LanguageExt.TypeClass;

LanguageExt.Tests/Multiplicable.cs

@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using Xunit;
 using static LanguageExt.Prelude;
-using LanguageExt;
 using LanguageExt.ClassInstances;
 
 namespace LanguageExt.Tests

LanguageExt.Tests/NewTypeTests.cs

@@ -1,5 +1,4 @@
 using Xunit;
-using LanguageExt;
 using LanguageExt.ClassInstances;
 using static LanguageExt.TypeClass;
 using LanguageExt.ClassInstances.Pred;

LanguageExt.Tests/NonNullTests.cs

@@ -1,5 +1,4 @@
 using System;
-using LanguageExt;
 using LanguageExt.Common;
 using static LanguageExt.Prelude;
 using Xunit;

LanguageExt.Tests/OptionApply.cs

@@ -1,6 +1,5 @@
 using System;
 using Xunit;
-using LanguageExt;
 using LanguageExt.ClassInstances;
 using static LanguageExt.Prelude;
 using static LanguageExt.TypeClass;

LanguageExt.Tests/OptionCoalesceTests.cs

@@ -1,5 +1,4 @@
 using Xunit;
-using LanguageExt;
 using static LanguageExt.Prelude;
 
 namespace LanguageExt.Tests

LanguageExt.Tests/OptionTTests.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using System.Collections.Generic;
-using LanguageExt;
 //using LanguageExt.Trans;
 using LanguageExt.TypeClasses;
 using static LanguageExt.TypeClass;

LanguageExt.Tests/OptionTests.cs

@@ -1,7 +1,6 @@
 using Xunit;
 using System;
 using System.Collections.Generic;
-using LanguageExt;
 using static LanguageExt.Prelude;
 
 namespace LanguageExt.Tests

LanguageExt.Tests/ParsecIOTests.cs

@@ -4,8 +4,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
-
-using LanguageExt;
 using LanguageExt.Common;
 using LanguageExt.Parsec;
 using static LanguageExt.Prelude;

LanguageExt.Tests/ParsecTests.cs

@@ -4,8 +4,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
-
-using LanguageExt;
 using M = LanguageExt.Map;
 using LanguageExt.Parsec;
 using static LanguageExt.Prelude;