Merge branch 'release/0.5.0'

cake-contrib · Mar 3, 2018 · d2cb01c · d2cb01c
2 parents 2e055cf + f125fd1
commit d2cb01c
Show file tree

Hide file tree

Showing 28 changed files with 600 additions and 137 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -11,7 +11,10 @@ skip_commits:
     - LICENSE
     - .travis.yml
 image: Visual Studio 2017
-cache: tools -> setup.cake,tools/packages.config
+cache: tools -> setup.cake,tools/packages.config,.appveyor.yml
+install:
+- cinst python3 -n
+- cinst transifex-client
 build_script:
 - ps: .\build.ps1 -Configuration Release -Target AppVeyor
 test: off

diff --git a/.gitattributes b/.gitattributes
@@ -12,6 +12,9 @@
 ###############################################################################
 *.cs     diff=csharp
 
+*.resx text whitespace=-trailing-space
+*.Designer.cs diff=csharp whitespace=-trailing-space
+
 ###############################################################################
 # Set the merge driver for project and solution files
 #

diff --git a/.gitignore b/.gitignore
@@ -290,3 +290,7 @@ tools/**
 
 # Custom
 BuildArtifacts/
+*.*.resx
+*.dll
+*.hash
+docs/input/tasks/
diff --git a/.travis.yml b/.travis.yml
diff --git a/.tx/config b/.tx/config
@@ -0,0 +1,15 @@
+[main]
+host = https://www.transifex.com
+lang_map = en_GB: en-GB, en_US: en-US
+
+[caketransifex.commonresx]
+source_file = src/Cake.Transifex/Common.resx
+file_filter = src/Cake.Transifex/Common.<lang>.resx
+source_lang = en
+type = RESX
+
+[caketransifex.exceptionsresx]
+source_file = src/Cake.Transifex/Exceptions.resx
+file_filter = src/Cake.Transifex/Exceptions.<lang>.resx
+source_lang = en
+type = RESX
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 WormieCorp
+Copyright (c) 2017-2018 Kim J. Nordmo
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,13 +1,14 @@
 # Cake.Transifex
 
 [![license](https://img.shields.io/github/license/cake-contrib/Cake.Transifex.svg)](https://github.com/cake-contrib/Cake.Transifex/blob/master/LICENSE)
+[![Open Source Helpers](https://www.codetriage.com/wormiecorp/cake.transifex/badges/users.svg)](https://www.codetriage.com/wormiecorp/cake.transifex)
 
 Cake.Transifex is a addin for the Cake Build script adding support for working with the localization service Transifex.
 This addin requires that the transifex client is already installed and is available as `tx`.
 
 ## Information
 
-To install the transifex client, install python, then run `pip install transifex-client`.
+To install the transifex client, install python, then run `pip install transifex-client`, or using the chocolatey package `choco install transifex-client --version 0.12.4` *(version can be omitted when package have been approved)*.
 
 | |Stable|Pre-release|
 |:--:|:--:|:--:|
@@ -20,6 +21,7 @@ Development versions is available at the following nuget api endpoint: <https://
 
 ### Usage
 The following aliases is available from the cake build script:
+- `TransifexInit`   -> Initialize a simple configuration file in the repository
 - `TransifexStatus` -> Get the status of the current translations in the local repository.
 - `TransifexPush`   -> Push translations to the remote transifex server (Optionally also the source file)
 - `TransifexPull`   -> Pull monitored translations from the remote transifex server
@@ -28,7 +30,6 @@ The following aliases is available from the cake build script:
 | | master | develop |
 |:--:|:--:|:--:|
 |AppVeyor|[![AppVeyor branch master](https://img.shields.io/appveyor/ci/cakecontrib/cake-transifex/master.svg)](https://ci.appveyor.com/project/cakecontrib/cake-transifex/branch/master)|[![AppVeyor branch develop](https://img.shields.io/appveyor/ci/cakecontrib/cake-transifex/develop.svg)](https://ci.appveyor.com/project/cakecontrib/cake-transifex/branch/develop)|
-|Travis CI|[![Travis branch](https://img.shields.io/travis/cake-contrib/Cake.Transifex/master.svg)](https://travis-ci.org/cake-contrib/Cake.Transifex)|[![Travis branch](https://img.shields.io/travis/cake-contrib/Cake.Transifex/develop.svg)](https://travis-ci.org/cake-contrib/Cake.Transifex)|
 
 ## Code Coverage
 
@@ -39,27 +40,27 @@ The following aliases is available from the cake build script:
 
 ## Quick Links
 
-- [Addin Documentation](https://cake-contrib.github.io/Cake.Transifex) *Not yet created*
+- [Addin Documentation](https://cake-contrib.github.io/Cake.Transifex)
 - [Transifex Documentation](https://docs.transifex.com/)
 
 ## Chat Room
 
 Come join in the conversation about Cake.Transifex in our Gitter Chat Room
 
-[![Join the chat at https://gitter.im/cake-contrib/Lobby](https://badges.gitter.im/cake-contrib/Lobby.svg)]((https://gitter.im/cake-contrib/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/cake-contrib/Lobby](https://badges.gitter.im/cake-contrib/Lobby.svg)](https://gitter.im/cake-contrib/Lobby)
 
 ## Building Cake.Transifex
 
 ### 1. Building on Windows
 The following are needed to build Cake.Transifex on Windows
-- .NET Core 1.0.1
+- .NET Core 2.0
+- .NET 4.6
 - Visual Studio 2017
-- .NET 4.5 (.NET 4.5.2 to build the unit tests), *these should already be installed when installing Visual Studio 2017*
 
-Open up a powershell window and call `.\build.ps1`, this should build the projects, run the unit tests and create nuget packages in the `.\artifacts\v{version}\nuget` directory.
+Open up a powershell window and call `.\build.ps1`, this should build the projects, run the unit tests and create nuget packages in the `.\BuildArtifacts\Packages\NuGet` directory.
 
 ### 2. Building on Linux or OSX
-- .NET Core 1.0.1
+- .NET Core 1.0.5 and 2.0
 - Mono (uncertain of which version, and it may fail on some systems)
 
 Open up the terminal and call `sh build.sh`, this should build the projects, run the unit tests and create nuget packages in the `./artifacts/v{version}/nuget` directory.

diff --git a/build.ps1 b/build.ps1
@@ -181,4 +181,4 @@ if (!(Test-Path $CAKE_EXE)) {
 # Start Cake
 Write-Host "Running build script..."
 Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
-exit $LASTEXITCODE
+exit $LASTEXITCODE
diff --git a/cake.config b/cake.config
@@ -3,6 +3,7 @@
 
 [Nuget]
 Source=https://api.nuget.org/v3/index.json
+UseInProcessClient=true
 
 [Roslyn]
 NuGetSource=https://packages.nuget.org/api/v2

diff --git a/docs/input/_Footer.cshtml b/docs/input/_Footer.cshtml
@@ -0,0 +1 @@
+Copyright &copy; 2017-2018 <a href="https://github.com/AdmiringWorm" target="_blank">Kim J. Nordmo</a>
diff --git a/docs/input/blog/new-release-0.4.0.md b/docs/input/blog/new-release-0.4.0.md
@@ -0,0 +1,26 @@
+---
+Title: New Release - 0.4.0
+Published: 2017-12-18
+Category: Release
+Author: AdmiringWorm
+---
+
+# 0.4.0 Compatibility Release
+
+This blog post is a little belated, but here it is.
+This release is just a minor compatibility release to make Cake.Transifex
+compatible with Cake above version 0.22, while maintaining compatibility with
+previous releases.
+
+
+## Release Notes
+
+As part of this release we had [9 commits](https://github.com/cake-contrib/Cake.Transifex/compare/0.3.0...0.4.0) which resulted in [2 issues](https://github.com/cake-contrib/Cake.Transifex/issues?milestone=4&state=closed) being closed.
+
+
+__Feature__
+
+- [__#16__](https://github.com/cake-contrib/Cake.Transifex/issues/16) Update Cake.Core dependency to version 0.22.0
+
+### Where to get it
+You can download this release from [nuget](https://nuget.org/packages/Cake.Transifex/0.4.0)
diff --git a/docs/input/docs/building/linux.md b/docs/input/docs/building/linux.md
@@ -7,7 +7,7 @@ Author: Kim Nordmo
 ## Requirements
 
 The following are need to build Cake.Transifex on Linux:
-- .NET Core SDK 1.0.4 *(could work with other versions as well)*
+- .NET Core SDK 1.0.5 and 2.0 *(could work with other versions as well)*
 - Mono 4.2.3+ *(earlier versions may work, but are not supported)*
 
 All other dependencies will be automatically downloaded when invoking the build script.

diff --git a/docs/input/docs/building/windows.md b/docs/input/docs/building/windows.md
@@ -8,8 +8,8 @@ Author: Kim Nordmo
 
 The following are need to build Cake.Transifex on Windows:
 - Visual Studio 2017
-- .NET Core SDK 1.0.4 *(could work with other versions as well)*
-- .NET Framework 4.5
+- .NET Core SDK 2.0 *(could work with other versions as well)*
+- .NET Framework 4.6
 
 All other dependencies will be automatically downloaded when invoking the build script.
 

diff --git a/docs/input/docs/usage/intro.md b/docs/input/docs/usage/intro.md
@@ -23,4 +23,4 @@ When the cake script is run, this will download the latest version of the `Cake.
 
 
 *NOTE: Remember to also install the transifex (`tx`) client on the running computer, this can be installed through
-the python `pip` utility (`pip install transifex-client`).*
+the python `pip` utility (`pip install transifex-client`) or through chocolatey `choco install transifex-client`.*
diff --git a/docs/input/index.cshtml b/docs/input/index.cshtml
@@ -23,4 +23,24 @@ NoGutter: false
             https://www.myget.org/F/cake-contrib/api/v2
         </a>
     </p>
+
+    <h3>Cake support</h3>
+    <p>
+        This addin supports multiple frameworks and with that multiple Cake versions
+        The following is a list of the Cake versions this addin is expected to work with.
+    </p>
+    <ul>
+        <li>
+            Targeting .NET 4.5, supports Cake version 0.16.2-0.21.0.
+        </li>
+        <li>
+            Targeting .NET 4.6, supports Cake version 0.22.0-0.25.0
+        </li>
+        <li>
+            Targeting .NET standard 1.6, supports Cake version 0.22.0-0.25.0 (version 0.3.0 of Cake.Transifex supports Cake version 0.16.2-0.21.0)
+        </li>
+        <li>
+            Targeting .NET standard 2.0, supports Cake version 0.26.0+ (Starting from version 0.5.0 of Cake.Transifex).
+        </li>
+    </ul>
 </div>