Merge branch 'release/0.4.0'

cake-contrib · Oct 24, 2017 · 2e055cf · 2e055cf
2 parents 5fcc4c5 + 6983f3a
commit 2e055cf
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 19 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,5 +1,6 @@
 branches:
   dev(elop)?(ment)?$:
+    mode: ContinuousDelivery
     tag: alpha
 ignore:
   sha: []
diff --git a/setup.cake b/setup.cake
@@ -11,7 +11,7 @@ BuildParameters.SetParameters(
     repositoryName: "Cake.Transifex",
     appVeyorAccountName: "cakecontrib",
     shouldRunDotNetCorePack: true,
-    shouldBuildNugetSourcePackage: true,
+    shouldBuildNugetSourcePackage: false,
     solutionFilePath: "./Cake.Transifex.sln",
     testFilePattern: "/**/*.Tests.csproj"
 );

diff --git a/src/Cake.Transifex.Tests/Cake.Transifex.Tests.csproj b/src/Cake.Transifex.Tests/Cake.Transifex.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Condition="'$(NetCoreOnly)'!='true'">
-    <TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.0;net452;net46</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(NetCoreOnly)'=='true'">
     <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
@@ -9,15 +9,21 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452'">
+    <PackageReference Include="Cake.Testing" Version="0.16.2" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net452'">
+    <PackageReference Include="Cake.Testing" Version="0.22.0" />
+  </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Cake.Testing" Version="0.18.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="Moq" Version="4.7.1" />
-    <PackageReference Include="Shouldly" Version="2.8.2" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="Moq" Version="4.7.142" />
+    <PackageReference Include="Shouldly" Version="2.8.3" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+  <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp1.0' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>

diff --git a/src/Cake.Transifex.Tests/TransifexInitRunnerTests.cs b/src/Cake.Transifex.Tests/TransifexInitRunnerTests.cs
@@ -1,4 +1,4 @@
-namespace Cake.Transifex.Tests
+namespace Cake.Transifex.Tests
 {
     using System;
     using Shouldly;
@@ -84,7 +84,7 @@ public void Evaluate_ThrowsArgumentExceptionWhenTokenAndUsernameOrPasswordIsSpec
 
             var ex = Assert.Throws<ArgumentException>(() => this.fixture.Run());
 
-            Assert.Equal(ex.Message, "A token can not be set at the same time as either the username or password.");
+            Assert.Equal("A token can not be set at the same time as either the username or password.", ex.Message);
         }
     }
 }
diff --git a/src/Cake.Transifex/Cake.Transifex.csproj b/src/Cake.Transifex/Cake.Transifex.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Condition="'$(NetCoreOnly)'!='true'">
-    <TargetFrameworks>netstandard1.6;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6;net45;net46</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(NetCoreOnly)'=='true'">
     <TargetFrameworks>netstandard1.6</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Cake.Transifex.xml</DocumentationFile>
     <LangVersion>7</LangVersion>
     <DebugType>pdbonly</DebugType>
@@ -25,7 +25,7 @@ To install the transifex client, install python, then run `pip install transifex
     <RepositoryUrl>https://github.com/cake-contrib/Cake.Transifex</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>cake build transifex localization</PackageTags>
-    <IncludeSymbols>True</IncludeSymbols>
+    <IncludeSymbols>False</IncludeSymbols>
     <PackageReleaseNotes>$(RepositoryUrl)/releases/tag/$(Version)</PackageReleaseNotes>
   </PropertyGroup>
 
@@ -36,13 +36,16 @@ To install the transifex client, install python, then run `pip install transifex
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DebugSymbols>False</DebugSymbols>
+    <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <PackageReference Include="Cake.Core" Version="0.16.2" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net45'">
+    <PackageReference Include="Cake.Core" Version="0.22.0" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.6' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>

diff --git a/src/Cake.Transifex/TransifexRunnerAliases.cs b/src/Cake.Transifex/TransifexRunnerAliases.cs
@@ -1,4 +1,4 @@
-namespace Cake.Transifex
+namespace Cake.Transifex
 {
     using Cake.Core;
     using Cake.Core.Annotations;
@@ -15,7 +15,7 @@ public static class TransifexRunnerAliases
         /// sets the host to <c>www.transifex.com</c>.
         /// </summary>
         /// <param name="context">The cake context</param>
-        /// <para>Runs <c>tx init --host www.transifex.com</c> with the specified <paramref name="settings" /></para>
+        /// <para>Runs <c>tx init --host www.transifex.com</c> with the specified with default settings.</para>
         /// <para>Cake task:</para>
         /// <example>
         /// <code>
@@ -37,6 +37,7 @@ public static void TransifexInit(this ICakeContext context)
         /// an API token.
         /// </summary>
         /// <param name="context">The cake context</param>
+        /// <param name="settings">The settings to use when initializing repository.</param>
         /// <para>Runs <c>tx init</c> with the specified <paramref name="settings" /></para>
         /// <para>Cake task:</para>
         /// <example>