Merge pull request #50 from datalust/dev

New Preview

Build.ps1

@@ -49,7 +49,7 @@ function Publish-Msi($version)
 	& dotnet publish ./src/SeqCli/SeqCli.csproj -c Release -f netcoreapp2.0 -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:Version=$version /p:BuildProjectReferences=false
+	& 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

setup/SeqCli.Setup/Product.wxs

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?ifndef Version?>
-<?define Version = "99.99.99" ?>
-<?endif ?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Id="*" Name="SeqCli" Language="1033" Version="$(var.Version).0"
+  <Product Id="*" Name="SeqCli" Language="1033" Version="$(var.SeqCliVersion).0"
            Manufacturer="Datalust Pty Ltd" UpgradeCode="90353419-3199-4493-5341-510ffee561ee">
 
     <Package InstallerVersion="200"

setup/SeqCli.Setup/SeqCli.Setup.wixproj

@@ -13,15 +13,14 @@
     <WixTasksPath>$(WixToolPath)wixtasks.dll</WixTasksPath>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <SeqCliVersion Condition=" '$(SeqCliVersion)' == '' ">99.99.99</SeqCliVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DefineConstants>Debug;Version=$(Version)</DefineConstants>
-    <DefineConstants>Debug</DefineConstants>
-    <SuppressIces>
-    </SuppressIces>
+    <DefineConstants>Debug;SeqCliVersion=$(SeqCliVersion)</DefineConstants>
+    <SuppressIces></SuppressIces>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <DefineConstants>Version=$(Version)</DefineConstants>
+    <DefineConstants>SeqCliVersion=$(SeqCliVersion)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <WixExtension Include="WixUtilExtension">
@@ -49,7 +48,7 @@
   <Target Name="BeforeBuild">
     <PropertyGroup>
       <LinkerBaseInputPaths>..\..\src\SeqCli\bin\$(Configuration)\netcoreapp2.0\win-x64\publish</LinkerBaseInputPaths>
-      <DefineConstants>BasePath=..\..\src\SeqCli\bin\$(Configuration)\netcoreapp2.0\win-x64\publish</DefineConstants>
+      <DefineConstants>BasePath=..\..\src\SeqCli\bin\$(Configuration)\netcoreapp2.0\win-x64\publish;$(DefineConstants)</DefineConstants>
     </PropertyGroup>
     <HeatDirectory OutputFile="SeqCli.wxs" DirectoryRefId="INSTALLFOLDER" ComponentGroupName="SeqCli_Project" SuppressCom="true" Directory="..\..\src\SeqCli\bin\$(Configuration)\netcoreapp2.0\win-x64\publish" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" AutoGenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" PreprocessorVariable="var.BasePath" Transforms="RemovePdbs.xslt" />
   </Target>