Browse Source

Update setup to include new AddIns (Data.AddIn, WPF Designer, C++ Binding)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4914 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 16 years ago
parent
commit
ee1198eb4c
  1. 3
      src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin
  2. 1
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj
  3. 4
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj
  4. 3
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.addin
  5. 2
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/ICSharpCode.Data.Core.UI.csproj
  6. 3
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj
  7. 3
      src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/ICSharpCode.Data.EDMDesigner.Core.csproj
  8. 3
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.addin
  9. 5
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
  10. 1
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ConsolePad.cs
  11. 1
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/SelectLanguageCommand.cs
  12. 67
      src/Setup/Files.wxs
  13. 19
      src/Setup/Setup.wxs

3
src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin

@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
<AddIn name = "Cpp Binding"
author = "Tomasz Tretkowski"
url = ""
description = "Backing binding for C++">
description = "Backing binding for C++"
addInManagerHidden="preinstalled">
<Runtime>
<Import assembly =":ICSharpCode.SharpDevelop" />

1
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj

@ -191,6 +191,7 @@ @@ -191,6 +191,7 @@
<ProjectReference Include="..\..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
<Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
<Name>ICSharpCode.AvalonEdit</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\DisplayBindings\XmlEditor\Project\XmlEditor.csproj">
<Project>{DCA2703D-250A-463E-A68A-07ED105AE6BD}</Project>

4
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj

@ -128,14 +128,17 @@ @@ -128,14 +128,17 @@
<ProjectReference Include="..\..\..\..\..\src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
<Name>ICSharpCode.SharpDevelop</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\src\Main\Core\Project\ICSharpCode.Core.csproj">
<Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
<Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
<Name>ICSharpCode.Core.Presentation</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj">
<Project>{BAD94D6E-4159-4CB6-B991-486F412D9BB6}</Project>
@ -144,6 +147,7 @@ @@ -144,6 +147,7 @@
<ProjectReference Include="..\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj">
<Project>{B7823AE9-4B43-4859-8796-2EBDC116FBB8}</Project>
<Name>ICSharpCode.Data.Core</Name>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj">
<Project>{EEF5E054-4192-4A57-8FBF-E860D808A51D}</Project>

3
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.addin

@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
<AddIn name = "Data Addin"
author = "Philipp Maihart"
url = "http://www.pmnet.info"
description = "Database Tools Addin for SharpDevelop">
description = "Database Tools Addin for SharpDevelop"
addInManagerHidden="preinstalled">
<Runtime>
<Import assembly="ICSharpCode.Data.Addin.dll" />

2
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/ICSharpCode.Data.Core.UI.csproj

@ -268,10 +268,12 @@ @@ -268,10 +268,12 @@
<ProjectReference Include="..\..\..\..\..\src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
<Name>ICSharpCode.SharpDevelop</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\src\Main\Core\Project\ICSharpCode.Core.csproj">
<Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj">
<Project>{B7823AE9-4B43-4859-8796-2EBDC116FBB8}</Project>

3
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj

@ -241,14 +241,17 @@ @@ -241,14 +241,17 @@
<ProjectReference Include="..\..\..\..\..\src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
<Name>ICSharpCode.SharpDevelop</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\src\Main\Core\Project\ICSharpCode.Core.csproj">
<Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
<Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
<Name>ICSharpCode.Core.Presentation</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj">
<Project>{BAD94D6E-4159-4CB6-B991-486F412D9BB6}</Project>

3
src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/ICSharpCode.Data.EDMDesigner.Core.csproj

@ -187,14 +187,17 @@ @@ -187,14 +187,17 @@
<ProjectReference Include="..\..\..\..\..\src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
<Name>ICSharpCode.SharpDevelop</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\src\Main\Core\Project\ICSharpCode.Core.csproj">
<Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
<Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
<Name>ICSharpCode.Core.Presentation</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj">
<Project>{BAD94D6E-4159-4CB6-B991-486F412D9BB6}</Project>

3
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.addin

@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
<AddIn name = "WPF Designer AddIn"
author = "Daniel Grunwald"
copyright = "prj:///doc/copyright.txt"
description = "WPF Designer">
description = "WPF Designer"
addInManagerHidden="preinstalled">
<Manifest>
<Identity name="ICSharpCode.WpfDesigner"/>

5
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj

@ -323,10 +323,6 @@ @@ -323,10 +323,6 @@
<ProjectReference Include="..\..\..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
<Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
<Name>ICSharpCode.AvalonEdit</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
<Project>{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}</Project>
<Name>ICSharpCode.TextEditor</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
@ -342,6 +338,7 @@ @@ -342,6 +338,7 @@
<ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
<Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
<Name>ICSharpCode.Core.Presentation</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Debugger.Core\Project\Debugger.Core.csproj">
<Project>{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}</Project>

1
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ConsolePad.cs

@ -18,7 +18,6 @@ using ICSharpCode.SharpDevelop; @@ -18,7 +18,6 @@ using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Debugging;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Services;
using ICSharpCode.TextEditor;
namespace ICSharpCode.SharpDevelop.Gui.Pads
{

1
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/SelectLanguageCommand.cs

@ -13,7 +13,6 @@ using ICSharpCode.NRefactory; @@ -13,7 +13,6 @@ using ICSharpCode.NRefactory;
using ICSharpCode.SharpDevelop.Debugging;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Services;
using ICSharpCode.TextEditor;
using System.Windows.Controls;
namespace ICSharpCode.SharpDevelop.Gui.Pads

67
src/Setup/Files.wxs

@ -623,7 +623,7 @@ @@ -623,7 +623,7 @@
<File Source="..\..\bin\Tools\SHFB\SharedContent\VS2005BuilderContent_zh-CN.xml" Name="VS2005BuilderContent_zh-CN.xml" Id="VS2005BuilderContent_zh_CN.xml" />
</Component>
</Directory>
<Directory Id="Templates" Name="Templates">
<Directory Id="SHFBTemplates" Name="Templates">
<Component Guid="5A21AA47-795A-4A94-AB67-6D36DEA22117" Id="SHFBTemplates" DiskId="1">
<File Source="..\..\bin\Tools\SHFB\Templates\Build1xHelpFile.bat" Name="Build1xHelpFile.bat" Id="Build1xHelpFile.bat" />
<File Source="..\..\bin\Tools\SHFB\Templates\Build2xHelpFile.bat" Name="Build2xHelpFile.bat" Id="Build2xHelpFile.bat" />
@ -1286,6 +1286,24 @@ @@ -1286,6 +1286,24 @@
<File Source="..\..\AddIns\AddIns\BackendBindings\XamlBinding\XamlBinding.addin" Name="XamlBinding.addin" Id="XamlBinding.addin" KeyPath="yes" />
</Component>
</Directory>
<Directory Id="CppBinding" Name="CppBinding">
<Component Guid="B7C63B27-82B7-42E8-893F-5034CB153074" Id="CppBindingAddin" DiskId="1">
<File Source="..\..\AddIns\AddIns\BackendBindings\CppBinding\CppBinding.addin" Name="CppBinding.addin" Id="CppBinding.addin" KeyPath="yes" />
</Component>
<Component Guid="AC3EFDF3-3063-464A-9072-1285BAAD3579" Id="CppBindingDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\BackendBindings\CppBinding\CppBinding.dll" Name="CppBinding.dll" Id="CppBinding.dll" KeyPath="yes" />
</Component>
<Directory Id="CppTemplates" Name="Templates">
<Component Guid="CD1E49C5-7037-46B0-81CE-41C3E10759E6" Id="CppBindingTemplates" DiskId="1">
<File Source="..\..\AddIns\AddIns\BackendBindings\CppBinding\Templates\ConsoleProject.xpt" Name="ConsoleProject.xpt" Id="ConsoleProject.xpt" KeyPath="yes" />
<File Source="..\..\AddIns\AddIns\BackendBindings\CppBinding\Templates\DefaultAssemblyInfo.cpp" Name="DefaultAssemblyInfo.cpp" Id="DefaultAssemblyInfo.cpp" />
<File Source="..\..\AddIns\AddIns\BackendBindings\CppBinding\Templates\Empty.xft" Name="Empty.xft" Id="Templates.Empty1.xft" />
<File Source="..\..\AddIns\AddIns\BackendBindings\CppBinding\Templates\EmptyClass.xft" Name="EmptyClass.xft" Id="Templates.EmptyClass1.xft" />
<File Source="..\..\AddIns\AddIns\BackendBindings\CppBinding\Templates\Library.xpt" Name="Library.xpt" Id="Templates.Library.xpt" />
<File Source="..\..\AddIns\AddIns\BackendBindings\CppBinding\Templates\UnmanagedConsoleProject.xpt" Name="UnmanagedConsoleProject.xpt" Id="UnmanagedConsoleProject.xpt" />
</Component>
</Directory>
</Directory>
</Directory>
<Directory Id="DisplayBindingsFolder" Name="DisplayBindings">
<Directory Id="FormsDesignerFolder" Name="FormsDesigner">
@ -1404,6 +1422,53 @@ @@ -1404,6 +1422,53 @@
<File Source="..\..\AddIns\AddIns\DisplayBindings\HexEditor\HexEditor.dll" Name="HexEditor.dll" Id="HexEditor.dll" KeyPath="yes" />
</Component>
</Directory>
<Directory Id="WpfDesign" Name="WpfDesign">
<Component Guid="E529AC6C-30BE-4406-9F26-B55CAA110D3F" Id="ICSharpCodeWpfDesignAddInDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\WpfDesign\ICSharpCode.WpfDesign.AddIn.dll" Name="ICSharpCode.WpfDesign.AddIn.dll" Id="ICSharpCode.WpfDesign.AddIn.dll" KeyPath="yes" />
</Component>
<Component Guid="1147F468-F5DC-49D3-9CFC-EE794FC7BBC5" Id="ICSharpCodeWpfDesignDesignerDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\WpfDesign\ICSharpCode.WpfDesign.Designer.dll" Name="ICSharpCode.WpfDesign.Designer.dll" Id="ICSharpCode.WpfDesign.Designer.dll" KeyPath="yes" />
</Component>
<Component Guid="C454357F-4ED8-424A-8F6A-0652EC8A0AB8" Id="ICSharpCodeWpfDesignDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\WpfDesign\ICSharpCode.WpfDesign.dll" Name="ICSharpCode.WpfDesign.dll" Id="ICSharpCode.WpfDesign.dll" KeyPath="yes" />
</Component>
<Component Guid="DADDFB3A-A7AE-4D28-BFD6-294ECDFD9D3B" Id="ICSharpCodeWpfDesignXamlDomDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\WpfDesign\ICSharpCode.WpfDesign.XamlDom.dll" Name="ICSharpCode.WpfDesign.XamlDom.dll" Id="ICSharpCode.WpfDesign.XamlDom.dll" KeyPath="yes" />
</Component>
<Component Guid="E89BBA3D-D267-4E4F-8DA7-E38E864C4317" Id="WpfDesignAddin" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\WpfDesign\WpfDesign.addin" Name="WpfDesign.addin" Id="WpfDesign.addin" KeyPath="yes" />
</Component>
</Directory>
<Directory Id="Data" Name="Data">
<Component Guid="16E65D48-658D-4C6B-BCCB-9B5450727CFD" Id="ICSharpCodeDataAddin" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\Data\ICSharpCode.Data.addin" Name="ICSharpCode.Data.addin" Id="ICSharpCode.Data.addin" KeyPath="yes" />
</Component>
<Component Guid="03DE504B-1757-49CD-A3FC-BAC7210F3565" Id="ICSharpCodeDataAddinDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin.dll" Name="ICSharpCode.Data.Addin.dll" Id="ICSharpCode.Data.Addin.dll" KeyPath="yes" />
</Component>
<Component Guid="48BC48FD-D6C4-471B-A19A-52EC48FDADF3" Id="ICSharpCodeDataCoreDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.dll" Name="ICSharpCode.Data.Core.dll" Id="ICSharpCode.Data.Core.dll" KeyPath="yes" />
</Component>
<Component Guid="FAE360BA-DA88-41E8-A5C7-1DA41E98B8F2" Id="ICSharpCodeDataCoreUIDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI.dll" Name="ICSharpCode.Data.Core.UI.dll" Id="ICSharpCode.Data.Core.UI.dll" KeyPath="yes" />
</Component>
<Component Guid="AC3788E8-6068-46BA-94E0-FE17B9D057A9" Id="ICSharpCodeDataEDMDesignerCoreDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.dll" Name="ICSharpCode.Data.EDMDesigner.Core.dll" Id="ICSharpCode.Data.EDMDesigner.Core.dll" KeyPath="yes" />
</Component>
<Component Guid="D41C8A90-0CD0-4160-9172-1DBE3B55902D" Id="ICSharpCodeDataEDMDesignerCoreUIDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI.dll" Name="ICSharpCode.Data.EDMDesigner.Core.UI.dll" Id="ICSharpCode.Data.EDMDesigner.Core.UI.dll" KeyPath="yes" />
</Component>
<Component Guid="31400415-BB2A-49C9-90DF-58F7FD0A8154" Id="ICSharpCodeDataSQLServerDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer.dll" Name="ICSharpCode.Data.SQLServer.dll" Id="ICSharpCode.Data.SQLServer.dll" KeyPath="yes" />
</Component>
<Directory Id="DataTemplates" Name="Templates">
<Directory Id="Files" Name="Files">
<Component Guid="2791081B-A45D-4729-952C-43C147753653" Id="CSharpEDMXXft" DiskId="1">
<File Source="..\..\AddIns\AddIns\DisplayBindings\Data\Templates\Files\CSharp.EDMX.xft" Name="CSharp.EDMX.xft" Id="CSharp.EDMX.xft" KeyPath="yes" />
</Component>
</Directory>
</Directory>
</Directory>
</Directory>
<Directory Id="MiscAddInsFolder" Name="Misc">
<Directory Id="AddInManagerFolder" Name="AddInManager">

19
src/Setup/Setup.wxs

@ -438,6 +438,25 @@ @@ -438,6 +438,25 @@
<ComponentRef Id="ICSharpCodeProfilerControllerDll"/>
<ComponentRef Id="ICSharpCodeProfilerControlsDll"/>
<ComponentRef Id="SystemDataSQLiteDll"/>-->
<ComponentRef Id="CppBindingAddin"/>
<ComponentRef Id="CppBindingDll"/>
<ComponentRef Id="CppBindingTemplates"/>
<ComponentRef Id="ICSharpCodeWpfDesignAddInDll"/>
<ComponentRef Id="ICSharpCodeWpfDesignDesignerDll"/>
<ComponentRef Id="ICSharpCodeWpfDesignDll"/>
<ComponentRef Id="ICSharpCodeWpfDesignXamlDomDll"/>
<ComponentRef Id="WpfDesignAddin"/>
<ComponentRef Id="ICSharpCodeDataAddin"/>
<ComponentRef Id="ICSharpCodeDataAddinDll"/>
<ComponentRef Id="ICSharpCodeDataCoreDll"/>
<ComponentRef Id="ICSharpCodeDataCoreUIDll"/>
<ComponentRef Id="ICSharpCodeDataEDMDesignerCoreDll"/>
<ComponentRef Id="ICSharpCodeDataEDMDesignerCoreUIDll"/>
<ComponentRef Id="ICSharpCodeDataSQLServerDll"/>
<ComponentRef Id="CSharpEDMXXft"/>
</Feature>
<Feature Id="SharpDevelopFileAssociations"
Level="2"

Loading…
Cancel
Save