Merge branch 'feat/system-value-tuple' into 'develop'

Replace Rayark.Mast.Tuple with ValueTuple

See merge request engine/mast!7

.gitignore

@@ -1,8 +1,9 @@
+.DS_Store
 *.sublime-project
 *.sublime-workspace
-*.sln
-*.csproj
-*.zip
+/*.sln
+/*.csproj
+/*.zip
 .vs/
 Temp/
 Library/
@@ -14,4 +15,5 @@ obj/
 Assets/Plugins/Editor.meta
 Assets/Plugins/Editor
 *.DotSettings.user
-
+/build/bin
+/build/obj

.gitlab-ci.yml

@@ -8,7 +8,7 @@ stages:
 
 build_lib_test:
   stage: build
-  image: mono:5.8
+  image: mcr.microsoft.com/dotnet/core/sdk:3.1-buster
   script:
     - ./build.sh
   tags:
@@ -22,13 +22,13 @@ build_lib_release:
   script:
     - export BUILD_VERSION=$(echo $CI_COMMIT_REF_NAME | sed  's/\([0-9]\+\.[0-9]\+\.[0-9]\+\)\-release$/\1/g')
     - echo $BUILD_VERSION
-    - sed -i -e "s/0.5.1.0/$BUILD_VERSION.0/g" Assets/Plugins/Rayark/Mast/Properties/AssemblyInfo.cs
+    - sed -i -e "s/0.5.1.0/$BUILD_VERSION.0/g" build/Rayark.Mast.csproj
     - ./build.sh
   artifacts:
     expire_in: 5 yrs
     name: mast-unity-project
     paths:
-      - build
+      - pack
   tags:
     - docker
   only:
@@ -38,7 +38,7 @@ mast-release:
   stage: release
   image: bash
   script:
-    - cp build/Assets/Plugins/Rayark/Mast/Rayark.Mast.dll .
+    - cp pack/Assets/Plugins/Rayark/Mast/Rayark.Mast.dll .
   artifacts:
     expire_in: 5 yrs
     paths:
@@ -78,4 +78,4 @@ pages:
   tags:
     - docker
   only:
-    - master
+    - master

Assets/Plugins/Rayark/Mast/Editor/Tests/TestMonad.cs

@@ -236,7 +236,7 @@ public void ConcurrentMonad2ErrorTest()
             var mc = new ConcurrentMonad<int, string>(m1, m2);
             _Wait(mc);
 
-            Assert.IsNull(mc.Result);
+            Assert.AreEqual(default((int,string)), mc.Result);
             Assert.AreEqual(mc.Error.Message, "error 2");
         }
 
@@ -276,7 +276,7 @@ public void ConcurrentMonad3ErrorTest()
             var mc = new ConcurrentMonad<int, string, bool>(m1, m2, m4);
             _Wait(mc);
 
-            Assert.IsNull(mc.Result);
+            Assert.AreEqual(default((int,string,bool)), mc.Result);
             Assert.AreEqual(mc.Error.Message, "error 2");
         }
 

Assets/Plugins/Rayark/Mast/FuncMonad.cs

@@ -11,7 +11,7 @@ namespace Rayark.Mast
     /// makes it possible to add some extra operation right before a complex monad.</remarks>
     public class FuncMonad<T> : IMonad<T>, IEnumerator
     {
-        public readonly Func<T> _func;
+        private readonly Func<T> _func;
 
         public FuncMonad(Func<T> func)
         {