Merge commit '31ff596f50d9c565d0262db6c65f003a463e4ac7' into develop

.appveyor.yml

@@ -1,4 +1,4 @@
-image: Visual Studio 2019
+image: Visual Studio 2022
 matrix:
   fast_finish: true
 environment:
@@ -15,14 +15,16 @@ skip_commits:
 install:
   - git submodule update --init
   - cmd: |
-      cinst python3 -n
-      cinst transifex-client
+      choco install transifex-cli
+      choco install dotnet-5.0-sdk dotnet-6.0-sdk dotnet-7.0-sdk
 
 build: off
 test: off
 
 build_script:
-  - pwsh: ./build.ps1 --target=CI --verbosity=Diagnostic
+  - pwsh: |
+      $env:TX_TOKEN = "$env:TRANSIFEX_API_TOKEN"
+      ./build.ps1 --target=CI --verbosity=Diagnostic
 
 cache:
   - "tools -> .build/dotnet-tools.json,recipe.cake,.build/sonarcloud.cake"

.tx/config

@@ -1,15 +1,16 @@
 [main]
-host = https://www.transifex.com
+host     = https://app.transifex.com
 lang_map = en_GB: en-GB, en_US: en-US
 
-[caketransifex.commonresx]
-source_file = src/Cake.Transifex/Common.resx
+[o:cake-contrib:p:caketransifex:r:commonresx]
 file_filter = src/Cake.Transifex/Common.<lang>.resx
+source_file = src/Cake.Transifex/Common.resx
 source_lang = en
-type = RESX
+type        = RESX
 
-[caketransifex.exceptionsresx]
-source_file = src/Cake.Transifex/Exceptions.resx
+[o:cake-contrib:p:caketransifex:r:exceptionsresx]
 file_filter = src/Cake.Transifex/Exceptions.<lang>.resx
+source_file = src/Cake.Transifex/Exceptions.resx
 source_lang = en
-type = RESX
+type        = RESX
+

GitVersion.yml

@@ -0,0 +1,5 @@
+next-version: 3.0.0
+branches: {}
+ignore:
+  sha: []
+merge-message-formats: {}

codecov.yml

@@ -1,7 +1,7 @@
 codecov:
   ci:
     - appveyor
-    - !travis-ci
+    - '!travis-ci'
 
 coverage:
   range: 80..100

recipe.cake

@@ -21,11 +21,56 @@ BuildParameters.SetParameters(
     shouldUseDeterministicBuilds: true,
     shouldUseTargetFrameworkPath: false);
 
-ToolSettings.SetToolSettings(context: Context);
+ToolSettings.SetToolSettings(
+    context: Context,
+    testCoverageExcludeByFile: "**/*Designer.cs,*/*.g.cs;**/*.g.i.cs",
+    testCoverageExcludeByAttribute: "Obsolete;GeneratedCodeAttribute;CompilerGeneratedAttribute");
 ToolSettings.SetToolPreprocessorDirectives(
     codecovTool: "#tool nuget:?package=CodecovUploader&version=0.5.0"
 );
 
 BuildParameters.PrintParameters(Context);
 
+// Temporary Overrides needed to work properly with TX.Exe
+
+((CakeTask)BuildParameters.Tasks.TransifexSetupTask.Task).Actions.Clear();
+((CakeTask)BuildParameters.Tasks.TransifexPushSourceResource.Task).Actions.Clear();
+((CakeTask)BuildParameters.Tasks.TransifexPullTranslations.Task).Actions.Clear();
+((CakeTask)BuildParameters.Tasks.TransifexPushTranslations.Task).Actions.Clear();
+
+private static void AddGlobalOptions(TransifexRunnerSettings settings)
+{
+    if (!string.IsNullOrEmpty(BuildParameters.Transifex.ApiToken))
+    {
+        settings.ArgumentCustomization = args => args.PrependSwitchQuotedSecret("--token", " ", BuildParameters.Transifex.ApiToken);
+    };
+}
+
+BuildParameters.Tasks.TransifexPushSourceResource.Does(() =>
+{
+    var settings = new TransifexPushSettings
+    {
+        UploadSourceFiles = true,
+        Force = string.Equals(BuildParameters.Target, "Transifex-Push-SourceFiles", StringComparison.OrdinalIgnoreCase),
+    };
+
+    AddGlobalOptions(settings);
+
+    TransifexPush(settings);
+});
+
+BuildParameters.Tasks.TransifexPullTranslations.Does(() =>
+{
+    var settings = new TransifexPullSettings
+    {
+        All = true,
+        Mode = BuildParameters.TransifexPullMode,
+        MinimumPercentage = BuildParameters.TransifexPullPercentage
+    };
+
+    AddGlobalOptions(settings);
+
+    TransifexPull(settings);
+});
+
 Build.RunDotNetCore();

src/Cake.Transifex.Tests/Cake.Transifex.Tests.csproj

@@ -5,15 +5,12 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageReference Include="Cake.Testing" Version="3.0.0" />
-    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

src/Cake.Transifex/Cake.Transifex.csproj

@@ -52,6 +52,7 @@ Supports Cake $(CakeVersion)+
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.1.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

src/Directory.Build.props

@@ -4,8 +4,4 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-  </ItemGroup>
 </Project>