AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://scmadmin@172.24.11.74:90/scm/git/RecordOrganizer

Browse Source
This commit is contained in:
SchreiberM
2016-08-24 16:55:18 +02:00
parent 3cf078e784 4644ce653f
commit c02e5e235c
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/SetupWiX/Product.wxs
View File

@@ -73,6 +73,18 @@
<File Id="DD_Rights.dll" Name="DD_Rights.dll" Source="DD_Rights.dll" />
<File Id="Interop.WINDREAMLib.dll" Name="Interop.WINDREAMLib.dll" Source="Interop.WINDREAMLib.dll" />
</Component>
<!-- DEVEXPRESS Bibliotheken -->
<Component Id="DevExpressLibs_RightsManager" Guid="739740F2-1576-4416-8E3E-748F65358B65">
<File Id="DevExpress.Data.v15.2_" Name="DevExpress.Data.v15.2.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.Data.v15.2.dll" KeyPath="yes" />
<File Id="DevExpress.Sparkline.v15.2_" Name="DevExpress.Sparkline.v15.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll" />
<File Id="DevExpress.Printing.v15.2.Core_" Name="DevExpress.Printing.v15.2.Core.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.Printing.v15.2.Core.dll" />
<File Id="DevExpress.Utils.v15.2_" Name="DevExpress.Utils.v15.2.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.Utils.v15.2.dll" />
<File Id="DevExpress.XtraEditors.v15.2_" Name="DevExpress.XtraEditors.v15.2.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.XtraEditors.v15.2.dll" />
<File Id="DevExpress.XtraGrid.v15.2_" Name="DevExpress.XtraGrid.v15.2.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.XtraGrid.v15.2.dll" />
<File Id="DevExpress.XtraLayout.v15.2_" Name="DevExpress.XtraLayout.v15.2.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.XtraLayout.v15.2.dll" />
<File Id="DevExpress.XtraPrinting.v15.2_" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\Programme\Sprachen\DevExpress 15.2\Components\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll" />
</Component>
</Directory>
</Directory>
@@ -111,7 +123,7 @@
<Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
<File Id="SnapPanelLib" Name="SnapPanelControl.dll" Source="SnapPanelControl.dll" KeyPath="yes" />
<File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="DLLLicenseManager.dll" KeyPath="no" />
<File Id="DD_Rights" Name="DD_Rights.dll" Source="E:\SchreiberM\Visual Studio\GIT\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll" KeyPath="no" />
<File Id="DD_Rights" Name="DD_Rights.dll" Source="..\..\..\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll" KeyPath="no" />
</Component>
<!-- DD Bibliotheken -->
<Component Id="BasicLibs" Guid="37238CB0-6DC3-4B1B-9438-52FA7D478897">
@@ -245,6 +257,7 @@
<ComponentRef Id="RecordOrganizer.Locales.en_gb" />
<ComponentRef Id="RecordOrganizer.Locales.en_us" />
<ComponentRef Id="DevExpressLibs" />
<ComponentRef Id="DevExpressLibs_RightsManager" />
<ComponentRef Id="BasicLibs" />
<ComponentRef Id="ProgramMenuDir"/>
<!--<ComponentRef Id="RegistryEntries"/>-->