Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@
"loom"
],
"rollForward": false
},
"vpk": {
"version": "0.0.1589-ga2c5a97",
"commands": [
"vpk"
],
"rollForward": false
}
}
}
64 changes: 32 additions & 32 deletions src/Loom.Build.Tests/Unit/RestoreToolsModuleTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -231,38 +231,38 @@ public async Task ExecuteAsync_DoesNotCreateManifest_WhenManifestExists()
}
}

[Test]
public async Task ExecuteAsync_InstallsRequiredTools_Always()
{
var tempDir = CreateTemporaryDirectory();
try
{
System.IO.File.WriteAllText(Path.Combine(tempDir, "dotnet-tools.json"), "{}");

// Context requires both minver-cli and vpk
var settings = CreateSettings(requiresMinVer: true, requiresVelopack: true);
var mockDotNet = new Mock<IDotNet>();

SetupDotNetMocks(mockDotNet, out _, out _, out var toolOptions);

var builder = CreateSilentPipelineBuilder(settings, tempDir, mockDotNet);
var pipeline = await builder.BuildAsync();
await pipeline.RunAsync();

// Should have 2 install commands
var installCommands = toolOptions.Where(o => o.Arguments!.Contains("install")).ToList();
await Assert.That(installCommands).Count().IsEqualTo(2);
await Assert
.That(installCommands.Any(o => o.Arguments!.Contains("minver-cli")))
.IsTrue();
await Assert.That(installCommands.Any(o => o.Arguments!.Contains("vpk"))).IsTrue();
}
finally
{
if (Directory.Exists(tempDir))
Directory.Delete(tempDir, true);
}
}
// [Test]
// public async Task ExecuteAsync_InstallsRequiredTools_Always()
// {
// var tempDir = CreateTemporaryDirectory();
// try
// {
// System.IO.File.WriteAllText(Path.Combine(tempDir, "dotnet-tools.json"), "{}");

// // Context requires both minver-cli and vpk
// var settings = CreateSettings(requiresMinVer: true, requiresVelopack: true);
// var mockDotNet = new Mock<IDotNet>();

// SetupDotNetMocks(mockDotNet, out _, out _, out var toolOptions);

// var builder = CreateSilentPipelineBuilder(settings, tempDir, mockDotNet);
// var pipeline = await builder.BuildAsync();
// await pipeline.RunAsync();

// // Should have 2 install commands
// var installCommands = toolOptions.Where(o => o.Arguments!.Contains("install")).ToList();
// await Assert.That(installCommands).Count().IsEqualTo(2);
// await Assert
// .That(installCommands.Any(o => o.Arguments!.Contains("minver-cli")))
// .IsTrue();
// await Assert.That(installCommands.Any(o => o.Arguments!.Contains("vpk"))).IsTrue();
// }
// finally
// {
// if (Directory.Exists(tempDir))
// Directory.Delete(tempDir, true);
// }
// }

[Test]
public async Task ExecuteAsync_RestoresTools_AtEndOfExecution()
Expand Down
29 changes: 6 additions & 23 deletions src/Loom.Build/Modules/RestoreToolsModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,33 +51,16 @@ await context

if (_loom.RequiresMinVer)
{
await context
.DotNet()
.Tool.Execute(
new DotNetToolOptions() { Arguments = ["install", "minver-cli"] },
executionOptions: new CommandExecutionOptions
{
WorkingDirectory = _loom.WorkingDirectory,
},
cancellationToken: ct
);
context.Logger.LogInformation(
"MinVer is required. Please run 'dotnet tool install minver-cli' and commit dotnet-tools.json."
);
}

if (_loom.EnableVelopack)
{
await context
.DotNet()
.Tool.Execute(
new DotNetToolOptions()
{
Arguments = ["install", "vpk", "--version 0.0.1535-gb21da2a"],
},
executionOptions: new CommandExecutionOptions
{
WorkingDirectory = _loom.WorkingDirectory,
},
cancellationToken: ct
);
context.Logger.LogInformation(
"Velopack is required. Please run 'dotnet tool install vpk --version 0.0.1535-gb21da2a' and commit dotnet-tools.json."
);
}

context.Logger.LogInformation("Restoring dotnet local tools...");
Expand Down