Skip to content

Commit 370936c

Browse files
Merge pull request #610 from Fody/GitHubSync/20251114-105134
GitHubSync update
2 parents 3ffeb9b + 1aef367 commit 370936c

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

deployment/cake/generic-variables.cake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#l "buildserver.cake"
22

33
#tool "nuget:?package=GitVersion.CommandLine&version=5.12.0"
4+
#tool "nuget:?package=NuGet.CommandLine&version=7.0.0"
45

56
//-------------------------------------------------------------
67

@@ -252,6 +253,8 @@ public class NuGetContext : BuildContextBase
252253

253254
protected override void LogStateInfoForContext()
254255
{
256+
CakeContext.Information($"NuGet executable path '{Executable}'");
257+
CakeContext.Information($"NuGet executable version '{FileVersionInfo.GetVersionInfo(Executable).FileVersion}'");
255258
CakeContext.Information($"Restore using NuGet: '{RestoreUsingNuGet}'");
256259
CakeContext.Information($"Restore using dotnet restore: '{RestoreUsingDotNetRestore}'");
257260
}
@@ -511,7 +514,8 @@ private GeneralContext InitializeGeneralContext(BuildContext buildContext, IBuil
511514
data.NuGet = new NuGetContext(data)
512515
{
513516
PackageSources = buildContext.BuildServer.GetVariable("NuGetPackageSources", showValue: true),
514-
Executable = "./tools/nuget.exe",
517+
// Executable = "./tools/nuget.exe",
518+
Executable = buildContext.CakeContext.Tools.Resolve("nuget.exe").FullPath,
515519
LocalPackagesDirectory = "c:\\source\\_packages",
516520
RestoreUsingNuGet = buildContext.BuildServer.GetVariableAsBool("NuGet_RestoreUsingNuGet", false, showValue: true),
517521
RestoreUsingDotNetRestore = buildContext.BuildServer.GetVariableAsBool("NuGet_RestoreUsingDotNetRestore", true, showValue: true),

tools/nuget.exe

-6.36 MB
Binary file not shown.

0 commit comments

Comments
 (0)