diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index 67b7030..d14090e 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -53,32 +53,102 @@ My Project\app.manifest - - - - - - - - - - - - - - - - - + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.UI.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Office.v15.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.RichEdit.v15.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Spreadsheet.v15.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.UI.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.Wizard.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraNavBar.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraRichEdit.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraSpreadsheet.v15.2.dll + + + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll - - - - - - - False P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll @@ -95,9 +165,8 @@ P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll True - - False - D:\Programme\DB\Oracle\ora12.1\Client\ODP.NET\managed\common\Oracle.ManagedDataAccess.dll + + P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index 3cd5093..f536553 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -20,7 +20,7 @@ Imports System.Runtime.InteropServices 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird - + ' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: ' @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/Global_Indexer/My Project/licenses.licx b/Global_Indexer/My Project/licenses.licx index 79a6743..e69de29 100644 --- a/Global_Indexer/My Project/licenses.licx +++ b/Global_Indexer/My Project/licenses.licx @@ -1,3 +0,0 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/SetupWix/Product.wxs b/SetupWix/Product.wxs index b92e988..ec1e742 100644 --- a/SetupWix/Product.wxs +++ b/SetupWix/Product.wxs @@ -2,7 +2,18 @@ - + @@ -33,7 +44,7 @@ - + @@ -59,7 +70,7 @@ - + @@ -79,10 +90,10 @@ - + - - + + @@ -92,72 +103,72 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + @@ -168,7 +179,7 @@ - + diff --git a/SetupWix/SetupWix.wixproj b/SetupWix/SetupWix.wixproj index beee8fc..07445e1 100644 --- a/SetupWix/SetupWix.wixproj +++ b/SetupWix/SetupWix.wixproj @@ -10,11 +10,17 @@ Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + + bin\$(Configuration)\ obj\$(Configuration)\ Debug + de-DE;en-US + + -b "$(SolutionDir)Global_Indexer\bin\$(Configuration)" + bin\$(Configuration)\ @@ -33,16 +39,6 @@ WixUIExtension - - - Global_Indexer - {7474b1d2-49a4-4d12-b544-c8674d3f7231} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - -