Merge pull request #71 from datalust/dev

New Preview

Build.ps1

@@ -23,40 +23,34 @@ function Create-ArtifactDir
 	mkdir ./artifacts
 }
 
-function Publish-Gzips($version)
+function Publish-Archives($version)
 {
-	$rids = @("linux-x64", "osx-x64")
+	$rids = @("linux-x64", "osx-x64", "win-x64")
 	foreach ($rid in $rids) {
 		& dotnet publish src/SeqCli/SeqCli.csproj -c Release -f $framework -r $rid /p:VersionPrefix=$version /p:ShowLinkerSizeComparison=true
 	    if($LASTEXITCODE -ne 0) { exit 4 }
 
 		# Make sure the archive contains a reasonable root filename
 		mv ./src/SeqCli/bin/Release/$framework/$rid/publish/ ./src/SeqCli/bin/Release/$framework/$rid/seqcli-$version-$rid/
 
-		& ./build/7-zip/7za.exe a -ttar seqcli-$version-$rid.tar ./src/SeqCli/bin/Release/$framework/$rid/seqcli-$version-$rid/
-		if($LASTEXITCODE -ne 0) { exit 5 }
-
-		# Back to the original directory name
-		mv ./src/SeqCli/bin/Release/$framework/$rid/seqcli-$version-$rid/ ./src/SeqCli/bin/Release/$framework/$rid/publish/
-
-		& ./build/7-zip/7za.exe a -tgzip ./artifacts/seqcli-$version-$rid.tar.gz seqcli-$version-$rid.tar
-		if($LASTEXITCODE -ne 0) { exit 6 }
-
-		rm seqcli-$version-$rid.tar
+		if ($rid.StartsWith("win-")) {
+			& ./build/7-zip/7za.exe a -tzip ./artifacts/seqcli-$version-$rid.zip ./src/SeqCli/bin/Release/$framework/$rid/seqcli-$version-$rid/
+			if($LASTEXITCODE -ne 0) { exit 5 }
+		} else {
+			& ./build/7-zip/7za.exe a -ttar seqcli-$version-$rid.tar ./src/SeqCli/bin/Release/$framework/$rid/seqcli-$version-$rid/
+			if($LASTEXITCODE -ne 0) { exit 5 }
+
+			# Back to the original directory name
+			mv ./src/SeqCli/bin/Release/$framework/$rid/seqcli-$version-$rid/ ./src/SeqCli/bin/Release/$framework/$rid/publish/
+
+			& ./build/7-zip/7za.exe a -tgzip ./artifacts/seqcli-$version-$rid.tar.gz seqcli-$version-$rid.tar
+			if($LASTEXITCODE -ne 0) { exit 6 }
+
+			rm seqcli-$version-$rid.tar
+		}
 	}
 }
 
-function Publish-Msi($version)
-{
-	& dotnet publish ./src/SeqCli/SeqCli.csproj -c Release -f $framework -r win-x64 /p:VersionPrefix=$version /p:ShowLinkerSizeComparison=true
-	if($LASTEXITCODE -ne 0) { exit 7 }
-
-	& msbuild ./setup/SeqCli.Setup/SeqCli.Setup.wixproj /t:Build /p:Configuration=Release /p:Platform=x64 /p:SeqCliVersion=$version /p:BuildProjectReferences=false
-	if($LASTEXITCODE -ne 0) { exit 8 }
-
-	mv ./setup/SeqCli.Setup/bin/Release/seqcli.msi ./artifacts/seqcli-$version.msi
-}
-
 Push-Location $PSScriptRoot
 
 $version = @{ $true = $env:APPVEYOR_BUILD_VERSION; $false = "99.99.99" }[$env:APPVEYOR_BUILD_VERSION -ne $NULL];
@@ -65,8 +59,7 @@ Write-Output "Building version $version"
 Clean-Output
 Create-ArtifactDir
 Restore-Packages
-Publish-Msi($version)
-Publish-Gzips($version)
+Publish-Archives($version)
 Execute-Tests
 
 Pop-Location

README.md

@@ -366,7 +366,7 @@ Print the current executable version.
 The `seqcli ingest` command can be used for parsing plain text logs into structured log events.
 
 ```shell
-seqcli ingest -x "{@t:timestamp} [{@l:ident}] {@m:*}{:n}{@x:*}"
+seqcli ingest -x "{@t:timestamp} [{@l:level}] {@m:*}{:n}{@x:*}"
 ```
 
 The `-x` argument above is an _extraction pattern_ that will parse events like:

appveyor.yml

@@ -5,7 +5,7 @@ build_script:
 - ps: ./Build.ps1
 test: off
 artifacts:
-- path: artifacts/seqcli-*.msi
+- path: artifacts/seqcli-*.zip
 - path: artifacts/seqcli-*.tar.gz
 deploy:
 - provider: GitHub