Merge branch 'master' into release

VitaliiTsilnyk · May 22, 2016 · 8268137 · 8268137
2 parents 45144e7 + 8c00024
commit 8268137
Show file tree

Hide file tree

Showing 33 changed files with 19,793 additions and 422 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@
 *.vs10x
 *_ReSharper.*
 .vs
+.vscode
 
 
 ###### Binary files
@@ -22,23 +23,12 @@
 *.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
 
 

diff --git a/.travis.yml b/.travis.yml
@@ -2,31 +2,52 @@
 # Travis CI configuration file
 #
 
+dist: trusty
 language: csharp
+sudo: required
 
+addons:
+  apt:
+    packages:
+    - libunwind8
 
 mono:
   - 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:
  - 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
+ - mono secure-file/tools/secure-file.exe -decrypt NGettext.snk.enc -secret "$SNK_SECRET" 
+ - curl -sSL https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview1/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version 1.0.0-preview1-002702 --install-dir ~/dotnet
+ - sudo ln -s ~/dotnet/dotnet /usr/local/bin
 
 solution: NGettext.sln
 
 script:
-  - dnvm list
-  - dnu restore --quiet
+  - dotnet restore
   - cd src/NGettext
-  - dnu build --framework dnx451
+  - dotnet build --framework "net20"
+  - dotnet build --framework "net40"
+  - dotnet build --framework "net40-client"
+  - dotnet build --framework "net45"
+  - dotnet build --framework ".NETPortable,Version=v4.0,Profile=Profile136"
+  - dotnet build --framework ".NETPortable,Version=v4.0,Profile=Profile328"
+  - dotnet build --framework ".NETPortable,Version=v4.5,Profile=Profile259"
+  - dotnet build --framework "netstandard1.0"
+  - dotnet build --framework "netstandard1.3"
+  - cd ../..
+  - cd src/NGettext.PluralCompile
+  - dotnet build --framework "net20"
+  - dotnet build --framework "net40"
+  - dotnet build --framework "net40-client"
+  - dotnet build --framework "net45"
+  - dotnet build --framework "netstandard1.3"
   - cd ../..
   - cd test/NGettext.Tests
-  - dnx test -parallel none
+  - dotnet restore && dotnet build && dotnet test
   - cd ../..
   - cd test/NGettext.PluralCompile.Tests
-  - dnx test -parallel none
+  - dotnet restore && dotnet build && dotnet test
diff --git a/LICENSE b/LICENSE
@@ -1,21 +1,21 @@
+The MIT License (MIT)
 
-Copyright (c) 2012 Neris Ereptoris (www.neris.ws)
+Copyright (c) 2012 Vitaly Zilnik
 
-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:
+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 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.
+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.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-NGettext [![Build Status](https://travis-ci.org/neris/NGettext.svg?branch=master)](https://travis-ci.org/neris/NGettext) [![Build Status](https://ci.appveyor.com/api/projects/status/oc151pvllqqy0po9?svg=true)](https://ci.appveyor.com/project/neris/ngettext)
+NGettext [![Build Status](https://travis-ci.org/neris/NGettext.svg?branch=master)](https://travis-ci.org/neris/NGettext) [![Build Status](https://ci.appveyor.com/api/projects/status/oc151pvllqqy0po9?svg=true)](https://ci.appveyor.com/project/neris/ngettext) [![NuGet](https://img.shields.io/nuget/v/NGettext.svg?label=nuget:%20NGettext)](https://www.nuget.org/packages/NGettext/) [![NuGet](https://img.shields.io/nuget/v/NGettext.svg?label=nuget:%20NGettext.PluralCompile)](https://www.nuget.org/packages/NGettext.PluralCompile/)
 ========
 
 A cross-platform .NET implementation of the GNU/Gettext library.
@@ -44,8 +44,8 @@ Build status
 
 |OS |Target frameworks (build)|Target frameworks (test)|Status|
 |:--|:--|:--|:--|
-|Windows|net20 net35 net40 net45 net46<br/>net35-client net40-client<br/>dnx451<br/>dnxcore50 uap10.0|dnx451|[![Build Status](https://ci.appveyor.com/api/projects/status/oc151pvllqqy0po9?svg=true)](https://ci.appveyor.com/project/neris/ngettext)|
-|Linux|dnx451-mono|dnx451-mono|[![Build Status](https://travis-ci.org/neris/NGettext.svg?branch=master)](https://travis-ci.org/neris/NGettext)|
+|Windows|net20 net35 net40 net45 net46<br/>net35-client net40-client<br/>netstandard1.0 netstandard1.3<br/>.NETPortable,Version=v4.0,Profile=Profile136<br/>.NETPortable,Version=v4.0,Profile=Profile328<br/>.NETPortable,Version=v4.5,Profile=Profile259|netcoreapp1.0|[![Build Status](https://ci.appveyor.com/api/projects/status/oc151pvllqqy0po9?svg=true)](https://ci.appveyor.com/project/neris/ngettext)|
+|Linux|net20 net40 net45<br/>net40-client<br/>netstandard1.0 netstandard1.3<br/>.NETPortable,Version=v4.0,Profile=Profile136<br/>.NETPortable,Version=v4.0,Profile=Profile328<br/>.NETPortable,Version=v4.5,Profile=Profile259|netcoreapp1.0|[![Build Status](https://travis-ci.org/neris/NGettext.svg?branch=master)](https://travis-ci.org/neris/NGettext)|
 
 
 
@@ -84,7 +84,7 @@ Now you can use NGettext in your code:
 
 If you using this library under CoreCLR and you want to use encodings different from UTF-8 for your *.mo files, you need to include [System.Text.Encoding.CodePages](https://www.nuget.org/packages/System.Text.Encoding.CodePages/) package into your application and initialize it like this:
 ```csharp
-	#if DNXCORE50
+	#if NETCOREAPP1_0
 		Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 	#endif
 ```
@@ -161,7 +161,7 @@ If you using this library under CoreCLR and you want to use encodings different
 ### Parsing plural rules from the *.mo file header
 
 NGettext can parse plural rules directly from the *.mo file header and compile it to a dynamic method in runtime.
-To enable this option you can just create a catalog using the `MoCompilingPluralLoader`:
+To enable this option you can just create a catalog using the `MoCompilingPluralLoader` from the [NGettext.PluralCompile](https://www.nuget.org/packages/NGettext.PluralCompile) package:
 ```csharp
 	ICatalog catalog = new Catalog(new MoCompilingPluralLoader("Example", "./locale"));
 ```

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5.0.0
+0.6.0
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,8 +4,7 @@ environment:
     secure: 0l0TrDvCNXH4z922G/Qa5hFG4+4payl1zRAfjMfEXRw=
 
 install:
-  - dnvm install latest
-  - dnu restore --quiet
+  - dotnet restore
   - nuget install secure-file -ExcludeVersion
   - secure-file\tools\secure-file -decrypt NGettext.snk.enc -secret %snk_secret%
 
@@ -14,7 +13,7 @@ build:
 
 test_script:
   - cd test\NGettext.Tests
-  - dnx test
+  - dotnet restore && dotnet build && dotnet test
   - cd ..\..
   - cd test\NGettext.PluralCompile.Tests
-  - dnx test
+  - dotnet restore && dotnet build && dotnet test
diff --git a/global.json b/global.json
@@ -1,6 +1,3 @@
 {
-  "projects": [ "src", "test" ],
-  "sdk": {
-    "version": "1.0.0-rc1-update1"
-  }
+  "projects": [ "src", "test" ]
 }
diff --git a/src/NGettext.PluralCompile/NGettext.PluralCompile.xproj b/src/NGettext.PluralCompile/NGettext.PluralCompile.xproj
@@ -5,16 +5,17 @@
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
 
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>2ef87e11-a829-4480-b97f-3f3b6d0b23f5</ProjectGuid>
     <RootNamespace>NGettext.PluralCompile</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
 
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
diff --git a/src/NGettext.PluralCompile/Properties/AssemblyInfo.cs b/src/NGettext.PluralCompile/Properties/AssemblyInfo.cs
@@ -9,12 +9,12 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NGettext.PluralCompile")]
-[assembly: AssemblyCopyright("Copyright © 2016 Neris Ereptoris (www.neris.ws)")]
+[assembly: AssemblyCopyright("Copyright © 2016 Vitaly Zilnik")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("0.5.0.0")]
-[assembly: AssemblyFileVersion("0.5.0.0")]
+[assembly: AssemblyVersion("0.6.0.0")]
+[assembly: AssemblyFileVersion("0.6.0.0")]
 
 [assembly: Guid("2ef87e11-a829-4480-b97f-3f3b6d0b23f5")]