From 0423d460494a4f6fbd212b214ee8d9e9ffa7ded9 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 10 Apr 2018 15:00:05 +0200
Subject: [PATCH] jj: change reference to Lib_Standards

---
 app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj |  2 +-
 app/Setup/Product.wxs                    | 23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
index e23fb6e..2f9462f 100644
--- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
+++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
@@ -58,7 +58,7 @@
   <ItemGroup>
     <Reference Include="DD_LIB_Standards, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDLibStandards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll</HintPath>
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Charts.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Data.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
diff --git a/app/Setup/Product.wxs b/app/Setup/Product.wxs
index 03d2635..87cebc2 100644
--- a/app/Setup/Product.wxs
+++ b/app/Setup/Product.wxs
@@ -51,10 +51,20 @@
 
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B">
-        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes">
+        <!--<File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes">
           <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
           <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
-        </File>
+        </File>-->
+        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes" />      
+        
+      </Component>
+
+      <Component Id="DesktopShortcut" Guid="a9051d3a-4a83-4597-a616-33977c67e9e8" KeyPath="yes">
+        <Shortcut Id="DesktopShortcut"
+                   Name="$(var.ProductName)"
+                   Target="[#MainApplicationExe]"
+                   WorkingDirectory="INSTALLDIR"
+                  />
       </Component>
 
       <Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
@@ -77,6 +87,7 @@
 
       <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
         <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="yes"/>
+        <File Id="DDLibStandards" Name="DD_LIB_Standards.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll" />
       </Component>
 
       <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
@@ -88,12 +99,17 @@
       </Component>
       
       <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"/>
+        <File Id="DevExpress.Images.v15.2" Name="DevExpress.Images.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Images.v15.2.dll" KeyPath="yes"/>
+        <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"/>
         <File Id="DevExpress.Pdf.v15.2.Core" Name="DevExpress.Pdf.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll"/>
         <File Id="DevExpress.Pdf.v15.2.Drawing" Name="DevExpress.Pdf.v15.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.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.Printing.v15.2.Core" Name="DevExpress.Printing.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll"/>
         <File Id="DevExpress.Utils.v15.2" Name="DevExpress.Utils.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll"/>
         <File Id="DevExpress.XtraBars.v15.2" Name="DevExpress.XtraBars.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.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.Wizard" Name="DevExpress.XtraCharts.v15.2.Wizard.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.Wizard.dll"/>
+        <File Id="DevExpress.XtraCharts.v15.2.UI" Name="DevExpress.XtraCharts.v15.2.UI.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.UI.dll"/>
         <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"/>
@@ -140,6 +156,7 @@
       <ComponentRef Id="IndependentsoftLibs" />
       <ComponentRef Id="DevExpressLibs" />
       <ComponentRef Id="ProgramMenuDir" />
+      <ComponentRef Id="DesktopShortcut" />
     </Feature>
 
     <!-- Legt das Standard-Installationsverzeichnis fest-->