AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager_Client

Browse Source
This commit is contained in:
SchreiberM 2020-04-21 12:27:51 +02:00
commit 335c1fa655
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
View File

@ -139,7 +139,8 @@
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DigitalData.Controls.DocumentViewer">
<Reference Include="DigitalData.Controls.DocumentViewer, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Controls.LookupGrid, Version=0.0.1.0, Culture=neutral, processorArchitecture=MSIL">
@ -162,21 +163,20 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\Independentsoft.Msg.dll</HintPath>
</Reference>
<Reference Include="Interop.WINDREAMLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<Reference Include="Interop.WINDREAMLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
<HintPath>..\..\..\..\Interop.WINDREAMLib.dll</HintPath>
</Reference>
<Reference Include="Interop.WMOBRWSLib">
<HintPath>..\..\..\..\Interop.WMOBRWSLib.dll</HintPath>
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Interop.WMOSRCHLib">
<HintPath>..\..\..\..\Interop.WMOSRCHLib.dll</HintPath>
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Interop.WMOTOOLLib">
<HintPath>..\..\..\..\Interop.WMOTOOLLib.dll</HintPath>
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.CSharp" />

2
app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb
View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.1.4.1")>
<Assembly: AssemblyVersion("2.1.4.2")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

24
app/SetupVS19/Product.wxs
View File

@ -86,6 +86,7 @@
<Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B" KeyPath="yes">
<File Id="MainApplicationExe" Source="..\DD_PM_WINDREAM\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
<File Id="MainApplicationExeConfig" Source="..\DD_PM_WINDREAM\bin\$(var.Configuration)\$(var.ProgramName).exe.config" Name="$(var.ProgramName).exe.config" KeyPath="no" Checksum="yes" />
<!--
<Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="no" Target="[#MainApplicationExe]" />
<Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="no" Target="[#MainApplicationExe]" />
@ -109,7 +110,7 @@
</Component>
<Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
<File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll" KeyPath="yes"/>
<File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll" KeyPath="yes"/>
</Component>
<Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
@ -119,6 +120,7 @@
<File Id="DDConfig" Name="DigitalData.Modules.Config.dll" Source="DigitalData.Modules.Config.dll"/>
<File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll"/>
<File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll" Source="DigitalData.Modules.Filesystem.dll"/>
<File Id="DDDocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" Source="DigitalData.Controls.DocumentViewer.dll"/>
<File Id="NLog" Name="NLog.dll" Source="NLog.dll"/>
</Component>
@ -140,14 +142,18 @@
<Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
<File Id="DevExpress.Images.v19.2" Name="DevExpress.Images.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Images.v19.2.dll" KeyPath="yes"/>
<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"/>
<File Id="DevExpress.DataAccess.v19.2" Name="DevExpress.DataAccess.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.DataAccess.v19.2.dll"/>
<File Id="DevExpress.DataAccess.v19.2.UI" Name="DevExpress.DataAccess.v19.2.UI.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.DataAccess.v19.2.UI.dll"/>
<File Id="DevExpress.Pdf.v19.2.Core" Name="DevExpress.Pdf.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Pdf.v19.2.Core.dll"/>
<File Id="DevExpress.Pdf.v19.2.Drawing" 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.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.Printing.v19.2.Core" Name="DevExpress.Printing.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Printing.v19.2.Core.dll"/>
<File Id="DevExpress.Utils.v19.2" Name="DevExpress.Utils.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Utils.v19.2.dll"/>
<File Id="DevExpress.Utils.v19.2.UI" Name="DevExpress.Utils.v19.2.UI.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Utils.v19.2.UI.dll"/>
<File Id="DevExpress.XtraBars.v19.2" Name="DevExpress.XtraBars.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraBars.v19.2.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.Wizard" Name="DevExpress.XtraCharts.v19.2.Wizard.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraCharts.v19.2.Wizard.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"/>
<File Id="DevExpress.XtraCharts.v19.2.UI" Name="DevExpress.XtraCharts.v19.2.UI.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraCharts.v19.2.UI.dll"/>
<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"/>
@ -156,6 +162,22 @@
<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.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.XtraTreeList.v19.2" Name="DevExpress.XtraTreeList.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraTreeList.v19.2.dll"/>
<File Id="DevExpress.CodeParser.v19.2" Name="DevExpress.CodeParser.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.CodeParser.v19.2.dll"/>
<File Id="DevExpress.Diagram.v19.2.Core" Name="DevExpress.Diagram.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Diagram.v19.2.Core.dll"/>
<File Id="DevExpress.Office.v19.2.Core" Name="DevExpress.Office.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Office.v19.2.Core.dll"/>
<File Id="DevExpress.PivotGrid.v19.2.Core" Name="DevExpress.PivotGrid.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.PivotGrid.v19.2.Core.dll"/>
<File Id="DevExpress.RichEdit.v19.2.Core" Name="DevExpress.RichEdit.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.RichEdit.v19.2.Core.dll"/>
<File Id="DevExpress.RichEdit.v19.2.Export" Name="DevExpress.RichEdit.v19.2.Export.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.RichEdit.v19.2.Export.dll"/>
<File Id="DevExpress.XtraRichEdit.v19.2" Name="DevExpress.XtraRichEdit.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraRichEdit.v19.2.dll"/>
<File Id="DevExpress.XtraSpreadsheet.v19.2" Name="DevExpress.XtraSpreadsheet.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraSpreadsheet.v19.2.dll"/>
<File Id="DevExpress.Sparkline.v19.2.Core" 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.Xpf.PdfViewer.v19.2" Name="DevExpress.Xpf.PdfViewer.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Xpf.PdfViewer.v19.2.dll"/>
<File Id="DevExpress.Xpo.v19.2" Name="DevExpress.Xpo.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.Xpo.v19.2.dll"/>
<File Id="DevExpress.XtraGauges.v19.2.Core" Name="DevExpress.XtraGauges.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraGauges.v19.2.Core.dll"/>
<File Id="DevExpress.XtraReports.v19.2" Name="DevExpress.XtraReports.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraReports.v19.2.dll"/>
<File Id="DevExpress.XtraReports.v19.2.Extensions" Name="DevExpress.XtraReports.v19.2.Extensions.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraReports.v19.2.Extensions.dll"/>
<File Id="DevExpress.XtraVerticalGrid.v19.2" Name="DevExpress.XtraVerticalGrid.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraVerticalGrid.v19.2.dll"/>
<File Id="DevExpress.XtraDiagram.v19.2" Name="DevExpress.XtraDiagram.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\DevExpress.XtraDiagram.v19.2.dll"/>
</Component>
<Component Id="RegistryKeys" Guid="4503BF18-22F2-4DBF-B281-06DE039F52C8">