Merge pull request #24 from nblumhardt/net50-updates

Modernization

Build.ps1

@@ -3,31 +3,9 @@ function Clean-Output
 	if(Test-Path ./artifacts) { rm ./artifacts -Force -Recurse }
 }
 
-function Restore-Packages
-{
-	& dotnet restore
-}
-
-function Update-WixVersion($version)
-{
-    $defPattern = "define Version = ""0\.0\.0"""
-	$def = "define Version = ""$version"""
-    $product = ".\setup\Datalust.Piggy.Setup\Product.wxs"
-
-    (cat $product) | foreach {  
-            % {$_ -replace $defPattern, $def }    
-        } | sc -Encoding "UTF8" $product
-}
-
-function Execute-MSBuild($version)
-{
-	& msbuild ./piggy.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:VersionPrefix=$version
-    if($LASTEXITCODE -ne 0) { exit 2 }
-}
-
 function Execute-Tests
 {
-    & dotnet test ./test/Datalust.Piggy.Tests/Datalust.Piggy.Tests.csproj -c Release /p:Configuration=Release /p:Platform=x64 /p:VersionPrefix=$version
+    & dotnet test ./test/Datalust.Piggy.Tests/Datalust.Piggy.Tests.csproj -c Release /p:VersionPrefix=$version
     if($LASTEXITCODE -ne 0) { exit 3 }
 }
 
@@ -38,38 +16,32 @@ function Create-ArtifactDir
 
 function Publish-Gzips($version)
 {
-	$rids = @("ubuntu.14.04-x64", "ubuntu.16.04-x64", "rhel.7-x64", "osx.10.12-x64")
+	$rids = @("linux-x64", "win-x64", "osx-x64")
 	foreach ($rid in $rids) {
-		& dotnet publish src/Datalust.Piggy/Datalust.Piggy.csproj -c Release -f netcoreapp2.0 -r $rid /p:VersionPrefix=$version
+		& dotnet publish src/Datalust.Piggy/Datalust.Piggy.csproj -c Release -f net5.0 -r $rid /p:VersionPrefix=$version /p:PublishSingleFile=true /p:SelfContained=true /p:PublishTrimmed=true
 	    if($LASTEXITCODE -ne 0) { exit 4 }
 
 		# Make sure the archive contains a reasonable root filename
-		mv ./src/Datalust.Piggy/bin/Release/netcoreapp2.0/$rid/publish/ ./src/Datalust.Piggy/bin/Release/netcoreapp2.0/$rid/piggy-$version-$rid/
+		mv ./src/Datalust.Piggy/bin/Release/net5.0/$rid/publish/ ./src/Datalust.Piggy/bin/Release/net5.0/$rid/piggy-$version-$rid/
 
-		& ./build/7-zip/7za.exe a -ttar piggy-$version-$rid.tar ./src/Datalust.Piggy/bin/Release/netcoreapp2.0/$rid/piggy-$version-$rid/
-		if($LASTEXITCODE -ne 0) { exit 5 }
+        if ($rid -ne "win-x64") {
+            & ./build/7-zip/7za.exe a -ttar piggy-$version-$rid.tar ./src/Datalust.Piggy/bin/Release/net5.0/$rid/piggy-$version-$rid/
+            if($LASTEXITCODE -ne 0) { exit 5 }
+
+            & ./build/7-zip/7za.exe a -tgzip ./artifacts/piggy-$version-$rid.tar.gz piggy-$version-$rid.tar
+            if($LASTEXITCODE -ne 0) { exit 6 }
 
-		# Back to the original directory name
-		mv ./src/Datalust.Piggy/bin/Release/netcoreapp2.0/$rid/piggy-$version-$rid/ ./src/Datalust.Piggy/bin/Release/netcoreapp2.0/$rid/publish/
-		
-		& ./build/7-zip/7za.exe a -tgzip ./artifacts/piggy-$version-$rid.tar.gz piggy-$version-$rid.tar
-		if($LASTEXITCODE -ne 0) { exit 6 }
+    		rm piggy-$version-$rid.tar
+        } else {
+            & ./build/7-zip/7za.exe a -tzip ./artifacts/piggy-$version-$rid.zip ./src/Datalust.Piggy/bin/Release/net5.0/$rid/piggy-$version-$rid/
+            if($LASTEXITCODE -ne 0) { exit 7 }
+        }
 
-		rm piggy-$version-$rid.tar
+		# Back to the original directory name
+		mv ./src/Datalust.Piggy/bin/Release/net5.0/$rid/piggy-$version-$rid/ ./src/Datalust.Piggy/bin/Release/net5.0/$rid/publish/
 	}
 }
 
-function Publish-Msi($version)
-{
-	& dotnet publish src/Datalust.Piggy/Datalust.Piggy.csproj -c Release -f netcoreapp2.0 -r win10-x64 /p:VersionPrefix=$version
-	if($LASTEXITCODE -ne 0) { exit 7 }
-
-	& msbuild ./setup/Datalust.Piggy.Setup/Datalust.Piggy.Setup.wixproj /t:Build /p:Configuration=Release /p:Platform=x64 /p:Version=$version /p:BuildProjectReferences=false
-	if($LASTEXITCODE -ne 0) { exit 8 }
-
-	mv ./setup/Datalust.Piggy.Setup/bin/Release/piggy.msi ./artifacts/piggy-$version.msi
-}
-
 function Publish-Nupkgs($version)
 {
 	& dotnet pack src/Datalust.Piggy/Datalust.Piggy.csproj -c Release -o $PSScriptRoot/artifacts /p:VersionPrefix=$version /p:OutputType=Library
@@ -82,13 +54,9 @@ $version = @{ $true = $env:APPVEYOR_BUILD_VERSION; $false = "99.99.99" }[$env:AP
 Write-Output "Building version $version"
 
 Clean-Output
-Restore-Packages
-Update-WixVersion($version)
-Execute-MSBuild($version)
 Execute-Tests
 Create-ArtifactDir
 Publish-Gzips($version)
-Publish-Msi($version)
 Publish-Nupkgs($version)
 
 Pop-Location

README.md

@@ -10,7 +10,7 @@ Piggy is a simple command-line tool for managing schema and data changes to Post
 
 ### Installation
 
-Piggy is available for Windows, macOS and Linux from [the releases page](https://github.com/datalust/piggy/releases). Download the MSI or archive file for [your platform](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog). If your platform of choice isn't listed, please [raise an issue here](https://github.com/datalust/piggy/issues) so that we can add it.
+Piggy is available for Windows, macOS and Linux from [the releases page](https://github.com/datalust/piggy/releases). If your platform of choice isn't listed, please [raise an issue here](https://github.com/datalust/piggy/issues) so that we can add it.
 
 ### Workflow
 

appveyor.yml

@@ -1,17 +1,17 @@
-version: 1.0.{build}
+version: 2.0.{build}
 skip_tags: true
 image: Visual Studio 2019
 build_script:
 - ps: ./Build.ps1
 test: off
 artifacts:
-- path: artifacts/piggy-*.msi
 - path: artifacts/piggy-*.tar.gz
+- path: artifacts/piggy-*.zip
 - path: artifacts/Datalust.Piggy.*.nupkg
 deploy:
 - provider: NuGet
   api_key:
-    secure: ErGkGoLMaZtkFgFcBIFjNn3twXKxEhO27F7vQGlx0m7ouCV3XdgGdSNERZOmdLLw
+    secure: qFvoUBcJYV2z0Q8x38cjFDdSdpPclcynF5/FcZbNmSDfQhqTy87D5vBZIp3HaO0I
   skip_symbols: true
   on:
     branch: main