Merge pull request #38 from nblumhardt/still-no-tool

Still no luck getting the tool package working; pulling out some more tricks

Build.ps1

@@ -86,14 +86,14 @@ if ($suffix) {
 }
 if($LASTEXITCODE -ne 0) { exit 11 }
 
-# Stale artifacts cause problems, we change the output type but MSBuild doesn't notice.
-& dotnet clean $project
-if($LASTEXITCODE -ne 0) { exit 11 }
-
 Write-Output "build: Packing executable into dotnet tool Datalust.Piggy.Cli.*.nupkg"
 if ($suffix) {
+	& dotnet build $project --no-incremental -c Release -o $PSScriptRoot/$artifacts /p:PackAsTool=True --version-suffix=$suffix
+    if($LASTEXITCODE -ne 0) { exit 11 }
 	& dotnet pack $project -c Release -o $PSScriptRoot/$artifacts /p:PackAsTool=True --version-suffix=$suffix
 } else {
+	& dotnet build $project --no-incremental -c Release -o $PSScriptRoot/$artifacts /p:PackAsTool=True
+    if($LASTEXITCODE -ne 0) { exit 11 }
 	& dotnet pack $project -c Release -o $PSScriptRoot/$artifacts /p:PackAsTool=True
 }
 if($LASTEXITCODE -ne 0) { exit 11 }

src/Datalust.Piggy/Datalust.Piggy.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>A friendly PostgreSQL script runner in the spirit of DbUp.</Description>
-    <OutputType>exe</OutputType>
+    <OutputType>Exe</OutputType>
     <VersionPrefix>2.0.0</VersionPrefix>
     <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>piggy</AssemblyName>
@@ -28,6 +28,10 @@
     <ToolCommandName>piggy</ToolCommandName>
     <RollForward>Major</RollForward>
   </PropertyGroup>
+
+  <ItemGroup Condition=" '$(OutputType)' != 'Exe' ">
+    <Compile Remove="Program.cs" />
+  </ItemGroup>
 
   <ItemGroup>
     <None Include="..\..\asset\Piggy-Icon-128px.png" Pack="true" Visible="false" PackagePath="" />

src/Datalust.Piggy/Program.cs

@@ -1,23 +1,13 @@
 using Autofac;
+using Datalust.Piggy;
 using Datalust.Piggy.Cli;
 using Serilog;
 
-namespace Datalust.Piggy
-{
-    class Program
-    {
-        static int Main(string[] args)
-        {
-            var builder = new ContainerBuilder();
-            builder.RegisterModule<PiggyModule>();
+var builder = new ContainerBuilder();
+builder.RegisterModule<PiggyModule>();
 
-            using (var container = builder.Build())
-            {
-                var clh = container.Resolve<CommandLineHost>();
-                var exit = clh.Run(args);
-                Log.CloseAndFlush();
-                return exit;
-            }
-        }
-    }
-}
+await using var container = builder.Build();
+var commandLineHost = container.Resolve<CommandLineHost>();
+var exit = commandLineHost.Run(args);
+await Log.CloseAndFlushAsync();
+return exit;