Merge branch 'dev'

Author: OlegZee

.travis.yml

@@ -9,12 +9,12 @@ script:
 - fsharpi build.fsx -- build test
 deploy:
   provider: releases
-  api_key:
-    secure: Lgn2Hnagx7tYvO7gIVTiH/81DseqMyjAPrKczz7xoIH7BizFZPlErqukMY8sEIXAPyeTVDoZa1hh1Jm+49YeFqihubwHcdSk1YAc56Fo535CpFxLpESZ7I5T1fAFCG1ose1p/TZarrVWUTE2oaB7gnAhQBlcoUWp/xyMRnygMAI=
   file:
-  - ./bin/Xake.Core.dll
-  - ./bin/Xake.Core.XML
+  - "./bin/Xake.Core.dll"
+  - "./bin/Xake.Core.XML"
   skip_cleanup: true
   on:
     tags: true
     condition: "${TRAVIS_TAG:0:1} = v"
+  api-key:
+    secure: GcNd0L3Kdyv9vTeKqDXHAfxQne8a6guWQYCiiEvQWtLwNss4foV2dD6PQ8W+J7l+ay8wLC+P3ZKxO0GiKbn5cglXTbBI9WlrHk+nrSQ/JWmaqqjZhGUlAvlek0Ko4walGfRQJPIaZ9pbnX4L4Mj+jrwQWrI1IyzZXbSBL2i2Tgo=

XakeLibTests/FilesetTests.fs

@@ -188,8 +188,14 @@ type FilesetTests() =
     [<TestCase("c:\\*\\*.c", "c:\\abc\\a.c", ExpectedResult = true)>]
     [<TestCase("c:\\*\\*.c", "c:\\abc\\def\\a.c", ExpectedResult = false)>]
     [<TestCase("c:\\**\\*.c", "c:\\abc\\def\\a.c", ExpectedResult = true)>]
+    [<TestCase("c:/abc/../def\\a.c", "c:\\def\\a.c", ExpectedResult = true)>]
+    [<TestCase("c:\\def\\a.c", "c:/abc/../def\\a.c", ExpectedResult = true)>]
     member o.MaskTests(m,t) = matches m "" t
 
+    [<TestCase("../subd1/a.ss", @"C:\projects\Xake\bin\Debug\subd1", @"C:\projects\Xake\bin\Debug\subd1\../subd1/a.ss", ExpectedResult = true)>]
+    [<TestCase("subd2/a.ss", @"C:\projects\Xake\bin\Debug\subd1", @"C:\projects\Xake\bin\Debug\subd1\subd2/a.ss", ExpectedResult = true)>]
+    member o.MaskTests3(m,root,t) = matches m root t
+
     [<TestCase("c:\\*\\*.c", "c:\\abc\\def\\..\\a.c", ExpectedResult = true)>]
     [<TestCase("c:\\*.c", "c:\\abc\\..\\a.c", ExpectedResult = true)>]