diff options
Diffstat (limited to 'windows/ovs-windows-installer')
| -rw-r--r-- | windows/ovs-windows-installer/Product.wxs | 2 | ||||
| -rw-r--r-- | windows/ovs-windows-installer/ovs-windows-installer.wixproj | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs-windows-installer/Product.wxs index 8b58729b7..15cd909a9 100644 --- a/windows/ovs-windows-installer/Product.wxs +++ b/windows/ovs-windows-installer/Product.wxs @@ -18,7 +18,7 @@ --> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> - <Product Id="{0DF60ED5-6C22-49A0-913E-77412D35C400}" Name="Open vSwitch for Hyper-V" Language="1033" Version="1.0.0.0" + <Product Id="{0DF60ED5-6C22-49A0-913E-77412D35C400}" Name="Open vSwitch for Hyper-V" Language="1033" Version="$(var.Version)" Manufacturer="Open vSwitch" UpgradeCode="da802b12-433d-4742-a7ae-783aa0c48222"> <Package InstallerVersion="405" Compressed="yes" InstallScope="perMachine" InstallPrivileges="elevated" Platform="x64" /> diff --git a/windows/ovs-windows-installer/ovs-windows-installer.wixproj b/windows/ovs-windows-installer/ovs-windows-installer.wixproj index 30b5d553c..f0e8f5012 100644 --- a/windows/ovs-windows-installer/ovs-windows-installer.wixproj +++ b/windows/ovs-windows-installer/ovs-windows-installer.wixproj @@ -10,16 +10,17 @@ <OutputType>Package</OutputType> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> + <Version Condition=" '$(Version)' == '' ">1.0.0.0</Version> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <OutputPath>bin\$(Configuration)\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug</DefineConstants> + <DefineConstants>Debug;Version=$(Version)</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <OutputPath>bin\$(Configuration)\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version)</DefineConstants> <SuppressAllWarnings>False</SuppressAllWarnings> <Pedantic>False</Pedantic> <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> @@ -30,7 +31,7 @@ <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> - <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version)</DefineConstants> <SuppressAllWarnings>False</SuppressAllWarnings> <Pedantic>False</Pedantic> <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> @@ -38,12 +39,12 @@ <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> - <DefineConstants>Debug</DefineConstants> + <DefineConstants>Debug;Version=$(Version)</DefineConstants> <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> - <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version)</DefineConstants> <SuppressAllWarnings>False</SuppressAllWarnings> <Pedantic>False</Pedantic> <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> @@ -51,12 +52,12 @@ <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> - <DefineConstants>Debug</DefineConstants> + <DefineConstants>Debug;Version=$(Version)</DefineConstants> <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> - <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version)</DefineConstants> <SuppressAllWarnings>False</SuppressAllWarnings> <Pedantic>False</Pedantic> <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> |