Merge branch 'RibbonForm' of http://dd-vmp07-com04:3000/JenneJ/RecordOrganizer into RibbonForm
This commit is contained in:
commit
ed2de4614c
2
.gitignore
vendored
2
.gitignore
vendored
@ -155,4 +155,4 @@ $RECYCLE.BIN/
|
||||
# Mac desktop service store files
|
||||
.DS_Store
|
||||
/app/.vs/DD-Record-Organizer/v15/Server/sqlite3
|
||||
/app/.vs/DD-Record-Organizer/v16/Server/sqlite3
|
||||
/app/.vs
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -1,17 +1,17 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26228.9
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.29728.190
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD-Record-Organizer", "DD-Record-Organizer\DD-Record-Organizer.vbproj", "{BDCC148B-4C84-4A48-80CF-4C56057294E0}"
|
||||
EndProject
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupWiX", "SetupWiX\SetupWiX.wixproj", "{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}"
|
||||
EndProject
|
||||
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RecordOrganizer_RightManager", "RecordOrganizer_RightManager\RecordOrganizer_RightManager.vbproj", "{F1C8A9DF-2452-4E3B-9C32-0C792F6ED2E6}"
|
||||
EndProject
|
||||
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERSION_CHECKER", "VERSION_CHECKER\VERSION_CHECKER.vbproj", "{BD9ADB52-06CA-401C-84C7-1D94BC3E07E7}"
|
||||
EndProject
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupWiX_NoUpdater", "SetupWiX_NoUpdater\SetupWiX_NoUpdater.wixproj", "{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}"
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\SetupVS19.wixproj", "{7727A1A0-451F-4166-84B2-F1CD53B66692}"
|
||||
EndProject
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup_NoUpdaterVS19", "Setup_NoUpdaterVS19\Setup_NoUpdaterVS19.wixproj", "{A7F7585A-C46A-4436-9F6E-17629325CE58}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
@ -57,31 +57,6 @@ Global
|
||||
{BDCC148B-4C84-4A48-80CF-4C56057294E0}.SingleImage|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{BDCC148B-4C84-4A48-80CF-4C56057294E0}.SingleImage|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{BDCC148B-4C84-4A48-80CF-4C56057294E0}.SingleImage|x86.ActiveCfg = Debug|Any CPU
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.CD_ROM|Any CPU.ActiveCfg = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.CD_ROM|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.CD_ROM|Mixed Platforms.Build.0 = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.CD_ROM|x86.ActiveCfg = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.CD_ROM|x86.Build.0 = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Debug|x86.Build.0 = Debug|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.DVD-5|Any CPU.ActiveCfg = Debug|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.DVD-5|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.DVD-5|Mixed Platforms.Build.0 = Debug|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.DVD-5|x86.ActiveCfg = Debug|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.DVD-5|x86.Build.0 = Debug|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Release|Mixed Platforms.Build.0 = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Release|x86.ActiveCfg = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.Release|x86.Build.0 = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.SingleImage|Any CPU.ActiveCfg = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.SingleImage|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.SingleImage|Mixed Platforms.Build.0 = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.SingleImage|x86.ActiveCfg = Release|x86
|
||||
{BDD0EE4F-7063-47CA-B8B8-B94F23AB8890}.SingleImage|x86.Build.0 = Release|x86
|
||||
{F1C8A9DF-2452-4E3B-9C32-0C792F6ED2E6}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{F1C8A9DF-2452-4E3B-9C32-0C792F6ED2E6}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
|
||||
{F1C8A9DF-2452-4E3B-9C32-0C792F6ED2E6}.CD_ROM|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
@ -132,36 +107,67 @@ Global
|
||||
{BD9ADB52-06CA-401C-84C7-1D94BC3E07E7}.SingleImage|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{BD9ADB52-06CA-401C-84C7-1D94BC3E07E7}.SingleImage|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{BD9ADB52-06CA-401C-84C7-1D94BC3E07E7}.SingleImage|x86.ActiveCfg = Release|Any CPU
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.CD_ROM|Any CPU.ActiveCfg = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.CD_ROM|Any CPU.Build.0 = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.CD_ROM|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.CD_ROM|Mixed Platforms.Build.0 = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.CD_ROM|x86.ActiveCfg = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.CD_ROM|x86.Build.0 = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Debug|x86.Build.0 = Debug|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.DVD-5|Any CPU.ActiveCfg = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.DVD-5|Any CPU.Build.0 = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.DVD-5|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.DVD-5|Mixed Platforms.Build.0 = Debug|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.DVD-5|x86.ActiveCfg = Debug|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.DVD-5|x86.Build.0 = Debug|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Release|Mixed Platforms.Build.0 = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Release|x86.ActiveCfg = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Release|x86.Build.0 = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|Any CPU.ActiveCfg = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|Any CPU.Build.0 = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|Mixed Platforms.Build.0 = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|x86.ActiveCfg = Release|x86
|
||||
{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|x86.Build.0 = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.CD_ROM|Any CPU.ActiveCfg = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.CD_ROM|Any CPU.Build.0 = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.CD_ROM|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.CD_ROM|Mixed Platforms.Build.0 = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.CD_ROM|x86.ActiveCfg = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.CD_ROM|x86.Build.0 = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.Debug|x86.Build.0 = Debug|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.DVD-5|Any CPU.ActiveCfg = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.DVD-5|Any CPU.Build.0 = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.DVD-5|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.DVD-5|Mixed Platforms.Build.0 = Debug|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.DVD-5|x86.ActiveCfg = Debug|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.DVD-5|x86.Build.0 = Debug|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.Release|Mixed Platforms.Build.0 = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.Release|x86.ActiveCfg = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.Release|x86.Build.0 = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.SingleImage|Any CPU.ActiveCfg = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.SingleImage|Any CPU.Build.0 = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.SingleImage|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.SingleImage|Mixed Platforms.Build.0 = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.SingleImage|x86.ActiveCfg = Release|x86
|
||||
{7727A1A0-451F-4166-84B2-F1CD53B66692}.SingleImage|x86.Build.0 = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.CD_ROM|Any CPU.ActiveCfg = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.CD_ROM|Any CPU.Build.0 = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.CD_ROM|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.CD_ROM|Mixed Platforms.Build.0 = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.CD_ROM|x86.ActiveCfg = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.CD_ROM|x86.Build.0 = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.Debug|x86.Build.0 = Debug|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.DVD-5|Any CPU.ActiveCfg = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.DVD-5|Any CPU.Build.0 = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.DVD-5|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.DVD-5|Mixed Platforms.Build.0 = Debug|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.DVD-5|x86.ActiveCfg = Debug|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.DVD-5|x86.Build.0 = Debug|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.Release|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.Release|Mixed Platforms.Build.0 = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.Release|x86.ActiveCfg = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.Release|x86.Build.0 = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.SingleImage|Any CPU.ActiveCfg = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.SingleImage|Any CPU.Build.0 = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.SingleImage|Mixed Platforms.ActiveCfg = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.SingleImage|Mixed Platforms.Build.0 = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.SingleImage|x86.ActiveCfg = Release|x86
|
||||
{A7F7585A-C46A-4436-9F6E-17629325CE58}.SingleImage|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {BFB9D2B3-CAD7-427D-8A0D-503795CD9608}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@ -2,22 +2,22 @@
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
||||
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||
<Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="$(var.ProductVersion)" Manufacturer="Digital Data" Language="1031" Codepage="1252">
|
||||
<Package
|
||||
Id="*"
|
||||
Keywords="Installer"
|
||||
Description="Digital Data Record Organizer Setup"
|
||||
Comments="Record Organizer is a registered Trademark of Digital Data"
|
||||
Manufacturer="Digital Data"
|
||||
InstallerVersion="100"
|
||||
Languages="1031"
|
||||
Compressed="yes"
|
||||
<Package
|
||||
Id="*"
|
||||
Keywords="Installer"
|
||||
Description="Digital Data Record Organizer Setup"
|
||||
Comments="Record Organizer is a registered Trademark of Digital Data"
|
||||
Manufacturer="Digital Data"
|
||||
InstallerVersion="100"
|
||||
Languages="1031"
|
||||
Compressed="yes"
|
||||
SummaryCodepage="1252"
|
||||
InstallScope="perMachine"
|
||||
/>
|
||||
<!--
|
||||
InstallScrope="perMachine" - sorgt dafür, dass das Programm für jeden Benutzer installiert wird
|
||||
-->
|
||||
|
||||
|
||||
<!-- Nicht entfernen! -->
|
||||
<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
|
||||
<Property Id='DiskPrompt' Value="Record Organizer Install" />
|
||||
@ -36,7 +36,7 @@
|
||||
AllowSameVersionUpgrades="no"
|
||||
DowngradeErrorMessage="A newer version of [ProductName] is already installed. The setup will terminate."
|
||||
/>
|
||||
|
||||
|
||||
<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
|
||||
<Upgrade Id="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}">
|
||||
<UpgradeVersion
|
||||
@ -48,7 +48,7 @@
|
||||
|
||||
<!-- Legt das Icon fest -->
|
||||
<Icon Id="DDRecordOrganizer.exe" SourceFile="DD-Record-Organizer.exe" />
|
||||
|
||||
|
||||
<!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
|
||||
<Property Id="ARPPRODUCTICON" Value="DDRecordOrganizer.exe" />
|
||||
|
||||
@ -60,14 +60,14 @@
|
||||
<!-- Legt die Ordner-Struktur fest -->
|
||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||
<Directory Id="ProgramFilesFolder" Name="Pfiles">
|
||||
<Directory Id="DD" Name="Digital Data">
|
||||
|
||||
<Directory Id="DD" Name="Digital Data">
|
||||
|
||||
<!-- Das Installationsverzeichnis -->
|
||||
<Directory Id="INSTALLDIR" Name="Record Organizer">
|
||||
|
||||
<Directory Id="ADDONDIR" Name="Addons">
|
||||
<Directory Id="RIGHTMANAGERDIR" Name="RightManager">
|
||||
|
||||
|
||||
<Component Id="RecordOrganizer_RightManager" Guid="BD73A9BB-89FD-4F4C-85B8-F31C97296745">
|
||||
<File Id="RecordOrganizer_RightManager.exe" Name="RecordOrganizer_RightManager.exe" Source="RecordOrganizer_RightManager.exe" />
|
||||
<File Id="DD_Rights.dll" Name="DD_Rights.dll" Source="DD_Rights.dll" />
|
||||
@ -83,13 +83,13 @@
|
||||
<File Id="DevExpress.XtraEditors.v15.2_" Name="DevExpress.XtraEditors.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll" />
|
||||
<File Id="DevExpress.XtraGrid.v15.2_" Name="DevExpress.XtraGrid.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll" />
|
||||
<File Id="DevExpress.XtraLayout.v15.2_" Name="DevExpress.XtraLayout.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll" />
|
||||
<File Id="DevExpress.XtraPrinting.v15.2_" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll" />
|
||||
<File Id="DevExpress.XtraPrinting.v15.2_" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll" />
|
||||
</Component>
|
||||
|
||||
|
||||
</Directory>
|
||||
|
||||
|
||||
<Directory Id="VERSIONCHECKER" Name="VERSION_CHECKER">
|
||||
|
||||
|
||||
<Component Id="RecordOrganizer_VersionChecker" Guid="37D17685-E588-4BC6-A15E-570DE749852A">
|
||||
<File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe" Source="VERSION_CHECKER.exe">
|
||||
<Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
|
||||
@ -97,10 +97,10 @@
|
||||
</File>
|
||||
<File Id="DD_LIB_Standards.dll" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" />
|
||||
</Component>
|
||||
|
||||
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
||||
|
||||
<!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü -->
|
||||
<Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
|
||||
<!--<File Id="PMOEXE" Name="DD-Record-Organizer.exe" Source="DD-Record-Organizer.exe" KeyPath="yes">
|
||||
@ -124,23 +124,23 @@
|
||||
<File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
|
||||
<File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
|
||||
</Component>
|
||||
|
||||
<!-- Oracle-Bibliothek -->
|
||||
|
||||
<!-- Oracle-Bibliothek -->
|
||||
<Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
|
||||
<File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes" />
|
||||
</Component>
|
||||
|
||||
|
||||
<!-- Commandline Bibliothek -->
|
||||
<Component Id="Commandline" Guid="53F9734C-F020-4885-96DC-D8CD880E8446">
|
||||
<File Id="Commandline" Name="Commandline.dll" Source="Commandline.dll" KeyPath="yes" />
|
||||
</Component>
|
||||
|
||||
|
||||
<!-- DD Bibliotheken -->
|
||||
<Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
|
||||
<File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="DLLLicenseManager.dll" KeyPath="no" />
|
||||
<File Id="DD_Rights" Name="DD_Rights.dll" Source="DD_Rights.dll" KeyPath="no" />
|
||||
<File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" KeyPath="no" />
|
||||
|
||||
|
||||
</Component>
|
||||
<!-- DD Bibliotheken -->
|
||||
<Component Id="BasicLibs" Guid="37238CB0-6DC3-4B1B-9438-52FA7D478897">
|
||||
@ -148,7 +148,7 @@
|
||||
<File Id="Microsoft.Office.Interop.Outlook" Name="Microsoft.Office.Interop.Outlook.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll" KeyPath="no" />
|
||||
<File Id="Microsoft.Office.Interop.Word" Name="Microsoft.Office.Interop.Word.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Word\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Word.dll" KeyPath="no" />
|
||||
</Component>
|
||||
|
||||
|
||||
<!-- MAIL.NET Bibliothek -->
|
||||
<Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
|
||||
<File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="Independentsoft.Msg.dll" KeyPath="yes" />
|
||||
@ -157,7 +157,7 @@
|
||||
<Component Id="ERPConnectLibs" Guid="9AC1DD00-6225-47DD-A142-1EB462CD5240">
|
||||
<File Id="ERPConnect45" Name="ERPConnect45.dll" Source="ERPConnect45.dll" KeyPath="yes" />
|
||||
</Component>
|
||||
|
||||
|
||||
<!-- DEVEXPRESS Bibliotheken -->
|
||||
<Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
|
||||
<File Id="DevExpress.Data.v15.2" Name="DevExpress.Data.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll" KeyPath="yes" />
|
||||
@ -182,7 +182,7 @@
|
||||
<File Id="DevExpress.Pdf.v15.2.Drwawing" Name="DevExpress.Pdf.v15.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll" />
|
||||
<File Id="DevExpress.XtraPdfViewer.v15.2" Name="DevExpress.XtraPdfViewer.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll" />
|
||||
<File Id="DevExpress.Sparkline.v15.2" Name="DevExpress.Sparkline.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll" />
|
||||
<!--<File Id="DevExpress.Charts.Designer.v15.2_" Name="DevExpress.Charts.Designer.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.Designer.v15.2.dll" />-->
|
||||
<!--<File Id="DevExpress.Charts.Designer.v15.2_" Name="DevExpress.Charts.Designer.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.Designer.v15.2.dll" />-->
|
||||
<File Id="DevExpress.Charts.v15.2.Core_" Name="DevExpress.Charts.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll" />
|
||||
<File Id="DevExpress.XtraCharts.v15.2_" Name="DevExpress.XtraCharts.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.dll" />
|
||||
<File Id="DevExpress.XtraCharts.v15.2.Extensions_" Name="DevExpress.XtraCharts.v15.2.Extensions.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.Extensions.dll" />
|
||||
@ -198,7 +198,7 @@
|
||||
<Component Id="RecordOrganizer.Locales.de" Guid="C9476586-46A4-450A-88F4-BE416B7AD21C">
|
||||
<File Id="DDRecordOrganizer.resource.de" Name="DD-Record-Organizer.resources.dll" Source="de\DD-Record-Organizer.resources.dll"></File>
|
||||
</Component>
|
||||
|
||||
|
||||
<Component Id="Scheduler.Locales" Guid="84335DB2-F5D2-496B-9318-2BD1B1ACA391">
|
||||
<File Id="DevExpress.XtraScheduler.v15.2.Core.resources" Name="DevExpress.XtraScheduler.v15.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\de\DevExpress.XtraScheduler.v15.2.Core.resources.dll"></File>
|
||||
<File Id="DevExpress.XtraScheduler.v15.2.Extensions.resources" Name="DevExpress.XtraScheduler.v15.2.Extensions.resources.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\de\DevExpress.XtraScheduler.v15.2.Extensions.resources.dll"></File>
|
||||
@ -217,7 +217,7 @@
|
||||
<File Id="DevExpress.XtraRichEdit.v15.2.resources" Name="DevExpress.XtraRichEdit.v15.2.resources.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\de\DevExpress.XtraRichEdit.v15.2.resources.dll"></File>
|
||||
<File Id="DevExpress.XtraTreeList.v15.2.resources" Name="DevExpress.XtraTreeList.v15.2.resources.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\de\DevExpress.XtraTreeList.v15.2.resources.dll"></File>
|
||||
<File Id="DevExpress.XtraVerticalGrid.v15.2.resources" Name="DevExpress.XtraVerticalGrid.v15.2.resources.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\de\DevExpress.XtraVerticalGrid.v15.2.resources.dll"></File>
|
||||
<File Id="DevExpress.XtraWizard.v15.2.resources" Name="DevExpress.XtraWizard.v15.2.resources.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\de\DevExpress.XtraWizard.v15.2.resources.dll"></File>
|
||||
<File Id="DevExpress.XtraWizard.v15.2.resources" Name="DevExpress.XtraWizard.v15.2.resources.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\de\DevExpress.XtraWizard.v15.2.resources.dll"></File>
|
||||
<File Id="DevExpress.Charts.Designer.v15.2.resources" Name="DevExpress.Charts.Designer.v15.2.resources.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\de\DevExpress.Charts.Designer.v15.2.resources.dll" />
|
||||
<File Id="DevExpress.XtraCharts.v15.2.resources" Name="DevExpress.XtraCharts.v15.2.resources.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\de\DevExpress.XtraCharts.v15.2.resources.dll" />
|
||||
</Component>
|
||||
@ -243,15 +243,15 @@
|
||||
<Directory Id="ProgramMenuDir" Name="Record Organizer">
|
||||
<Component Id="ProgramMenuDir" Guid="5200DF59-FED6-4C5A-8393-90B8ED526432">
|
||||
<RemoveFolder Id="ProgramMenuDir" On="uninstall" />
|
||||
|
||||
|
||||
<RegistryKey Root="HKCU" Key="Software">
|
||||
|
||||
|
||||
<RegistryKey Key="[Manufacturer]">
|
||||
<RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
|
||||
<RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
|
||||
</RegistryKey>
|
||||
</RegistryKey>
|
||||
|
||||
|
||||
<RegistryKey Key="Classes">
|
||||
<RegistryKey Key="pmo" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYCUSTOMURLHANDLER">
|
||||
<RegistryValue Type="string" Name="URL Protocol" Value="" />
|
||||
@ -259,13 +259,13 @@
|
||||
<RegistryValue Key="shell\open\command" Type="string" Value=""[INSTALLDIR]DD-Record-Organizer.exe" --data %1" />
|
||||
</RegistryKey>
|
||||
</RegistryKey>
|
||||
|
||||
|
||||
</RegistryKey>
|
||||
|
||||
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
||||
|
||||
<!-- Desktop Ordner -->
|
||||
<Directory Id="DesktopFolder" Name="Desktop" />
|
||||
</Directory>
|
||||
@ -292,10 +292,10 @@
|
||||
<ComponentRef Id="RecordOrganizer_RightManager"/>
|
||||
<ComponentRef Id="RecordOrganizer_VersionChecker" />
|
||||
</Feature>
|
||||
|
||||
|
||||
<!-- Legt das Standard-Installationsverzeichnis fest-->
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
|
||||
|
||||
|
||||
<!-- OBERFLÄCHE -->
|
||||
<UI>
|
||||
<UIRef Id="WixUI_InstallDir" />
|
||||
@ -1,28 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
<ProductVersion>3.8</ProductVersion>
|
||||
<ProjectGuid>bdd0ee4f-7063-47ca-b8b8-b94f23ab8890</ProjectGuid>
|
||||
<ProductVersion>3.10</ProductVersion>
|
||||
<ProjectGuid>7727a1a0-451f-4166-84b2-f1cd53b66692</ProjectGuid>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<OutputName>RecordOrganizerSetup</OutputName>
|
||||
<OutputName>SetupVS19</OutputName>
|
||||
<OutputType>Package</OutputType>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<IncludeSearchPaths>
|
||||
</IncludeSearchPaths>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<OutputPath>bin\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
<DefineConstants>Debug</DefineConstants>
|
||||
<LinkerAdditionalOptions>-b "$(SolutionDir)DD-Record-Organizer\bin\$(Configuration)"
|
||||
-b "$(SolutionDir)RecordOrganizer_RightManager\bin\$(Configuration)"
|
||||
-b "$(SolutionDir)VERSION_CHECKER\bin\$(Configuration)"
|
||||
-cultures:de-DE,en-US</LinkerAdditionalOptions>
|
||||
<CompilerAdditionalOptions>
|
||||
</CompilerAdditionalOptions>
|
||||
<LinkerAdditionalOptions>
|
||||
-b "$(SolutionDir)DD-Record-Organizer\bin\$(Configuration)"
|
||||
-b "$(SolutionDir)RecordOrganizer_RightManager\bin\$(Configuration)"
|
||||
-b "$(SolutionDir)VERSION_CHECKER\bin\$(Configuration)"
|
||||
-cultures:de-DE,en-US
|
||||
</LinkerAdditionalOptions>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
||||
<OutputPath>bin\$(Configuration)\</OutputPath>
|
||||
@ -41,20 +37,10 @@
|
||||
<Name>WixUIExtension</Name>
|
||||
</WixExtension>
|
||||
</ItemGroup>
|
||||
<Import Project="$(WixTargetsPath)" />
|
||||
<!--
|
||||
To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Wix.targets.
|
||||
-->
|
||||
<Target Name="BeforeBuild">
|
||||
<!-- Get the programs assembly version from the .exe file -->
|
||||
<GetAssemblyIdentity AssemblyFiles="..\DD-Record-Organizer\bin\$(Configuration)\DD-Record-Organizer.exe">
|
||||
<Output TaskParameter="Assemblies" ItemName="AsmInfo" />
|
||||
</GetAssemblyIdentity>
|
||||
<!-- Store the assembly version number in ProductVersion preprocessor variable -->
|
||||
<CreateProperty Value="$(DefineConstants);ProductVersion=%(AsmInfo.Version)">
|
||||
<Output TaskParameter="Value" PropertyName="DefineConstants" />
|
||||
</CreateProperty>
|
||||
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
|
||||
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
|
||||
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
|
||||
</Target>
|
||||
<Target Name="BeforeBuild">
|
||||
<!-- Get the programs assembly version from the .exe file -->
|
||||
@ -75,6 +61,10 @@
|
||||
</CreateProperty>
|
||||
</Target>
|
||||
<!--
|
||||
To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Wix.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
@ -2,22 +2,22 @@
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
||||
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||
<Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="$(var.ProductVersion)" Manufacturer="Digital Data" Language="1031" Codepage="1252">
|
||||
<Package
|
||||
Id="*"
|
||||
Keywords="Installer"
|
||||
Description="Digital Data Record Organizer Setup"
|
||||
Comments="Record Organizer is a registered Trademark of Digital Data"
|
||||
Manufacturer="Digital Data"
|
||||
InstallerVersion="100"
|
||||
Languages="1031"
|
||||
Compressed="yes"
|
||||
<Package
|
||||
Id="*"
|
||||
Keywords="Installer"
|
||||
Description="Digital Data Record Organizer Setup"
|
||||
Comments="Record Organizer is a registered Trademark of Digital Data"
|
||||
Manufacturer="Digital Data"
|
||||
InstallerVersion="100"
|
||||
Languages="1031"
|
||||
Compressed="yes"
|
||||
SummaryCodepage="1252"
|
||||
InstallScope="perMachine"
|
||||
/>
|
||||
<!--
|
||||
InstallScrope="perMachine" - sorgt dafür, dass das Programm für jeden Benutzer installiert wird
|
||||
-->
|
||||
|
||||
|
||||
<!-- Nicht entfernen! -->
|
||||
<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
|
||||
<Property Id='DiskPrompt' Value="Record Organizer Install" />
|
||||
@ -36,7 +36,7 @@
|
||||
AllowSameVersionUpgrades="no"
|
||||
DowngradeErrorMessage="A newer version of [ProductName] is already installed. The setup will terminate."
|
||||
/>
|
||||
|
||||
|
||||
<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
|
||||
<Upgrade Id="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}">
|
||||
<UpgradeVersion
|
||||
@ -48,7 +48,7 @@
|
||||
|
||||
<!-- Legt das Icon fest -->
|
||||
<Icon Id="DDRecordOrganizer.exe" SourceFile="DD-Record-Organizer.exe" />
|
||||
|
||||
|
||||
<!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
|
||||
<Property Id="ARPPRODUCTICON" Value="DDRecordOrganizer.exe" />
|
||||
|
||||
@ -60,14 +60,14 @@
|
||||
<!-- Legt die Ordner-Struktur fest -->
|
||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||
<Directory Id="ProgramFilesFolder" Name="Pfiles">
|
||||
<Directory Id="DD" Name="Digital Data">
|
||||
|
||||
<Directory Id="DD" Name="Digital Data">
|
||||
|
||||
<!-- Das Installationsverzeichnis -->
|
||||
<Directory Id="INSTALLDIR" Name="Record Organizer">
|
||||
|
||||
<Directory Id="ADDONDIR" Name="Addons">
|
||||
<Directory Id="RIGHTMANAGERDIR" Name="RightManager">
|
||||
|
||||
|
||||
<Component Id="RecordOrganizer_RightManager" Guid="BD73A9BB-89FD-4F4C-85B8-F31C97296745">
|
||||
<File Id="RecordOrganizer_RightManager.exe" Name="RecordOrganizer_RightManager.exe" Source="RecordOrganizer_RightManager.exe" />
|
||||
<File Id="DD_Rights.dll" Name="DD_Rights.dll" Source="DD_Rights.dll" />
|
||||
@ -83,18 +83,20 @@
|
||||
<File Id="DevExpress.XtraEditors.v19.2_" Name="DevExpress.XtraEditors.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraEditors.v19.2.dll" />
|
||||
<File Id="DevExpress.XtraGrid.v19.2_" Name="DevExpress.XtraGrid.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraGrid.v19.2.dll" />
|
||||
<File Id="DevExpress.XtraLayout.v19.2_" Name="DevExpress.XtraLayout.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraLayout.v19.2.dll" />
|
||||
<File Id="DevExpress.XtraPrinting.v19.2_" Name="DevExpress.XtraPrinting.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraPrinting.v19.2.dll" />
|
||||
<File Id="DevExpress.XtraPrinting.v19.2_" Name="DevExpress.XtraPrinting.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraPrinting.v19.2.dll" />
|
||||
</Component>
|
||||
|
||||
|
||||
</Directory>
|
||||
|
||||
|
||||
<!--<Directory Id="VERSIONCHECKER" Name="VERSION_CHECKER">
|
||||
|
||||
<Component Id="RecordOrganizer_VersionChecker" Guid="37D17685-E588-4BC6-A15E-570DE749852A">
|
||||
--><!--<File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe" Source="VERSION_CHECKER.exe">
|
||||
-->
|
||||
<!--<File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe" Source="VERSION_CHECKER.exe">
|
||||
<Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
|
||||
<Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
|
||||
</File>--><!--
|
||||
</File>-->
|
||||
<!--
|
||||
<File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe" Source="VERSION_CHECKER.exe" />
|
||||
|
||||
<File Id="DD_LIB_Standards.dll" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" />
|
||||
@ -102,7 +104,7 @@
|
||||
|
||||
</Directory>-->
|
||||
</Directory>
|
||||
|
||||
|
||||
<!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü -->
|
||||
<Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
|
||||
<File Id="PMOEXE" Name="DD-Record-Organizer.exe" Source="DD-Record-Organizer.exe" KeyPath="yes">
|
||||
@ -125,23 +127,23 @@
|
||||
<File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
|
||||
<File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
|
||||
</Component>
|
||||
|
||||
<!-- Oracle-Bibliothek -->
|
||||
|
||||
<!-- Oracle-Bibliothek -->
|
||||
<Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
|
||||
<File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes" />
|
||||
</Component>
|
||||
|
||||
|
||||
<!-- Commandline Bibliothek -->
|
||||
<Component Id="Commandline" Guid="53F9734C-F020-4885-96DC-D8CD880E8446">
|
||||
<File Id="Commandline" Name="Commandline.dll" Source="Commandline.dll" KeyPath="yes" />
|
||||
</Component>
|
||||
|
||||
|
||||
<!-- DD Bibliotheken -->
|
||||
<Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
|
||||
<File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="DLLLicenseManager.dll" KeyPath="no" />
|
||||
<File Id="DD_Rights" Name="DD_Rights.dll" Source="DD_Rights.dll" KeyPath="no" />
|
||||
<File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" KeyPath="no" />
|
||||
|
||||
|
||||
</Component>
|
||||
<!-- DD Bibliotheken -->
|
||||
<Component Id="BasicLibs" Guid="37238CB0-6DC3-4B1B-9438-52FA7D478897">
|
||||
@ -149,7 +151,7 @@
|
||||
<File Id="Microsoft.Office.Interop.Outlook" Name="Microsoft.Office.Interop.Outlook.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll" KeyPath="no" />
|
||||
<File Id="Microsoft.Office.Interop.Word" Name="Microsoft.Office.Interop.Word.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Word\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Word.dll" KeyPath="no" />
|
||||
</Component>
|
||||
|
||||
|
||||
<!-- MAIL.NET Bibliothek -->
|
||||
<Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
|
||||
<File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="Independentsoft.Msg.dll" KeyPath="yes" />
|
||||
@ -158,7 +160,7 @@
|
||||
<Component Id="ERPConnectLibs" Guid="9AC1DD00-6225-47DD-A142-1EB462CD5240">
|
||||
<File Id="ERPConnect45" Name="ERPConnect45.dll" Source="ERPConnect45.dll" KeyPath="yes" />
|
||||
</Component>
|
||||
|
||||
|
||||
<!-- DEVEXPRESS Bibliotheken -->
|
||||
<Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
|
||||
<File Id="DevExpress.Data.v19.2" Name="DevExpress.Data.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Data.v19.2.dll" KeyPath="yes" />
|
||||
@ -183,7 +185,7 @@
|
||||
<File Id="DevExpress.Pdf.v19.2.Drwawing" Name="DevExpress.Pdf.v19.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Pdf.v19.2.Drawing.dll" />
|
||||
<File Id="DevExpress.XtraPdfViewer.v19.2" Name="DevExpress.XtraPdfViewer.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraPdfViewer.v19.2.dll" />
|
||||
<File Id="DevExpress.Sparkline.v19.2" Name="DevExpress.Sparkline.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Sparkline.v19.2.Core.dll" />
|
||||
<!--<File Id="DevExpress.Charts.Designer.v19.2_" Name="DevExpress.Charts.Designer.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Charts.Designer.v19.2.dll" />-->
|
||||
<!--<File Id="DevExpress.Charts.Designer.v19.2_" Name="DevExpress.Charts.Designer.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Charts.Designer.v19.2.dll" />-->
|
||||
<File Id="DevExpress.Charts.v19.2.Core_" Name="DevExpress.Charts.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Charts.v19.2.Core.dll" />
|
||||
<File Id="DevExpress.XtraCharts.v19.2_" Name="DevExpress.XtraCharts.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraCharts.v19.2.dll" />
|
||||
<File Id="DevExpress.XtraCharts.v19.2.Extensions_" Name="DevExpress.XtraCharts.v19.2.Extensions.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraCharts.v19.2.Extensions.dll" />
|
||||
@ -199,7 +201,7 @@
|
||||
<Component Id="RecordOrganizer.Locales.de" Guid="C9476586-46A4-450A-88F4-BE416B7AD21C">
|
||||
<File Id="DDRecordOrganizer.resource.de" Name="DD-Record-Organizer.resources.dll" Source="de\DD-Record-Organizer.resources.dll"></File>
|
||||
</Component>
|
||||
|
||||
|
||||
<Component Id="Scheduler.Locales" Guid="84335DB2-F5D2-496B-9318-2BD1B1ACA391">
|
||||
<File Id="DevExpress.XtraScheduler.v19.2.Core.resources" Name="DevExpress.XtraScheduler.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraScheduler.v19.2.Core.resources.dll"></File>
|
||||
<File Id="DevExpress.XtraScheduler.v19.2.Extensions.resources" Name="DevExpress.XtraScheduler.v19.2.Extensions.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraScheduler.v19.2.Extensions.resources.dll"></File>
|
||||
@ -218,7 +220,7 @@
|
||||
<File Id="DevExpress.XtraRichEdit.v19.2.resources" Name="DevExpress.XtraRichEdit.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraRichEdit.v19.2.resources.dll"></File>
|
||||
<File Id="DevExpress.XtraTreeList.v19.2.resources" Name="DevExpress.XtraTreeList.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraTreeList.v19.2.resources.dll"></File>
|
||||
<File Id="DevExpress.XtraVerticalGrid.v19.2.resources" Name="DevExpress.XtraVerticalGrid.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraVerticalGrid.v19.2.resources.dll"></File>
|
||||
<File Id="DevExpress.XtraWizard.v19.2.resources" Name="DevExpress.XtraWizard.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraWizard.v19.2.resources.dll"></File>
|
||||
<File Id="DevExpress.XtraWizard.v19.2.resources" Name="DevExpress.XtraWizard.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraWizard.v19.2.resources.dll"></File>
|
||||
<File Id="DevExpress.Charts.Designer.v19.2.resources" Name="DevExpress.Charts.Designer.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Charts.Designer.v19.2.resources.dll" />
|
||||
<File Id="DevExpress.XtraCharts.v19.2.resources" Name="DevExpress.XtraCharts.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraCharts.v19.2.resources.dll" />
|
||||
</Component>
|
||||
@ -244,15 +246,15 @@
|
||||
<Directory Id="ProgramMenuDir" Name="Record Organizer">
|
||||
<Component Id="ProgramMenuDir" Guid="5200DF59-FED6-4C5A-8393-90B8ED526432">
|
||||
<RemoveFolder Id="ProgramMenuDir" On="uninstall" />
|
||||
|
||||
|
||||
<RegistryKey Root="HKCU" Key="Software">
|
||||
|
||||
|
||||
<RegistryKey Key="[Manufacturer]">
|
||||
<RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
|
||||
<RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
|
||||
</RegistryKey>
|
||||
</RegistryKey>
|
||||
|
||||
|
||||
<RegistryKey Key="Classes">
|
||||
<RegistryKey Key="pmo" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYCUSTOMURLHANDLER">
|
||||
<RegistryValue Type="string" Name="URL Protocol" Value="" />
|
||||
@ -260,13 +262,13 @@
|
||||
<RegistryValue Key="shell\open\command" Type="string" Value=""[INSTALLDIR]DD-Record-Organizer.exe" --data %1" />
|
||||
</RegistryKey>
|
||||
</RegistryKey>
|
||||
|
||||
|
||||
</RegistryKey>
|
||||
|
||||
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
||||
|
||||
<!-- Desktop Ordner -->
|
||||
<Directory Id="DesktopFolder" Name="Desktop" />
|
||||
</Directory>
|
||||
@ -293,10 +295,10 @@
|
||||
<ComponentRef Id="RecordOrganizer_RightManager"/>
|
||||
<!--<ComponentRef Id="RecordOrganizer_VersionChecker" />-->
|
||||
</Feature>
|
||||
|
||||
|
||||
<!-- Legt das Standard-Installationsverzeichnis fest-->
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
|
||||
|
||||
|
||||
<!-- OBERFLÄCHE -->
|
||||
<UI>
|
||||
<UIRef Id="WixUI_InstallDir" />
|
||||
@ -1,28 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
<ProductVersion>3.8</ProductVersion>
|
||||
<ProjectGuid>{9e8b6445-8ca8-4b8a-8a04-4437a9970b7b}</ProjectGuid>
|
||||
<ProductVersion>3.10</ProductVersion>
|
||||
<ProjectGuid>a7f7585a-c46a-4436-9f6e-17629325ce58</ProjectGuid>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<OutputName>RecordOrganizerSetup</OutputName>
|
||||
<OutputName>Setup_NoUpdaterVS19</OutputName>
|
||||
<OutputType>Package</OutputType>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<IncludeSearchPaths>
|
||||
</IncludeSearchPaths>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<OutputPath>bin\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
<DefineConstants>Debug</DefineConstants>
|
||||
<LinkerAdditionalOptions>-b "$(SolutionDir)DD-Record-Organizer\bin\$(Configuration)"
|
||||
-b "$(SolutionDir)RecordOrganizer_RightManager\bin\$(Configuration)"
|
||||
-b "$(SolutionDir)VERSION_CHECKER\bin\$(Configuration)"
|
||||
-cultures:de-DE,en-US</LinkerAdditionalOptions>
|
||||
<CompilerAdditionalOptions>
|
||||
</CompilerAdditionalOptions>
|
||||
<LinkerAdditionalOptions>
|
||||
-b "$(SolutionDir)DD-Record-Organizer\bin\$(Configuration)"
|
||||
-b "$(SolutionDir)RecordOrganizer_RightManager\bin\$(Configuration)"
|
||||
-b "$(SolutionDir)VERSION_CHECKER\bin\$(Configuration)"
|
||||
-cultures:de-DE,en-US
|
||||
</LinkerAdditionalOptions>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
||||
<OutputPath>bin\$(Configuration)\</OutputPath>
|
||||
@ -41,20 +37,10 @@
|
||||
<Name>WixUIExtension</Name>
|
||||
</WixExtension>
|
||||
</ItemGroup>
|
||||
<Import Project="$(WixTargetsPath)" />
|
||||
<!--
|
||||
To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Wix.targets.
|
||||
-->
|
||||
<Target Name="BeforeBuild">
|
||||
<!-- Get the programs assembly version from the .exe file -->
|
||||
<GetAssemblyIdentity AssemblyFiles="..\DD-Record-Organizer\bin\$(Configuration)\DD-Record-Organizer.exe">
|
||||
<Output TaskParameter="Assemblies" ItemName="AsmInfo" />
|
||||
</GetAssemblyIdentity>
|
||||
<!-- Store the assembly version number in ProductVersion preprocessor variable -->
|
||||
<CreateProperty Value="$(DefineConstants);ProductVersion=%(AsmInfo.Version)">
|
||||
<Output TaskParameter="Value" PropertyName="DefineConstants" />
|
||||
</CreateProperty>
|
||||
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
|
||||
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
|
||||
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
|
||||
</Target>
|
||||
<Target Name="BeforeBuild">
|
||||
<!-- Get the programs assembly version from the .exe file -->
|
||||
@ -75,6 +61,10 @@
|
||||
</CreateProperty>
|
||||
</Target>
|
||||
<!--
|
||||
To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Wix.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
Loading…
x
Reference in New Issue
Block a user