Author: cwittich
Date: Sun Jun 6 10:13:42 2010
New Revision: 47617
URL: http://svn.reactos.org/svn/reactos?rev=47617&view=rev
Log:
[RosDbg]
upgrade Windows installer project to WiX 3.5
Modified:
trunk/tools/reactosdbg/Installer/Installer.wixproj
trunk/tools/reactosdbg/Installer/Product.wxs
Modified: trunk/tools/reactosdbg/Installer/Installer.wixproj
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Installer/Installer.wixproj?rev=47617&r1=47616&r2=47617&view=diff
==============================================================================
--- trunk/tools/reactosdbg/Installer/Installer.wixproj [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/Installer/Installer.wixproj [iso-8859-1] Sun Jun 6
10:13:42 2010
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -7,8 +8,8 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>RosDbg</OutputName>
<OutputType>Package</OutputType>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND
'$(MSBuildExtensionsPath32)' != ''
">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == ''
">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND
'$(MSBuildExtensionsPath32)' != ''
">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.5\Wix2010.targets</WixTargetsPath>
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == ''
">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\Wix2010.targets</WixTargetsPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
@@ -52,9 +53,11 @@
<ItemGroup>
<WixExtension Include="WixNetFxExtension">
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+ <Name>WixNetFxExtension</Name>
</WixExtension>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+ <Name>WixUIExtension</Name>
</WixExtension>
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
Modified: trunk/tools/reactosdbg/Installer/Product.wxs
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Installer/Product.wxs?rev=47617&r1=47616&r2=47617&view=diff
==============================================================================
--- trunk/tools/reactosdbg/Installer/Product.wxs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/Installer/Product.wxs [iso-8859-1] Sun Jun 6
10:13:42 2010
@@ -58,6 +58,7 @@
</InstallExecuteSequence>
<CustomAction Id="PreventDowngrading" Error="Newer version already
installed." />
+ <WixVariable Id="WixUICostingPopupOptOut" Value="1" Overridable="yes" />
<UI Id="WixUI_InstallDir">
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
