Menu
▾
▴
[WiX-commits] wix/src/Setup Product.wxs, 1.5, 1.6 VStudio.wxs, 1.2, 1.3 Votive.wxs, 1.7, 1.8 votiveitemtemplates.wxi, 1.1, 1.2 votiveprojecttemplates.wxi, 1.1, 1.2 votivepropertypages.wxi, 1.1, 1.2
Update of /cvsroot/wix/wix/src/Setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19110/src/Setup Modified Files: Product.wxs VStudio.wxs Votive.wxs votiveitemtemplates.wxi votiveprojecttemplates.wxi votivepropertypages.wxi Log Message: AaronSte: Creating separate Votive and Sconce DLLs for VS 2005 and VS 2008. Adding the VS 2008 SDK source code that is needed to build the VS 2008 Votive and Sconce dlls. HeathS: SFBUG:1789825 - CreationTimeUTC documents wrong format SFFEATURE:1768845 - Patch element should support MinorUpdateTargetRTM attribute SFFEATURE:1735295 - Patch build should add PATCHNEW* properties to patch transform Added support for ignorables to CompareUnit in WixUnit HeathS: SFBUG:1768842 - PatchProperty does not allow Company RobMen: Ensure RegistryKey element never ends up as KeyPath because MSI SDK says it isn't allowed. RobMen: Component guid generation. RobMen: SFBUG:1795309 - respect the rollback flag for the last SQL string like all the other strings. RobMen: SFBUG:1787888 - correctly handle certificates that are in Components that are conditioned out. RobMen: SFBUG:1675194 - loop through all server bindings when searching for a match. Index: votivepropertypages.wxi =================================================================== RCS file: /cvsroot/wix/wix/src/Setup/votivepropertypages.wxi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** votivepropertypages.wxi 10 Aug 2007 09:58:40 -0000 1.1 --- votivepropertypages.wxi 21 Sep 2007 07:58:33 -0000 1.2 *************** *** 30,34 **** <RegistryValue Value="WiX" Type="string" /> <RegistryValue Name="SortPriority" Value="30" Type="integer" /> ! <RegistryValue Name="TemplatesDir" Value="[VsProjectTemplatesWixDir2005]" Type="string" /> </RegistryKey> </RegistryKey> --- 30,34 ---- <RegistryValue Value="WiX" Type="string" /> <RegistryValue Name="SortPriority" Value="30" Type="integer" /> ! <RegistryValue Name="TemplatesDir" Value="[VsProjectTemplatesWixDir$(var.VsVersion)]" Type="string" /> </RegistryKey> </RegistryKey> *************** *** 40,44 **** <RegistryValue Name="Assembly" Type="string" Value="" /> <RegistryValue Name="Class" Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.WixPackage" Type="string" /> ! <RegistryValue Name="CodeBase" Value="[BinDir]votive.dll" Type="string" /> <RegistryValue Name="CompanyName" Value="Microsoft" Type="string" /> <RegistryValue Name="ID" Value="150" Type="integer" /> --- 40,44 ---- <RegistryValue Name="Assembly" Type="string" Value="" /> <RegistryValue Name="Class" Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.WixPackage" Type="string" /> ! <RegistryValue Name="CodeBase" Value="[#votive$(var.VsVersion).dll]" Type="string" /> <RegistryValue Name="CompanyName" Value="Microsoft" Type="string" /> <RegistryValue Name="ID" Value="150" Type="integer" /> *************** *** 55,63 **** <RegistryValue Name="DisplayName" Value="WiX" Type="string" /> <RegistryValue Name="DisplayProjectFileExtensions" Value="#100" Type="string" /> ! <RegistryValue Name="ItemTemplatesDir" Value="[VsItemTemplatesWixDir2005]" Type="string" /> <RegistryValue Name="Language(VsTemplate)" Value="WiX" Type="string" /> <RegistryValue Name="Package" Value="$(var.WixVsPackageGuid)" Type="string" /> <RegistryValue Name="PossibleProjectExtensions" Value="wixproj" Type="string" /> ! <RegistryValue Name="ProjectTemplatesDir" Value="[VsProjectTemplatesWixDir2005]" Type="string" /> <!-- HKLM\SOFTWARE\Microsoft\VisualStudio\<ver>\Projects\<Project GUID>\Filters\WiX Files --> --- 55,63 ---- <RegistryValue Name="DisplayName" Value="WiX" Type="string" /> <RegistryValue Name="DisplayProjectFileExtensions" Value="#100" Type="string" /> ! <RegistryValue Name="ItemTemplatesDir" Value="[VsItemTemplatesWixDir$(var.VsVersion)]" Type="string" /> <RegistryValue Name="Language(VsTemplate)" Value="WiX" Type="string" /> <RegistryValue Name="Package" Value="$(var.WixVsPackageGuid)" Type="string" /> <RegistryValue Name="PossibleProjectExtensions" Value="wixproj" Type="string" /> ! <RegistryValue Name="ProjectTemplatesDir" Value="[VsProjectTemplatesWixDir$(var.VsVersion)]" Type="string" /> <!-- HKLM\SOFTWARE\Microsoft\VisualStudio\<ver>\Projects\<Project GUID>\Filters\WiX Files --> *************** *** 75,79 **** <RegistryValue Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixBuildPropertyPage" Type="string" /> <RegistryValue Name="Class" Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixBuildPropertyPage" Type="string" /> ! <RegistryValue Name="CodeBase" Value="[BinDir]votive.dll" Type="string" /> <RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" /> <RegistryValue Name="ThreadingModel" Value="Both" Type="string" /> --- 75,79 ---- <RegistryValue Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixBuildPropertyPage" Type="string" /> <RegistryValue Name="Class" Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixBuildPropertyPage" Type="string" /> ! <RegistryValue Name="CodeBase" Value="[#votive$(var.VsVersion).dll]" Type="string" /> <RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" /> <RegistryValue Name="ThreadingModel" Value="Both" Type="string" /> *************** *** 83,87 **** <RegistryValue Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixCompilerPropertyPage" Type="string" /> <RegistryValue Name="Class" Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixCompilerPropertyPage" Type="string" /> ! <RegistryValue Name="CodeBase" Value="[BinDir]votive.dll" Type="string" /> <RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" /> <RegistryValue Name="ThreadingModel" Value="Both" Type="string" /> --- 83,87 ---- <RegistryValue Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixCompilerPropertyPage" Type="string" /> <RegistryValue Name="Class" Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixCompilerPropertyPage" Type="string" /> ! <RegistryValue Name="CodeBase" Value="[#votive$(var.VsVersion).dll]" Type="string" /> <RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" /> <RegistryValue Name="ThreadingModel" Value="Both" Type="string" /> *************** *** 91,95 **** <RegistryValue Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixLinkerPropertyPage" Type="string" /> <RegistryValue Name="Class" Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixLinkerPropertyPage" Type="string" /> ! <RegistryValue Name="CodeBase" Value="[BinDir]votive.dll" Type="string" /> <RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" /> <RegistryValue Name="ThreadingModel" Value="Both" Type="string" /> --- 91,95 ---- <RegistryValue Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixLinkerPropertyPage" Type="string" /> <RegistryValue Name="Class" Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixLinkerPropertyPage" Type="string" /> ! <RegistryValue Name="CodeBase" Value="[#votive$(var.VsVersion).dll]" Type="string" /> <RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" /> <RegistryValue Name="ThreadingModel" Value="Both" Type="string" /> *************** *** 99,103 **** <RegistryValue Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixLibrarianPropertyPage" Type="string" /> <RegistryValue Name="Class" Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixLibrarianPropertyPage" Type="string" /> ! <RegistryValue Name="CodeBase" Value="[BinDir]votive.dll" Type="string" /> <RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" /> <RegistryValue Name="ThreadingModel" Value="Both" Type="string" /> --- 99,103 ---- <RegistryValue Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixLibrarianPropertyPage" Type="string" /> <RegistryValue Name="Class" Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixLibrarianPropertyPage" Type="string" /> ! <RegistryValue Name="CodeBase" Value="[#votive$(var.VsVersion).dll]" Type="string" /> <RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" /> <RegistryValue Name="ThreadingModel" Value="Both" Type="string" /> *************** *** 107,111 **** <RegistryValue Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixBuildEventsPropertyPage" Type="string" /> <RegistryValue Name="Class" Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixBuildEventsPropertyPage" Type="string" /> ! <RegistryValue Name="CodeBase" Value="[BinDir]votive.dll" Type="string" /> <RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" /> <RegistryValue Name="ThreadingModel" Value="Both" Type="string" /> --- 107,111 ---- <RegistryValue Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixBuildEventsPropertyPage" Type="string" /> <RegistryValue Name="Class" Value="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixBuildEventsPropertyPage" Type="string" /> ! <RegistryValue Name="CodeBase" Value="[#votive$(var.VsVersion).dll]" Type="string" /> <RegistryValue Name="InprocServer32" Value="[SystemFolder]mscoree.dll" Type="string" /> <RegistryValue Name="ThreadingModel" Value="Both" Type="string" /> Index: votiveprojecttemplates.wxi =================================================================== RCS file: /cvsroot/wix/wix/src/Setup/votiveprojecttemplates.wxi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** votiveprojecttemplates.wxi 10 Aug 2007 09:58:40 -0000 1.1 --- votiveprojecttemplates.wxi 21 Sep 2007 07:58:33 -0000 1.2 *************** *** 9,15 **** <Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> ! <File Id="WixLibrary.zip.$(var.VsVersion)" Name="WixLibrary.zip" Vital="yes" /> ! <File Id="WixMergeModule.zip.$(var.VsVersion)" Name="WixMergeModule.zip" Vital="yes" /> ! <File Id="WixProject.zip.$(var.VsVersion)" Name="WixProject.zip" KeyPath="yes" Vital="yes" /> </Include> --- 9,15 ---- <Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> ! <File Id="WixLibrary$(var.VsVersion).zip" Name="WixLibrary.zip" Vital="yes" /> ! <File Id="WixMergeModule$(var.VsVersion).zip" Name="WixMergeModule.zip" Vital="yes" /> ! <File Id="WixProject$(var.VsVersion).zip" Name="WixProject.zip" KeyPath="yes" Vital="yes" /> </Include> Index: Product.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/Setup/Product.wxs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Product.wxs 10 Aug 2007 09:58:40 -0000 1.5 --- Product.wxs 21 Sep 2007 07:58:33 -0000 1.6 *************** *** 80,88 **** </Feature> - <!-- ProjectAggregator2 is not technically required for VS 2008 integration, but --> - <!-- must still be installed until we start building Votive using the VS 2008 --> - <!-- version of the VS SDK. This condition should be changed once that happens. --> <Feature Id="Feature_Votive2008" Title="Visual Studio 2008 Project and IntelliSense" Description="Votive Package for Visual Studio 2008" AllowAdvertise="no" Display="expand" InstallDefault="local" Level="0" TypicalDefault="install"> ! <Condition Level="1">VS90DEVENV AND VS2005PROJECTAGGREGATOR2</Condition> <ComponentGroupRef Id="VotiveCommon" /> <ComponentGroupRef Id="VotiveVS2008" /> --- 80,85 ---- </Feature> <Feature Id="Feature_Votive2008" Title="Visual Studio 2008 Project and IntelliSense" Description="Votive Package for Visual Studio 2008" AllowAdvertise="no" Display="expand" InstallDefault="local" Level="0" TypicalDefault="install"> ! <Condition Level="1">VS90DEVENV</Condition> <ComponentGroupRef Id="VotiveCommon" /> <ComponentGroupRef Id="VotiveVS2008" /> Index: VStudio.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/Setup/VStudio.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** VStudio.wxs 10 Aug 2007 09:58:40 -0000 1.2 --- VStudio.wxs 21 Sep 2007 07:58:33 -0000 1.3 *************** *** 55,74 **** </Condition> </Control> - <!-- ProjectAggregator2 is not technically required for VS 2008 integration, but --> - <!-- must still be installed until we start building Votive using the VS 2008 --> - <!-- version of the VS SDK. This condition should be changed once that happens. --> <Control Id="MissingAggregator" Type="Text" X="10" Y="10" Width="300" Height="60" Transparent="yes" NoPrefix="yes" Hidden="yes"> ! <Text>Votive, the WiX project and editor package for Visual Studio, cannot be installed because the required project aggregator is not installed. To install Votive, download ProjectAggregator2.msi from http://wix.sourceforge.net, install it, and start the WiX installer again.</Text> <Condition Action="show"> ! (VS2005DEVENV OR VS90DEVENV) AND NOT VS2005PROJECTAGGREGATOR2 </Condition> </Control> </Dialog> - <!-- ProjectAggregator2 is not technically required for VS 2008 integration, but --> - <!-- must still be installed until we start building Votive using the VS 2008 --> - <!-- version of the VS SDK. This condition should be changed once that happens. --> <InstallUISequence> ! <Show Dialog="PrerequisitesDlg" Before="AdvancedWelcomeEulaDlg">NOT Installed AND NOT VS2005DEVENV AND NOT VS90DEVENV OR ( (VS2005DEVENV OR VS90DEVENV) AND NOT VS2005PROJECTAGGREGATOR2)</Show> </InstallUISequence> </UI> --- 55,68 ---- </Condition> </Control> <Control Id="MissingAggregator" Type="Text" X="10" Y="10" Width="300" Height="60" Transparent="yes" NoPrefix="yes" Hidden="yes"> ! <Text>Votive, the WiX project and editor package for Visual Studio, cannot be installed for Visual Studio 2005 because the required project aggregator is not installed. To install Votive for Visual Studio 2005, download ProjectAggregator2.msi from http://wix.sourceforge.net, install it, and start the WiX installer again.</Text> <Condition Action="show"> ! VS2005DEVENV AND NOT VS2005PROJECTAGGREGATOR2 </Condition> </Control> </Dialog> <InstallUISequence> ! <Show Dialog="PrerequisitesDlg" Before="AdvancedWelcomeEulaDlg">NOT Installed AND NOT VS2005DEVENV AND NOT VS90DEVENV OR (VS2005DEVENV AND NOT VS2005PROJECTAGGREGATOR2)</Show> </InstallUISequence> </UI> Index: Votive.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/Setup/Votive.wxs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Votive.wxs 10 Aug 2007 09:58:40 -0000 1.7 --- Votive.wxs 21 Sep 2007 07:58:33 -0000 1.8 *************** *** 17,24 **** <!-- Preprocessor definitions --> ! <?define VsVersion2005 = "8.0"?> ! <?define VsRegPath2005 = "SOFTWARE\Microsoft\VisualStudio\$(var.VsVersion2005)" ?> ! <?define VsVersion2008 = "9.0"?> ! <?define VsRegPath2008 = "SOFTWARE\Microsoft\VisualStudio\$(var.VsVersion2008)" ?> <?define VsVersion = "dummy"?> <?define VsRegPath = "dummy"?> --- 17,24 ---- <!-- Preprocessor definitions --> ! <?define VsVersion2005 = "2005"?> ! <?define VsRegPath2005 = "SOFTWARE\Microsoft\VisualStudio\8.0" ?> ! <?define VsVersion2008 = "2008"?> ! <?define VsRegPath2008 = "SOFTWARE\Microsoft\VisualStudio\9.0" ?> <?define VsVersion = "dummy"?> <?define VsRegPath = "dummy"?> *************** *** 44,51 **** <Directory Id="IDEVs2005" Name="IDE"> <Directory Id="VS2005_ITEMTEMPLATES_DIR"> ! <Directory Id="VsItemTemplatesWixDir2005" Name="WiX" /> </Directory> <Directory Id="VS2005_PROJECTTEMPLATES_DIR"> ! <Directory Id="VsProjectTemplatesWixDir2005" Name="WiX" /> </Directory> </Directory> --- 44,51 ---- <Directory Id="IDEVs2005" Name="IDE"> <Directory Id="VS2005_ITEMTEMPLATES_DIR"> ! <Directory Id="VsItemTemplatesWixDir$(var.VsVersion2005)" Name="WiX" /> </Directory> <Directory Id="VS2005_PROJECTTEMPLATES_DIR"> ! <Directory Id="VsProjectTemplatesWixDir$(var.VsVersion2005)" Name="WiX" /> </Directory> </Directory> *************** *** 56,63 **** <Directory Id="IDEVs2008" Name="IDE"> <Directory Id="VS90_ITEMTEMPLATES_DIR"> ! <Directory Id="VsItemTemplatesWixDir2008" Name="WiX" /> </Directory> <Directory Id="VS90_PROJECTTEMPLATES_DIR"> ! <Directory Id="VsProjectTemplatesWixDir2008" Name="WiX" /> </Directory> </Directory> --- 56,63 ---- <Directory Id="IDEVs2008" Name="IDE"> <Directory Id="VS90_ITEMTEMPLATES_DIR"> ! <Directory Id="VsItemTemplatesWixDir$(var.VsVersion2008)" Name="WiX" /> </Directory> <Directory Id="VS90_PROJECTTEMPLATES_DIR"> ! <Directory Id="VsProjectTemplatesWixDir$(var.VsVersion2008)" Name="WiX" /> </Directory> </Directory> *************** *** 68,124 **** <!-- Components --> <DirectoryRef Id="BinDir" FileSource="$(var.TargetDir)"> ! <Component Id="VisualStudioPackageCommon" Guid="40BA02F4-D27B-4BA3-B040-687639BC5237"> ! <File Id="votive.dll" Name="votive.dll" KeyPath="yes" Checksum="yes" Vital="yes" /> ! <!-- File Extensions --> <!-- Note that we're keeping the versioned progid the same --> <!-- The properties are used here so that if a user installs Votive --> <!-- on a system with both VS 2005 and VS 2008 installed, the file --> <!-- associations will be directed to the latest version of VS. --> ! <ProgId Id="WindowsInstallerXml.wixprojfile.3.0" Description="WiX Project File" Icon="votive.dll" IconIndex="0"> <Extension Id="wixproj" ContentType="text/plain"> <Verb Id="Open" Command="[LATEST_DEVENV_EXE_COMMAND]" TargetProperty="LATEST_DEVENV_EXE" Argument=""%1"" /> </Extension> </ProgId> ! <ProgId Id="WindowsInstallerXml.wxsfile.3.0" Description="WiX Source File" Icon="votive.dll" IconIndex="1"> <Extension Id="wxs" ContentType="text/xml"> <Verb Id="Open" Command="[LATEST_DEVENV_EXE_COMMAND]" TargetProperty="LATEST_DEVENV_EXE" Argument=""%1"" /> </Extension> </ProgId> ! <ProgId Id="WindowsInstallerXml.wxifile.3.0" Description="WiX Include File" Icon="votive.dll" IconIndex="2"> <Extension Id="wxi" ContentType="text/xml"> <Verb Id="Open" Command="[LATEST_DEVENV_EXE_COMMAND]" TargetProperty="LATEST_DEVENV_EXE" Argument=""%1"" /> </Extension> </ProgId> ! <ProgId Id="WindowsInstallerXml.wxlfile.3.0" Description="WiX Localization File" Icon="votive.dll" IconIndex="3"> <Extension Id="wxl" ContentType="text/xml"> <Verb Id="Open" Command="[LATEST_DEVENV_EXE_COMMAND]" TargetProperty="LATEST_DEVENV_EXE" Argument=""%1"" /> </Extension> </ProgId> ! <ProgId Id="WindowsInstallerXml.wixlibfile.3.0" Description="WiX Library File" Icon="votive.dll" IconIndex="4"> <Extension Id="wixlib" ContentType="text/xml" /> </ProgId> </Component> ! <Component Id="VisualStudioPackageSconce" Guid="D2A57F7B-8D55-4C3E-8112-A29AE9E7604B"> ! <File Id="sconce.dll" Name="sconce.dll" KeyPath="yes" Checksum="yes" Vital="yes" /> </Component> ! <Component Id="VisualStudioPackage2005" Guid="A3FBA890-3E2F-4DE4-AB09-6C4168B5D5F3" KeyPath="yes"> <!-- Add the VS 2005 property page registration component --> <?undef VsRegPath?> <?define VsRegPath = $(var.VsRegPath2005) ?> <?include VotivePropertyPages.wxi ?> </Component> ! <Component Id="VisualStudioPackage2008" Guid="64A60258-F727-4836-AB51-012AB444BBC7" KeyPath="yes"> <!-- Add the VS 2008 property page registration component --> <?undef VsRegPath?> <?define VsRegPath = $(var.VsRegPath2008) ?> <?include VotivePropertyPages.wxi ?> </Component> </DirectoryRef> ! <DirectoryRef Id="VsItemTemplatesWixDir2005" FileSource="$(var.TargetDir)"> <Component Id="VsProjectItems2005" Guid="69FAE964-65CC-4008-8321-6937BC3BEC90"> <?undef VsVersion?> --- 68,141 ---- <!-- Components --> <DirectoryRef Id="BinDir" FileSource="$(var.TargetDir)"> ! <Component Id="VisualStudioPackageCommon" Guid="3C58CD34-FBD9-460B-A43D-C3A542CA7318"> ! <!-- Icons to use for WiX file types --> ! <File Id="ProjectFile.ico" Name="ProjectFile.ico" KeyPath="yes" /> ! <File Id="ProductFile.ico" Name="ProductFile.ico" /> ! <File Id="IncludeFile.ico" Name="IncludeFile.ico" /> ! <File Id="LanguageFile.ico" Name="LanguageFile.ico" /> ! <File Id="WixLibraryFile.ico" Name="WixLibraryFile.ico" /> ! <!-- File extension registration --> <!-- Note that we're keeping the versioned progid the same --> <!-- The properties are used here so that if a user installs Votive --> <!-- on a system with both VS 2005 and VS 2008 installed, the file --> <!-- associations will be directed to the latest version of VS. --> ! <ProgId Id="WindowsInstallerXml.wixprojfile.3.0" Description="WiX Project File" Icon="ProjectFile.ico"> <Extension Id="wixproj" ContentType="text/plain"> <Verb Id="Open" Command="[LATEST_DEVENV_EXE_COMMAND]" TargetProperty="LATEST_DEVENV_EXE" Argument=""%1"" /> </Extension> </ProgId> ! <ProgId Id="WindowsInstallerXml.wxsfile.3.0" Description="WiX Source File" Icon="ProductFile.ico"> <Extension Id="wxs" ContentType="text/xml"> <Verb Id="Open" Command="[LATEST_DEVENV_EXE_COMMAND]" TargetProperty="LATEST_DEVENV_EXE" Argument=""%1"" /> </Extension> </ProgId> ! <ProgId Id="WindowsInstallerXml.wxifile.3.0" Description="WiX Include File" Icon="IncludeFile.ico"> <Extension Id="wxi" ContentType="text/xml"> <Verb Id="Open" Command="[LATEST_DEVENV_EXE_COMMAND]" TargetProperty="LATEST_DEVENV_EXE" Argument=""%1"" /> </Extension> </ProgId> ! <ProgId Id="WindowsInstallerXml.wxlfile.3.0" Description="WiX Localization File" Icon="LanguageFile.ico"> <Extension Id="wxl" ContentType="text/xml"> <Verb Id="Open" Command="[LATEST_DEVENV_EXE_COMMAND]" TargetProperty="LATEST_DEVENV_EXE" Argument=""%1"" /> </Extension> </ProgId> ! <ProgId Id="WindowsInstallerXml.wixlibfile.3.0" Description="WiX Library File" Icon="WixLibraryFile.ico"> <Extension Id="wixlib" ContentType="text/xml" /> </ProgId> </Component> ! <Component Id="VisualStudioPackageSconce2005" Guid="7FB8DF74-9448-46AF-97D6-CEEDCD6AF731"> ! <File Id="sconce2005.dll" Name="sconce2005.dll" KeyPath="yes" Checksum="yes" Vital="yes" /> </Component> ! <Component Id="VisualStudioPackageSconce2008" Guid="1CAF6D5D-3A8C-413A-881C-69CA93661B74"> ! <File Id="sconce2008.dll" Name="sconce2008.dll" KeyPath="yes" Checksum="yes" Vital="yes" /> ! </Component> ! ! <Component Id="VisualStudioPackage2005" Guid="E1195461-0D02-443B-BCF8-888ECE01E017"> ! <File Id="votive$(var.VsVersion2005).dll" Name="votive2005.dll" KeyPath="yes" Checksum="yes" Vital="yes" /> ! <!-- Add the VS 2005 property page registration component --> <?undef VsRegPath?> + <?undef VsVersion?> <?define VsRegPath = $(var.VsRegPath2005) ?> + <?define VsVersion = $(var.VsVersion2005) ?> <?include VotivePropertyPages.wxi ?> </Component> ! <Component Id="VisualStudioPackage2008" Guid="AD022E4C-71A5-4C1D-8F61-E09B3C2BFC2F"> ! <File Id="votive$(var.VsVersion2008).dll" Name="votive2008.dll" KeyPath="yes" Checksum="yes" Vital="yes" /> ! <!-- Add the VS 2008 property page registration component --> <?undef VsRegPath?> + <?undef VsVersion?> <?define VsRegPath = $(var.VsRegPath2008) ?> + <?define VsVersion = $(var.VsVersion2008) ?> <?include VotivePropertyPages.wxi ?> </Component> </DirectoryRef> ! <DirectoryRef Id="VsItemTemplatesWixDir$(var.VsVersion2005)" FileSource="$(var.TargetDir)"> <Component Id="VsProjectItems2005" Guid="69FAE964-65CC-4008-8321-6937BC3BEC90"> <?undef VsVersion?> *************** *** 128,132 **** </DirectoryRef> ! <DirectoryRef Id="VsProjectTemplatesWixDir2005" FileSource="$(var.TargetDir)"> <Component Id="VsProjects2005" Guid="B717AF39-94A3-41AC-A038-00C42485F1BA"> <?undef VsVersion?> --- 145,149 ---- </DirectoryRef> ! <DirectoryRef Id="VsProjectTemplatesWixDir$(var.VsVersion2005)" FileSource="$(var.TargetDir)"> <Component Id="VsProjects2005" Guid="B717AF39-94A3-41AC-A038-00C42485F1BA"> <?undef VsVersion?> *************** *** 136,140 **** </DirectoryRef> ! <DirectoryRef Id="VsItemTemplatesWixDir2008" FileSource="$(var.TargetDir)"> <Component Id="VsProjectItems2008" Guid="C1C59B30-3619-4A20-B65E-DD231EAEA5B5"> <?undef VsVersion?> --- 153,157 ---- </DirectoryRef> ! <DirectoryRef Id="VsItemTemplatesWixDir$(var.VsVersion2008)" FileSource="$(var.TargetDir)"> <Component Id="VsProjectItems2008" Guid="C1C59B30-3619-4A20-B65E-DD231EAEA5B5"> <?undef VsVersion?> *************** *** 144,148 **** </DirectoryRef> ! <DirectoryRef Id="VsProjectTemplatesWixDir2008" FileSource="$(var.TargetDir)"> <Component Id="VsProjects2008" Guid="EB67DA36-2D25-42B9-A59E-F9E19700B430"> <?undef VsVersion?> --- 161,165 ---- </DirectoryRef> ! <DirectoryRef Id="VsProjectTemplatesWixDir$(var.VsVersion2008)" FileSource="$(var.TargetDir)"> <Component Id="VsProjects2008" Guid="EB67DA36-2D25-42B9-A59E-F9E19700B430"> <?undef VsVersion?> *************** *** 154,158 **** <ComponentGroup Id="VotiveCommon"> <ComponentRef Id="VisualStudioPackageCommon" /> - <ComponentRef Id="VisualStudioPackageSconce" /> <ComponentRef Id="WixMSBuildBinaries" /> <ComponentGroupRef Id="Extensions" /> --- 171,174 ---- *************** *** 161,164 **** --- 177,181 ---- <ComponentGroup Id="VotiveVS2005"> <ComponentRef Id="VisualStudioPackage2005" /> + <ComponentRef Id="VisualStudioPackageSconce2005" /> <ComponentRef Id="VsProjectItems2005" /> <ComponentRef Id="VsProjects2005" /> *************** *** 168,171 **** --- 185,189 ---- <ComponentGroup Id="VotiveVS2008"> <ComponentRef Id="VisualStudioPackage2008" /> + <ComponentRef Id="VisualStudioPackageSconce2008" /> <ComponentRef Id="VsProjectItems2008" /> <ComponentRef Id="VsProjects2008" /> Index: votiveitemtemplates.wxi =================================================================== RCS file: /cvsroot/wix/wix/src/Setup/votiveitemtemplates.wxi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** votiveitemtemplates.wxi 10 Aug 2007 09:58:40 -0000 1.1 --- votiveitemtemplates.wxi 21 Sep 2007 07:58:33 -0000 1.2 *************** *** 9,18 **** <Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> ! <File Id="BlankFile.zip.$(var.VsVersion)" Name="BlankFile.zip" /> ! <File Id="IncludeFile.zip.$(var.VsVersion)" Name="IncludeFile.zip" /> ! <File Id="LocalizationFile.zip.$(var.VsVersion)" Name="LocalizationFile.zip" /> ! <File Id="MergeModuleFile.zip.$(var.VsVersion)" Name="MergeModuleFile.zip" /> ! <File Id="ProductFile.zip.$(var.VsVersion)" Name="ProductFile.zip" KeyPath="yes" /> ! <File Id="TextFile.zip.$(var.VsVersion)" Name="TextFile.zip" /> </Include> --- 9,18 ---- <Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> ! <File Id="BlankFile$(var.VsVersion).zip" Name="BlankFile.zip" /> ! <File Id="IncludeFile$(var.VsVersion).zip" Name="IncludeFile.zip" /> ! <File Id="LocalizationFile$(var.VsVersion).zip" Name="LocalizationFile.zip" /> ! <File Id="MergeModuleFile$(var.VsVersion).zip" Name="MergeModuleFile.zip" /> ! <File Id="ProductFile$(var.VsVersion).zip" Name="ProductFile.zip" KeyPath="yes" /> ! <File Id="TextFile$(var.VsVersion).zip" Name="TextFile.zip" /> </Include> |