Merge branch 'master' into release

.gitignore

@@ -1,41 +1,47 @@
-
-###### Editor files
-*~
-*.bak
-*.orig
-*.pidb
-*.suo
-*.user
-*.userprefs
-*.usertasks
-*.resources
-*.vs10x
-*_ReSharper.*
-
-
-###### Binary files
-[Bb]in
-[Oo]bj
-*.cache
-*.sln.proj
-*.nupkg
-
-
-###### Custom NAnt configuration
-/build.conf
-
-
-###### Automatic generated documentation and report files
-doc/generated/*
-doc/reports/*
-
-
-###### Other files
-dep/src/*
-src/packages/*
-NGettext.snk
-
-
-###### OS generated files
-Thumbs.db
-.DS_Store*
+
+###### Editor files
+*~
+*.bak
+*.orig
+*.pidb
+*.suo
+*.user
+*.userprefs
+*.usertasks
+*.resources
+*.vs10x
+*_ReSharper.*
+.vs
+
+
+###### Binary files
+[Bb]in
+[Oo]bj
+*.cache
+*.sln.proj
+*.nupkg
+
+
+###### DNX
+project.lock.json
+artifacts
+
+
+###### Custom NAnt configuration
+/build.conf
+
+
+###### Automatic generated documentation and report files
+doc/generated/*
+doc/reports/*
+
+
+###### Other files
+dep/src/*
+src/packages/*
+NGettext.snk
+
+
+###### OS generated files
+Thumbs.db
+.DS_Store*

.travis.yml

@@ -3,18 +3,27 @@
 #
 
 language: csharp
-solution: src/NGettext.sln
+
+
 mono:
-  - 3.12.0
-  - 3.2.8
+  - 4.2.1
+env:
+  global:
+    - secure: "JO9BJHINLiXBe77OhScvVh25NTCSgyQdWmfHSYmemYJRXKd48JlGVX+Hg+uBD9e9JNrgihR4M+7MRD+p1DeFJa5fnlRs4sP6Urtw15/wdEoyMzfJ6IwcQgH9L00dPrjH2vXdemFQHl3v9ViUQbqNwUmANxjOHv3T2xnN7pt+IiglTRGFAPsHXSAGxlhz3XGJC9f3nrTVAr8Btwf7nAxjHutr97kvw2i83sTWvEWl26CVRb+rSu3xjoK5ze+4UXXlMNni6qkXzKnvWgYDmmrLNaU6L6GWcpkPl7bOAaPZ1833tQp0G7ZNAxCguSbCM3xfU0ujXn9szXaKD2zt2MGl/otkR3x7vSy/I2F1870zAEw9WEmVY0lsKwVv5YXASMqxc0APo1d2xAMEZYGDz7TnO/JJSGFLj/MNB7zRqrYG/rkD75V2jd3O/rXwzHQL1J9n/G9by9lq3EWYxPHZ4bF9xOCEgtD5ow27xWmcwFnF4mZNErOezwjIvmZdQXymBxM094yc/kHS30gsvS/HwzzK7Ccb04Uvqdogl9nOI2Okm85fhnkEHAK4YE+XVKxgLOLPcuSTs9qtqwe5Tte+ACkqdCeivtacWcRNInbchfbldc53VjPXZ/tRrZAm+snCkukOHF07m38JpaGuiXaBiEBvGMPbIB6vCObh3rwUnYE255Q="
 
 install:
- - sudo apt-get install nant
+ - nuget install secure-file -ExcludeVersion
+ - mono secure-file/tools/secure-file.exe -decrypt NGettext.snk.enc -secret "${SNK_SECRET}"
+ - curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh | sh && source ~/.dnx/dnvm/dnvm.sh
+ - dnvm upgrade
 
-script:
-  - nant build
-  - nant test
+solution: NGettext.sln
 
-branches:
-  only:
-    - master
+script:
+  - dnvm list
+  - dnu restore --quiet
+  - cd src/NGettext
+  - dnu build --framework dnx451
+  - cd ../..
+  - cd test/NGettext.Tests
+  - dnx test -parallel none

LICENSE

@@ -1,21 +1,21 @@
-
-Copyright (c) 2012 Neris Ereptoris (www.neris.ws)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Copyright (c) 2012 Neris Ereptoris (www.neris.ws)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.