From b2630051e61f3309607154627baea7c81d267048 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 30 Jul 2020 21:11:05 +0100 Subject: [PATCH] (GH-523) Use .Net Global tool version of KuduSync This is the last of the tools that can be moved to .net core. --- Cake.Recipe/Content/toolsettings.cake | 6 +++++- Cake.Recipe/Content/wyam.cake | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Cake.Recipe/Content/toolsettings.cake b/Cake.Recipe/Content/toolsettings.cake index 3b71ac73..df889abf 100644 --- a/Cake.Recipe/Content/toolsettings.cake +++ b/Cake.Recipe/Content/toolsettings.cake @@ -36,6 +36,7 @@ public static class ToolSettings public static string GitVersionGlobalTool { get; private set; } public static string ReportGeneratorGlobalTool { get; private set; } public static string WyamGlobalTool { get; private set; } + public static string KuduSyncGlobalTool { get; private set; } public static void SetToolPreprocessorDirectives( string codecovTool = "#tool nuget:?package=codecov&version=1.12.1", @@ -57,7 +58,9 @@ public static class ToolSettings string gitReleaseManagerGlobalTool = "#tool dotnet:?package=GitReleaseManager.Tool&version=0.11.0", string gitVersionGlobalTool = "#tool dotnet:?package=GitVersion.Tool&version=5.3.4", string reportGeneratorGlobalTool = "#tool dotnet:?package=dotnet-reportgenerator-globaltool&version=4.6.1", - string wyamGlobalTool = "#tool dotnet:?package=Wyam.Tool&version=2.2.9" + string wyamGlobalTool = "#tool dotnet:?package=Wyam.Tool&version=2.2.9", + // This is using an unofficial build of kudusync so that we can have a .Net Global tool version. This was generated from this PR: https://github.com/projectkudu/KuduSync.NET/pull/27 + string kuduSyncGlobalTool = "#tool dotnet:https://www.myget.org/F/cake-contrib/api/v3/index.json?package=KuduSync.Tool&version=1.5.4-gc5cc5a2a19" ) { CodecovTool = codecovTool; @@ -78,6 +81,7 @@ public static class ToolSettings CodecovGlobalTool = codecovGlobalTool; CoverallsGlobalTool = coverallsGlobalTool; WyamGlobalTool = wyamGlobalTool; + KuduSyncGlobalTool = kuduSyncGlobalTool; } public static void SetToolSettings( diff --git a/Cake.Recipe/Content/wyam.cake b/Cake.Recipe/Content/wyam.cake index 2be80389..a1ccd5bc 100644 --- a/Cake.Recipe/Content/wyam.cake +++ b/Cake.Recipe/Content/wyam.cake @@ -145,7 +145,7 @@ BuildParameters.Tasks.ForcePublishDocumentationTask = Task("Force-Publish-Docume public void PublishDocumentation() { - RequireTool(ToolSettings.KuduSyncTool, () => { + RequireTool(BuildParameters.IsDotNetCoreBuild ? ToolSettings.KuduSyncGlobalTool : ToolSettings.KuduSyncTool, () => { if (BuildParameters.CanUseWyam) { var sourceCommit = GitLogTip("./");