diff --git a/build.test/Fixture.cs b/build.test/Fixture.cs index 19efd87..b26d1f9 100644 --- a/build.test/Fixture.cs +++ b/build.test/Fixture.cs @@ -215,7 +215,7 @@ await Cli.Wrap("dotnet") configure(args .Add("run") .Add("--project") - .Add(RootDirectory / "build")) + .Add((RootDirectory / "build").ToString())) .Add("--no-logo"); if (skip) @@ -465,7 +465,7 @@ await Cli.Wrap("git") .Add("--bare") .Add("--no-hardlinks") .Add("--single-branch") - .Add(RootDirectory) + .Add(RootDirectory.ToString()) .Add(path)) .WithStandardOutputPipe(PipeTarget.ToDelegate(Console.WriteLine)) .WithStandardErrorPipe(PipeTarget.ToDelegate(output.WriteLine)) diff --git a/build.test/build.test.csproj b/build.test/build.test.csproj index 55620da..c23b1f3 100644 --- a/build.test/build.test.csproj +++ b/build.test/build.test.csproj @@ -10,20 +10,20 @@ - - - - + + + + - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/build/Build.Features.cs b/build/Build.Features.cs index 2c7e6fd..b8b1e12 100644 --- a/build/Build.Features.cs +++ b/build/Build.Features.cs @@ -64,7 +64,7 @@ sealed partial class Build var command = string.Join(" ", commands); Log.Information("{command}", command); - Devcontainer(command, customLogger: DevcontainerLog); + Devcontainer(command, logger: DevcontainerLog); }); [UsedImplicitly] diff --git a/build/Build.Github.cs b/build/Build.Github.cs index bdf0555..cdaf59c 100644 --- a/build/Build.Github.cs +++ b/build/Build.Github.cs @@ -12,7 +12,7 @@ partial class Build private const string REMOTE = "origin"; private const string REMOTE_MAIN_BRANCH = $"remotes/{REMOTE}/{MAIN_BRANCH}"; - [PathExecutable("git")] readonly Tool Git = null!; + [LocalPath("git")] readonly Tool Git = null!; [GitRepository] private readonly GitRepository Repository = null!; diff --git a/build/Build.cs b/build/Build.cs index ed9ba9f..e768326 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -21,7 +21,7 @@ public sealed partial class Build : NukeBuild private bool ShouldUpdateVersion = true; - [PathExecutable("bash")] private readonly Tool Bash = null!; + [LocalPath("bash")] private readonly Tool Bash = null!; private Version GetFeatureVersion(string pathToFeatureDefinition) { @@ -115,7 +115,7 @@ await Cli.Wrap("git") await Cli.Wrap("git") .WithArguments(args => args .Add("add") - .Add(FeatureRoot)) + .Add(FeatureRoot.ToString())) .WithStandardOutputPipe(PipeTarget.ToDelegate(x => Log.Information("{git_msg}", x))) .WithStandardErrorPipe(PipeTarget.ToDelegate(x => Log.Error("{git_msg}", x))) .ExecuteAsync(); @@ -124,7 +124,7 @@ await Cli.Wrap("git") .WithArguments(args => args .Add("commit") .Add("--include") - .Add(FeatureRoot) + .Add(FeatureRoot.ToString()) .Add("--message") .Add($"Release: feature {Feature} {version}")) .WithEnvironmentVariables(dict => diff --git a/build/_build.csproj b/build/_build.csproj index 7c29141..3704cc1 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/devcontainers.sln.DotSettings.user b/devcontainers.sln.DotSettings.user index d0eb307..7a92b8f 100644 --- a/devcontainers.sln.DotSettings.user +++ b/devcontainers.sln.DotSettings.user @@ -1,13 +1,13 @@  ForceIncluded ForceIncluded - <SessionState ContinuousTestingMode="0" Name="All tests from &lt;build.test&gt;" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> - <Project Location="/IdeaProjects/devcontainers/build.test" Presentation="&lt;build.test&gt;" /> + <SessionState ContinuousTestingMode="0" Name="All tests from &lt;build.test&gt;" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> + <Project Location="\IdeaProjects\devcontainers\build.test" Presentation="&lt;build.test&gt;" /> </SessionState> - <SessionState ContinuousTestingMode="0" IsActive="True" Name="Session" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> - <TestAncestor> - <TestId>xUnit::C9391668-F7A0-435F-883F-71E5D107EF45::net8.0::build.test.RepositoryFixtureTests</TestId> - </TestAncestor> + <SessionState ContinuousTestingMode="0" IsActive="True" Name="Session" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> + <TestAncestor> + <TestId>xUnit::C9391668-F7A0-435F-883F-71E5D107EF45::net8.0::build.test.RepositoryFixtureTests</TestId> + </TestAncestor> </SessionState> \ No newline at end of file