Browse Source

The WiX controls sidetab now sets the hint path using the addinpath string parser property. Fixes the exception that occurred on opening the toolbox when SharpDevelop's working directory was not the bin folder.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1649 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 19 years ago
parent
commit
0050ba056e
  1. 2
      src/AddIns/BackendBindings/WixBinding/Project/SetupDialogControlLibrary.sdcl
  2. 5
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogControlsSideTab.cs
  3. 2
      src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin

2
src/AddIns/BackendBindings/WixBinding/Project/SetupDialogControlLibrary.sdcl

@ -1,7 +1,7 @@
<SharpDevelopControlLibrary version="1.1.0"> <SharpDevelopControlLibrary version="1.1.0">
<Assemblies> <Assemblies>
<Assembly assembly="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <Assembly assembly="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<Assembly assembly="WixBinding, Culture=neutral" path=".\..\AddIns\AddIns\BackendBindings\WixBinding"/> <Assembly assembly="WixBinding, Culture=neutral" path="${addinpath:ICSharpCode.WixBinding}"/>
</Assemblies> </Assemblies>
<Categories> <Categories>
<Category name="Setup Dialog Controls" enabled="True"> <Category name="Setup Dialog Controls" enabled="True">

5
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogControlsSideTab.cs

@ -31,7 +31,12 @@ namespace ICSharpCode.WixBinding
{ {
ComponentLibraryLoader loader = new ComponentLibraryLoader(); ComponentLibraryLoader loader = new ComponentLibraryLoader();
loader.LoadToolComponentLibrary(ToolComponentLibraryFileName); loader.LoadToolComponentLibrary(ToolComponentLibraryFileName);
// Fix WixBinding assembly hint path.
Category category = (Category)loader.Categories[0]; Category category = (Category)loader.Categories[0];
foreach (ToolComponent toolComponent in category.ToolComponents) {
toolComponent.HintPath = StringParser.Parse(toolComponent.HintPath);
}
return new SetupDialogControlsSideTab(SharpDevelopSideBar.SideBar, category, ToolboxProvider.ToolboxService); return new SetupDialogControlsSideTab(SharpDevelopSideBar.SideBar, category, ToolboxProvider.ToolboxService);
} }

2
src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin

@ -27,7 +27,7 @@
<Path name = "/SharpDevelop/Workbench/FileFilter"> <Path name = "/SharpDevelop/Workbench/FileFilter">
<FileFilter id = "Wix" <FileFilter id = "Wix"
insertbefore="AllFiles" insertbefore="AllFiles"
name = "WiX files (*.wxs;*.wxi))" name = "WiX files (*.wxs;*.wxi)"
extensions = "*.wxs;*.wxi"/> extensions = "*.wxs;*.wxi"/>
</Path> </Path>

Loading…
Cancel
Save