Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIXBUG:4611 - Eliminate mysteriously doubled .pkgdef content. #197

Merged
merged 1 commit into from Feb 3, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions History.md
@@ -1,3 +1,5 @@
* BobArnson: WIXBUG:4611 - Eliminate mysteriously doubled .pkgdef content.

* BobArnson: WIXBUG:4589 - Catch exceptions from Version when passing in arbitrary strings. For bundles, try to recover a three-part version number.

* STunney: WIXBUG:4187 - Melt doesn't export Binary or Icon tables
Expand Down
87 changes: 0 additions & 87 deletions src/Votive/votive2010/Votive2010.pkgdef
Expand Up @@ -83,90 +83,3 @@
@="#101"
"CommonOpenFilesFilter"=dword:00000001
"SortPriority"=dword:000003e8

[$RootKey$\Editors\{FA3CD31E-987B-443A-9B81-186104E8DAC1}\Extensions]
"wxs"=dword:00000028
"wxi"=dword:00000028
"wxl"=dword:00000028

[$RootKey$\CLSID\{37DA98B6-C5F4-4ce6-867F-553EBE590ABE}]
@="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixToolsSettingsPropertyPage"
"Class"="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixToolsSettingsPropertyPage"
"CodeBase"="$ProgramFiles$\WiX Toolset v3.10\bin\votive2010.dll"
"InprocServer32"="$System$\mscoree.dll"
"ThreadingModel"="Both"


[$RootKey$\CLSID\{3C50BD5E-0E85-4306-A0A8-5B39CCB07DA0}]
@="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixInstallerPropertyPage"
"Class"="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixInstallerPropertyPage"
"CodeBase"="$ProgramFiles$\WiX Toolset v3.10\bin\votive2010.dll"
"InprocServer32"="$System$\mscoree.dll"
"ThreadingModel"="Both"

[$RootKey$\CLSID\{3ED6B659-F2FA-4252-8B3A-3736B04BFC4D}]
@="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixPathsPropertyPage"
"Class"="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixPathsPropertyPage"
"CodeBase"="$ProgramFiles$\WiX Toolset v3.10\bin\votive2010.dll"
"InprocServer32"="$System$\mscoree.dll"
"ThreadingModel"="Both"

[$RootKey$\CLSID\{A71983CF-33B9-4241-9B5A-80091BCE57DA}]
@="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixBuildEventsPropertyPage"
"Class"="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixBuildEventsPropertyPage"
"CodeBase"="$ProgramFiles$\WiX Toolset v3.10\bin\votive2010.dll"
"InprocServer32"="$System$\mscoree.dll"
"ThreadingModel"="Both"

[$RootKey$\CLSID\{E26242E0-4175-48e7-821E-FD0B17603811}]
@="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixBuildPropertyPage"
"Class"="Microsoft.Tools.WindowsInstallerXml.VisualStudio.PropertyPages.WixBuildPropertyPage"
"CodeBase"="$ProgramFiles$\WiX Toolset v3.10\bin\votive2010.dll"
"InprocServer32"="$System$\mscoree.dll"
"ThreadingModel"="Both"

[$RootKey$\InstalledProducts\WiX]
"Package"="{E0EE8E7D-F498-459E-9E90-2B3D73124AD5}"
"ToolsDirectory"="$ProgramFiles$\WiX Toolset v3.10\bin\"
"UseInterface"=dword:00000001

[$RootKey$\MSBuild\SafeImports]
"wix.targets.3.5"="$ProgramFiles$\MSBuild\Microsoft\WiX\v3.x\wix.targets"
"wix200x.targets.3.5"="$ProgramFiles$\MSBuild\Microsoft\WiX\v3.x\wix200x.targets"
"wix2010.targets.3.5"="$ProgramFiles$\MSBuild\Microsoft\WiX\v3.x\wix2010.targets"
"wix.ca.targets.3.5"="$ProgramFiles$\MSBuild\Microsoft\WiX\v3.x\wix.ca.targets"
"burn.targets.3.5"="$ProgramFiles$\MSBuild\Microsoft\WiX\v3.x\burn.targets"

[$RootKey$\NewProjectTemplates\TemplateDirs\{E0EE8E7D-F498-459E-9E90-2B3D73124AD5}\/1]
@="Windows Installer XML"
"SortPriority"=dword:0000001e
"TemplatesDir"="$BaseInstallDir$\Common7\IDE\ProjectTemplates\WiX\"

[$RootKey$\Packages\{E0EE8E7D-F498-459E-9E90-2B3D73124AD5}]
@="WiX Project Package"
"Assembly"=""
"Class"="Microsoft.Tools.WindowsInstallerXml.VisualStudio.WixPackage"
"CodeBase"="$ProgramFiles$\WiX Toolset v3.10\bin\votive2010.dll"
"CompanyName"="Microsoft"
"ID"=dword:00000096
"InprocServer32"="$System$\mscoree.dll"
"MinEdition"="Standard"
"ProductName"="Votive"
"ProductVersion"="3.0"

[$RootKey$\Projects\{930C7802-8A8C-48F9-8165-68863BCCD9DD}]
@="WixProjectFactory"
"DefaultProjectExtensions"="wixproj"
"DisplayName"="WiX"
"DisplayProjectFileExtensions"="#100"
"ItemTemplatesDir"="$BaseInstallDir$\Common7\IDE\Extensions\Microsoft\WiX\ItemTemplates"
"Language(VsTemplate)"="WiX"
"Package"="{E0EE8E7D-F498-459E-9E90-2B3D73124AD5}"
"PossibleProjectExtensions"="wixproj"
"ProjectTemplatesDir"="$BaseInstallDir$\Common7\IDE\Extensions\Microsoft\WiX\ProjectTemplates"

[$RootKey$\Projects\{930C7802-8A8C-48F9-8165-68863BCCD9DD}\Filters\WiX Files]
@="#101"
"CommonOpenFilesFilter"=dword:00000001
"SortPriority"=dword:000003e8