fix installer build

loresoft · Dec 24, 2014 · b3a8fd1 · b3a8fd1
1 parent d7d96cb
commit b3a8fd1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/Master.proj b/Master.proj
@@ -27,6 +27,7 @@
     <AssemblyFileVersion>$(Major).$(Minor).$(Patch).$(BuildNumber)</AssemblyFileVersion>
     <AssemblyInformationalVersion>$(Major).$(Minor).$(Patch).$(BuildNumber)</AssemblyInformationalVersion>
     <PackageVersion>$(Major).$(Minor).$(Patch).$(BuildNumber)</PackageVersion>
+    <InstallVersion>$(Major).$(Minor).$(BuildNumber)</InstallVersion>
   </PropertyGroup>
 
 
@@ -118,7 +119,7 @@
 
   <Target Name="Installer" DependsOnTargets="Package">
     <MSBuild Projects="$(SourceFolder)\LoreSoft.Calculator.Setup\Calculator.sln"
-             Properties="Configuration=$(BuildConfiguration);PackageDir=$(PackageFolder);PackageVersion=$(PackageVersion)"/>
+             Properties="Configuration=$(BuildConfiguration);PackageDir=$(PackageFolder);PackageVersion=$(InstallVersion)"/>
 
     <Copy SourceFiles="$(SourceFolder)\LoreSoft.Calculator.Setup\bin\$(BuildConfiguration)\Calculator.msi"
           DestinationFiles="Calculator.v$(PackageVersion).msi" />

diff --git a/Source/LoreSoft.Calculator.Setup/Calculator.sln b/Source/LoreSoft.Calculator.Setup/Calculator.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Calculator", "Calculator.wixproj", "{A9E613A2-F608-4BF2-9170-D9F5FB04077E}"
 EndProject

diff --git a/Source/LoreSoft.Calculator.Setup/Calculator.wixproj b/Source/LoreSoft.Calculator.Setup/Calculator.wixproj
@@ -14,13 +14,14 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\Debug\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug</DefineConstants>
+    <DefineConstants>Debug;PackageDir=$(PackageDir);PackageVersion=$(PackageVersion)</DefineConstants>
     <Cultures>en-us</Cultures>
     <WixVariables>WixUIBannerBmp=Banner.bmp;WixUIDialogBmp=Dialog.bmp</WixVariables>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\Release\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>PackageDir=$(PackageDir);PackageVersion=$(PackageVersion)</DefineConstants>
     <Cultures>en-us</Cultures>
     <WixVariables>WixUIBannerBmp=Banner.bmp;WixUIDialogBmp=Dialog.bmp</WixVariables>
   </PropertyGroup>
@@ -29,7 +30,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Variables.wxi" />
-  </ItemGroup>  
+  </ItemGroup>
   <ItemGroup>
     <WixExtension Include="WixUIExtension">
       <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>

diff --git a/Source/LoreSoft.Calculator.Setup/Calculator.wxs b/Source/LoreSoft.Calculator.Setup/Calculator.wxs
@@ -20,6 +20,8 @@
              ShortNames="no"
              SummaryCodepage="1252" />
 
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+
     <Media Id="1" Cabinet="Calculator.cab" EmbedCab="yes" />
 
     <Icon Id="calculator.ico" SourceFile="..\LoreSoft.Calculator\Calculator.ico" />

diff --git a/Source/LoreSoft.Calculator.Setup/Variables.wxi b/Source/LoreSoft.Calculator.Setup/Variables.wxi
@@ -2,7 +2,7 @@
 <Include>
   <!-- Version -->
   <?ifndef PackageVersion?>
-  <?define PackageVersion = "1.0.0.0" ?>
+  <?define PackageVersion = "1.0.0" ?>
   <?endif?>
 
   <?ifndef Configuration?>

diff --git a/readme.md b/readme.md
@@ -19,7 +19,7 @@ The library supports math expressions, functions unit conversion and variables.
     //use variable
     result = eval.Evaluate("answer * 10");
     //add variable
-    eval.Variables.Add("x", 10);            
+    eval.Variables.Add("x", 10);
     result = eval.Evaluate("x * 10");
 
 Calculator that evaluates math expressions.