Version 1.2.7.5

Rename Shared to Common
Add Setup Project
2022-04-06 16:29:59 +02:00 · 2022-04-06 14:55:15 +02:00 · 2022-04-06 14:54:57 +02:00
72 changed files with 540 additions and 154 deletions
--- a/MultiTool.Common/BaseClass.vb
+++ b/MultiTool.Common/BaseClass.vb
--- a/MultiTool.Common/Config.vb
+++ b/MultiTool.Common/Config.vb
--- a/MultiTool.Common/Constants.vb
+++ b/MultiTool.Common/Constants.vb
--- a/MultiTool.Common/Documents/Document.vb
+++ b/MultiTool.Common/Documents/Document.vb
@@ -1,6 +1,6 @@
 Imports System.IO
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Winline.Entities
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline.Entities

 Namespace Documents
    Public Class Document
--- a/MultiTool.Common/Documents/DocumentCleaner.vb
+++ b/MultiTool.Common/Documents/DocumentCleaner.vb
@@ -1,6 +1,6 @@
 Imports System.IO
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Templates
+Imports MultiTool.Common.Templates

 Namespace Documents
    Public Class DocumentCleaner
--- a/MultiTool.Common/Documents/DocumentLoader.vb
+++ b/MultiTool.Common/Documents/DocumentLoader.vb
@@ -2,10 +2,10 @@
 Imports System.Text.RegularExpressions
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language
-Imports MultiTool.Shared.Exceptions
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Winline
-Imports MultiTool.Shared.Winline.Entities
+Imports MultiTool.Common.Exceptions
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline
+Imports MultiTool.Common.Winline.Entities

 Namespace Documents
    Public Class DocumentLoader
--- a/MultiTool.Common/Documents/DocumentRow.vb
+++ b/MultiTool.Common/Documents/DocumentRow.vb
--- a/MultiTool.Common/Documents/DocumentType.vb
+++ b/MultiTool.Common/Documents/DocumentType.vb
--- a/MultiTool.Common/Exceptions.vb
+++ b/MultiTool.Common/Exceptions.vb
--- a/MultiTool.Common/IDictionaryEx.vb
+++ b/MultiTool.Common/IDictionaryEx.vb
--- a/MultiTool.Common/IEnumerableEx.vb
+++ b/MultiTool.Common/IEnumerableEx.vb
--- a/MultiTool.Common/ImporterShared.vbproj.bak
+++ b/MultiTool.Common/ImporterShared.vbproj.bak
--- a/MultiTool.Common/Mapper.vb
+++ b/MultiTool.Common/Mapper.vb
@@ -3,7 +3,7 @@ Imports System.Text.RegularExpressions
 Imports AutoMapper
 Imports AutoMapper.Configuration
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Documents.DocumentRow
+Imports MultiTool.Common.Documents.DocumentRow

 Public Class Mapper
    Private MapperConfig As MapperConfiguration
--- a/MultiTool.Common/MultiTool.Common.vbproj
+++ b/MultiTool.Common/MultiTool.Common.vbproj
@@ -6,8 +6,8 @@
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProjectGuid>{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}</ProjectGuid>
    <OutputType>Library</OutputType>
-    <RootNamespace>MultiTool.Shared</RootNamespace>
-    <AssemblyName>MultiTool.Shared</AssemblyName>
+    <RootNamespace>MultiTool.Common</RootNamespace>
+    <AssemblyName>MultiTool.Common</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
@@ -19,7 +19,7 @@
    <DefineDebug>true</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
+    <DocumentationFile>MultiTool.Common.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -28,7 +28,7 @@
    <DefineTrace>true</DefineTrace>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
+    <DocumentationFile>MultiTool.Common.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
@@ -65,8 +65,9 @@
    <Reference Include="DigitalData.Modules.Interfaces">
      <HintPath>..\..\DDMonorepo\Modules.Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Language">
-      <HintPath>..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Language, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDMonorepo\Modules.Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging">
      <HintPath>..\..\DDMonorepo\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll</HintPath>
@@ -103,7 +104,6 @@
    <Compile Include="BaseClass.vb" />
    <Compile Include="Config.vb" />
    <Compile Include="Constants.vb" />
-    <Compile Include="DataRowEx.vb" />
    <Compile Include="Documents\Document.vb" />
    <Compile Include="Documents\DocumentCleaner.vb" />
    <Compile Include="Documents\DocumentRow.vb" />
--- a/MultiTool.Common/MultiTool.Shared.vbproj.bak
+++ b/MultiTool.Common/MultiTool.Shared.vbproj.bak
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
--- a/Project/Application.myapp
+++ b/Project/Application.myapp
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices

 ' Werte der Assemblyattribute überprüfen

-<Assembly: AssemblyTitle("MultiTool.Shared")>
+<Assembly: AssemblyTitle("MultiTool.Common")>
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("MultiTool.Shared")>
+<Assembly: AssemblyProduct("MultiTool.Common")>
 <Assembly: AssemblyCopyright("Copyright © 2022")>
 <Assembly: AssemblyTrademark("")>

--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -39,7 +39,7 @@ Namespace My.Resources
        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
            Get
                If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Shared.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Common.Resources", GetType(Resources).Assembly)
                    resourceMan = temp
                End If
                Return resourceMan
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -64,9 +64,9 @@ Namespace My
    Friend Module MySettingsProperty
        
        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.MultiTool.[Shared].My.MySettings
+        Friend ReadOnly Property Settings() As Global.MultiTool.Common.My.MySettings
            Get
-                Return Global.MultiTool.[Shared].My.MySettings.Default
+                Return Global.MultiTool.Common.My.MySettings.Default
            End Get
        End Property
    End Module
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
--- a/MultiTool.Common/Patterns.vb
+++ b/MultiTool.Common/Patterns.vb
@@ -1,8 +1,8 @@
 Imports System.Text.RegularExpressions
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Documents
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Winline.Entities
+Imports MultiTool.Common.Documents
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline.Entities

 Public Class Patterns
    Inherits BaseClass
--- a/MultiTool.Common/Report/ReportGenerator.vb
+++ b/MultiTool.Common/Report/ReportGenerator.vb
@@ -2,11 +2,11 @@
 Imports DevExpress.XtraReports
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Documents
-Imports MultiTool.Shared.Documents.DocumentRow
-Imports MultiTool.Shared.Report
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Winline.Entities
+Imports MultiTool.Common.Documents
+Imports MultiTool.Common.Documents.DocumentRow
+Imports MultiTool.Common.Report
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline.Entities

 Public Class ReportGenerator(Of TReport As IReport)
    Inherits BaseClass
--- a/MultiTool.Common/Report/ReportHead.vb
+++ b/MultiTool.Common/Report/ReportHead.vb
--- a/MultiTool.Common/Report/ReportPosition.vb
+++ b/MultiTool.Common/Report/ReportPosition.vb
--- a/MultiTool.Common/Report/ReportSource.vb
+++ b/MultiTool.Common/Report/ReportSource.vb
--- a/MultiTool.Common/Serializer.vb
+++ b/MultiTool.Common/Serializer.vb
--- a/MultiTool.Common/Templates/GeneralConfig.vb
+++ b/MultiTool.Common/Templates/GeneralConfig.vb
--- a/MultiTool.Common/Templates/MandatorConfig.vb
+++ b/MultiTool.Common/Templates/MandatorConfig.vb
--- a/MultiTool.Common/Templates/MandatorConfigItem.vb
+++ b/MultiTool.Common/Templates/MandatorConfigItem.vb
--- a/MultiTool.Common/Templates/MappingConfig.vb
+++ b/MultiTool.Common/Templates/MappingConfig.vb
--- a/MultiTool.Common/Templates/MappingConfigItem.vb
+++ b/MultiTool.Common/Templates/MappingConfigItem.vb
--- a/MultiTool.Common/Templates/Template.vb
+++ b/MultiTool.Common/Templates/Template.vb
--- a/MultiTool.Common/Templates/TemplateConfig.vb
+++ b/MultiTool.Common/Templates/TemplateConfig.vb
@@ -1,5 +1,5 @@

-Imports MultiTool.Shared.Winline
+Imports MultiTool.Common.Winline

 Namespace Templates
    ''' <summary>
--- a/MultiTool.Common/Templates/TemplateConfigItem.vb
+++ b/MultiTool.Common/Templates/TemplateConfigItem.vb
@@ -1,4 +1,4 @@
-Imports MultiTool.Shared.Constants
+Imports MultiTool.Common.Constants
 Imports DigitalData.Modules.Language

 Namespace Templates
--- a/MultiTool.Common/Templates/TemplateLoader.vb
+++ b/MultiTool.Common/Templates/TemplateLoader.vb
@@ -1,6 +1,7 @@
 Imports System.IO
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Language

 Namespace Templates
    Public Class TemplateLoader
@@ -14,17 +15,14 @@ Namespace Templates
        Public Property MandatorConfiguration As New MandatorConfig
        Public Property GeneralConfiguration As New GeneralConfig

-        Private ReadOnly Database As MSSQLServer
-
        Private Const SQL_VWMT_ITEMS = "SELECT * FROM [DD_ECM].[dbo].[VWMT_ITEMS]"
        Private Const SQL_VWMT_MAPPING = "SELECT * FROM [DD_ECM].[dbo].[VWMT_MAPPING]"
        Private Const SQL_TBMT_MANDATORS = "SELECT * FROM [DD_ECM].[dbo].[TBMT_MANDATORS] ORDER BY ORDER_KEY"
        Private Const SQL_TBMT_CONFIG = "SELECT * FROM [DD_ECM].[dbo].[TBMT_CONFIG]"
-        Private Const SQL_TBMT_TEMPLATES = "SELECT * FROM [DD_ECM].[dbo].[TBMT_TEMPLATES]"
+        Private Const SQL_TBMT_TEMPLATES = "SELECT * FROM [DD_ECM].[dbo].[TBMT_TEMPLATES] WHERE ACTIVE = 1"

        Public Sub New(pLogConfig As LogConfig, pMSSQL As MSSQLServer)
-            MyBase.New(pLogConfig)
-            Database = pMSSQL
+            MyBase.New(pLogConfig, pMSSQL)
        End Sub

        Public Async Function LoadTemplates() As Task(Of Boolean)
--- a/MultiTool.Common/Winline/Entities/Account.vb
+++ b/MultiTool.Common/Winline/Entities/Account.vb
--- a/MultiTool.Common/Winline/Entities/Article.vb
+++ b/MultiTool.Common/Winline/Entities/Article.vb
--- a/MultiTool.Common/Winline/Entities/Contact.vb
+++ b/MultiTool.Common/Winline/Entities/Contact.vb
--- a/MultiTool.Common/Winline/Entities/DocumentKind.vb
+++ b/MultiTool.Common/Winline/Entities/DocumentKind.vb
--- a/MultiTool.Common/Winline/Entities/ExportDocument.vb
+++ b/MultiTool.Common/Winline/Entities/ExportDocument.vb
--- a/MultiTool.Common/Winline/Entities/Mandator.vb
+++ b/MultiTool.Common/Winline/Entities/Mandator.vb
--- a/MultiTool.Common/Winline/Entities/Response.vb
+++ b/MultiTool.Common/Winline/Entities/Response.vb
--- a/MultiTool.Common/Winline/WebServiceData.vb
+++ b/MultiTool.Common/Winline/WebServiceData.vb
@@ -4,11 +4,11 @@ Imports System.Xml
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Filesystem
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Documents
-Imports MultiTool.Shared.Exceptions
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Templates.GeneralConfig
-Imports MultiTool.Shared.Winline.Entities
+Imports MultiTool.Common.Documents
+Imports MultiTool.Common.Exceptions
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Templates.GeneralConfig
+Imports MultiTool.Common.Winline.Entities

 Namespace Winline
    Public Class WebServiceData
--- a/MultiTool.Common/Winline/WinlineData.vb
+++ b/MultiTool.Common/Winline/WinlineData.vb
@@ -1,9 +1,9 @@
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Database
-Imports MultiTool.Shared.Winline.Entities
+Imports MultiTool.Common.Winline.Entities
 Imports System.Text.RegularExpressions
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Constants
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Constants
 Imports DigitalData.Modules.Language

 Namespace Winline
--- a/MultiTool.Common/XmlData.vb
+++ b/MultiTool.Common/XmlData.vb
--- a/MultiTool.Common/packages.config
+++ b/MultiTool.Common/packages.config
--- a/MultiTool.Form/FormHelpers.vb
+++ b/MultiTool.Form/FormHelpers.vb
@@ -1,5 +1,5 @@
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Exceptions
+Imports MultiTool.Common.Exceptions

 Public Class FormHelper
    Private ReadOnly Logger As Logger
--- a/MultiTool.Form/GridLoader.vb
+++ b/MultiTool.Form/GridLoader.vb
@@ -2,8 +2,8 @@
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared
-Imports MultiTool.Shared.Constants
+Imports MultiTool.Common
+Imports MultiTool.Common.Constants

 Public Class GridLoader
    Inherits BaseClass
--- a/MultiTool.Form/MultiTool.Form.vbproj
+++ b/MultiTool.Form/MultiTool.Form.vbproj
@@ -115,9 +115,9 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Language, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Language, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll</HintPath>
+      <HintPath>..\..\DDMonorepo\Modules.Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging">
      <HintPath>..\..\DDMonorepo\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll</HintPath>
@@ -338,6 +338,9 @@
  <ItemGroup>
    <Content Include="CREATE_DATABASE.sql" />
    <Content Include="MultiTool.ico" />
+    <None Include="Resources\refreshpivottable.svg" />
+    <None Include="Resources\update.svg" />
+    <None Include="Resources\actions_reload1.svg" />
    <None Include="Resources\logical3.svg" />
    <None Include="Resources\logical2.svg" />
    <None Include="Resources\bo_sale.svg" />
@@ -412,11 +415,10 @@
    <None Include="Resources\import.svg" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\MultiTool.Shared\MultiTool.Shared.vbproj">
+    <ProjectReference Include="..\MultiTool.Common\MultiTool.Common.vbproj">
      <Project>{dd1ac3b9-7595-4d3c-b9bb-97c46a480fa0}</Project>
-      <Name>MultiTool.Shared</Name>
+      <Name>MultiTool.Common</Name>
    </ProjectReference>
  </ItemGroup>
-  <ItemGroup />
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("WebService Multitool")>
 <Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("1.2.7.4")>
+<Assembly: AssemblyTrademark("1.2.7.5")>

 <Assembly: ComVisible(False)>

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("1.2.7.4")>
+<Assembly: AssemblyVersion("1.2.7.5")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -160,6 +160,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_reload1() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_reload1", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
        '''</summary>
@@ -610,6 +620,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property refreshpivottable() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("refreshpivottable", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
        '''</summary>
@@ -740,6 +760,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property update() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("update", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -124,14 +124,17 @@
  <data name="actions_send" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="bo_country" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="mailmergepreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="open24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\open24.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="bo_country" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="deletetablerows" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="parameters" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -157,6 +160,9 @@
  <data name="resetview" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\resetview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="update" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\update.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="open26" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open26.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -187,12 +193,12 @@
  <data name="bo_unknown2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bo_unknown2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="deletetablerows" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="open3" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="bo_sale" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_sale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="actions_checkcircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_checkcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -202,9 +208,6 @@
  <data name="wraptext" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wraptext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="logical2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\logical2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="tableproperties" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\tableproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -217,9 +220,6 @@
  <data name="actions_send1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_send1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="actions_send4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_send4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="actions_send2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -235,8 +235,11 @@
  <data name="open23" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open23.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="insertpagecount" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_reload1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_reload1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="mailmergepreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -244,8 +247,8 @@
  <data name="pagesetup" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="open24" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open24.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="logical3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logical3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="bo_validation" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -265,6 +268,9 @@
  <data name="paymentrefund" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="squarified" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="support" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\support.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -280,8 +286,8 @@
  <data name="preview" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\preview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="bo_sale" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_sale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="insertpagecount" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="exporttopdf" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\exporttopdf.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -307,22 +313,25 @@
  <data name="actions_addcircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_addcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="squarified" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_send4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_send4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="open27" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open27.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="logical2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logical2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="export" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="open27" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\open27.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="new" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\new.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="actions_checkcircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_checkcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="logical3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\logical3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="refreshpivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\refreshpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/MultiTool.Form/MyApplication.vb
+++ b/MultiTool.Form/MyApplication.vb
@@ -1,6 +1,6 @@
-Imports MultiTool.Shared
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Winline
+Imports MultiTool.Common
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline

 Namespace My
    <HideModuleName()>
--- a/MultiTool.Form/Reports/OrderReport.Designer.vb
+++ b/MultiTool.Form/Reports/OrderReport.Designer.vb
@@ -690,7 +690,7 @@ Partial Public Class OrderReport
        '
        'ObjectDataSource1
        '
-        Me.ObjectDataSource1.DataSource = GetType(MultiTool.[Shared].Report.ReportSource)
+        Me.ObjectDataSource1.DataSource = GetType(MultiTool.Common.Report.ReportSource)
        Me.ObjectDataSource1.Name = "ObjectDataSource1"
        '
        'GroupFooter1
--- a/MultiTool.Form/Resources/actions_reload1.svg
+++ b/MultiTool.Form/Resources/actions_reload1.svg
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="Reload_1_">
+    <path d="M16,4c3.3,0,6.3,1.3,8.5,3.5L28,4v10h-0.2h-4.1H18l3.6-3.6C20.2,8.9,18.2,8,16,8c-4.4,0-8,3.6-8,8s3.6,8,8,8   c3.7,0,6.8-2.6,7.7-6h4.1c-1,5.7-5.9,10-11.8,10C9.4,28,4,22.6,4,16C4,9.4,9.4,4,16,4z" class="Green" />
+  </g>
+</svg>
--- a/MultiTool.Form/Resources/refreshpivottable.svg
+++ b/MultiTool.Form/Resources/refreshpivottable.svg
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Refresh" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.st0{opacity:0.5;}
+</style>
+  <g class="st0">
+    <path d="M10,10H6V6h4V10z M24,6H12v4h12V6z M10,12H6v12h4V12z" class="Blue" />
+  </g>
+  <path d="M30,16v6h-0.1h-2H24l2.5-2.5C25.6,18.6,24.4,18,23,18c-2.4,0-4.4,1.7-4.9,4h-2c0.5-3.4,3.4-6,6.9-6  c1.9,0,3.7,0.8,4.9,2.1L30,16z M23,28c-1.4,0-2.6-0.6-3.5-1.5L22,24h-3.9h-2H16v6l2.1-2.1c1.3,1.3,3,2.1,4.9,2.1  c3.5,0,6.4-2.6,6.9-6h-2C27.4,26.3,25.4,28,23,28z" class="Green" />
+  <path d="M27,2H3C2.4,2,2,2.4,2,3v24c0,0.6,0.4,1,1,1h11v-2H4V4h22v10.5c0.7,0.3,1.4,0.6,2,1V3C28,2.4,27.6,2,27,2z" class="Black" />
+</svg>
--- a/MultiTool.Form/Resources/update.svg
+++ b/MultiTool.Form/Resources/update.svg
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+	.White{fill:#FFFFFF;}
+	.Green{fill:#039C23;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+	.st2{opacity:0.25;}
+	.st3{fill:#FFB115;}
+</style>
+  <g />
+  <g id="Update">
+    <g class="st1">
+      <path d="M16,6h-6V2h6V6z M16,8h-6v4h6V8z M24,2h-6v4h6V2z M24,12V8h-6v4H24z M2,6h6V2H2V6z M2,18h6v-4H2V18z M16,14    L16,14l-6,0v4h2.8C13.5,16.4,14.6,15,16,14z M2,12h6V8H2V12z" class="Black" />
+    </g>
+    <path d="M27.7,20h2H30v-6l-2.3,2.3C26.2,14.9,24.2,14,22,14c-4.4,0-8,3.6-8,8c0,4.4,3.6,8,8,8s8-3.6,8-8h-2   c0,3.3-2.7,6-6,6s-6-2.7-6-6s2.7-6,6-6c1.7,0,3.2,0.7,4.2,1.8L24,20H27.7z" class="Green" />
+  </g>
+</svg>
--- a/MultiTool.Form/frmConfig.vb
+++ b/MultiTool.Form/frmConfig.vb
@@ -4,25 +4,24 @@ Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared
-Imports MultiTool.Shared.Constants
+Imports DigitalData.Modules.Language

 Public Class frmConfig
-    Private ReadOnly ConfigManager As ConfigManager(Of MultiTool.Shared.Config)
+    Private ReadOnly TBMT_CONFIG_GENERAL As New DS_DD_ECM.TBMT_CONFIGDataTable
+    Private ReadOnly ConfigManager As ConfigManager(Of MultiTool.Common.Config)
    Private ReadOnly FormHelper As FormHelper

    Private BindingSource As BindingSource = TBEDIXMLITEMSBindingSource
    Private View As GridView = GridViewSchema

-    Private TBMT_CONFIG_GENERAL As New DS_DD_ECM.TBMT_CONFIGDataTable

-    Private ReadOnly Property Config As MultiTool.Shared.Config
+    Private ReadOnly Property Config As MultiTool.Common.Config
        Get
            Return ConfigManager?.Config
        End Get
    End Property

-    Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of MultiTool.Shared.Config))
+    Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of MultiTool.Common.Config))
        ' Dieser Aufruf ist für den Designer erforderlich.
        InitializeComponent()

--- a/MultiTool.Form/frmExportMain.vb
+++ b/MultiTool.Form/frmExportMain.vb
@@ -5,15 +5,14 @@ Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language
-Imports MultiTool.Shared
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Exceptions
-Imports MultiTool.Shared.Winline
-Imports MultiTool.Shared.Winline.Entities
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Exceptions
+Imports MultiTool.Common.Winline
+Imports MultiTool.Common.Winline.Entities

 Public Class frmExportMain
    Private ReadOnly LogConfig As LogConfig
-    Private ReadOnly ConfigManager As ConfigManager(Of Config)
+    Private ReadOnly ConfigManager As ConfigManager(Of Common.Config)
    Private ReadOnly CurrentTemplate As Template = Nothing

    Private Logger As Logger
@@ -24,7 +23,7 @@ Public Class frmExportMain
    Private GridBuilder As GridBuilder
    Private FileEx As DigitalData.Modules.Filesystem.File

-    Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Config), pTemplate As Template)
+    Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Common.Config), pTemplate As Template)
        ' Dieser Aufruf ist für den Designer erforderlich.
        InitializeComponent()

--- a/MultiTool.Form/frmImportMain.Designer.vb
+++ b/MultiTool.Form/frmImportMain.Designer.vb
@@ -370,6 +370,7 @@ Partial Class frmImportMain
        'btnEditRow
        '
        resources.ApplyResources(Me.btnEditRow, "btnEditRow")
+        Me.btnEditRow.Enabled = False
        Me.btnEditRow.Id = 35
        Me.btnEditRow.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.editquery
        Me.btnEditRow.Name = "btnEditRow"
@@ -411,6 +412,7 @@ Partial Class frmImportMain
        'RibbonPageGroupTransfer
        '
        Me.RibbonPageGroupTransfer.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
+        Me.RibbonPageGroupTransfer.Enabled = False
        Me.RibbonPageGroupTransfer.ItemLinks.Add(Me.btnTransferFile)
        Me.RibbonPageGroupTransfer.ItemLinks.Add(Me.btnTransferAllFiles)
        Me.RibbonPageGroupTransfer.ItemLinks.Add(Me.btnTestTransferFile)
--- a/MultiTool.Form/frmImportMain.vb
+++ b/MultiTool.Form/frmImportMain.vb
@@ -7,14 +7,14 @@ Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared
-Imports MultiTool.Shared.Documents
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Winline
-Imports MultiTool.Shared.Winline.Entities
-Imports MultiTool.Shared.Constants
-Imports MultiTool.Shared.Exceptions
-Imports MultiTool.Shared.Documents.Document
+Imports MultiTool.Common
+Imports MultiTool.Common.Documents
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline
+Imports MultiTool.Common.Winline.Entities
+Imports MultiTool.Common.Constants
+Imports MultiTool.Common.Exceptions
+Imports MultiTool.Common.Documents.Document

 Public Class frmImportMain
    Public LogConfig As LogConfig
--- a/MultiTool.Form/frmMain.Designer.vb
+++ b/MultiTool.Form/frmMain.Designer.vb
@@ -23,13 +23,14 @@ Partial Class frmMain
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
        Me.btnOpenImportExportForm = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnReloadTemplates = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
        Me.txtVersion = New DevExpress.XtraBars.BarStaticItem()
        Me.txtCulture = New DevExpress.XtraBars.BarStaticItem()
        Me.btnOpenSchemaDirectory = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnReloadWinlineData = New DevExpress.XtraBars.BarButtonItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -54,9 +55,9 @@ Partial Class frmMain
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnOpenImportExportForm, Me.BarButtonItem1, Me.BarButtonItem4, Me.BarButtonItem2, Me.BarButtonItem3, Me.txtVersion, Me.txtCulture, Me.btnOpenSchemaDirectory})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnOpenImportExportForm, Me.btnReloadTemplates, Me.BarButtonItem4, Me.BarButtonItem2, Me.BarButtonItem3, Me.txtVersion, Me.txtCulture, Me.btnOpenSchemaDirectory, Me.btnReloadWinlineData})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 13
+        Me.RibbonControl1.MaxItemId = 14
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -72,12 +73,12 @@ Partial Class frmMain
        Me.btnOpenImportExportForm.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_checkcircled1
        Me.btnOpenImportExportForm.Name = "btnOpenImportExportForm"
        '
-        'BarButtonItem1
+        'btnReloadTemplates
        '
-        Me.BarButtonItem1.Caption = "Daten neuladen"
-        Me.BarButtonItem1.Id = 2
-        Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_reload
-        Me.BarButtonItem1.Name = "BarButtonItem1"
+        Me.btnReloadTemplates.Caption = "Vorlagen neuladen"
+        Me.btnReloadTemplates.Id = 2
+        Me.btnReloadTemplates.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.refreshpivottable
+        Me.btnReloadTemplates.Name = "btnReloadTemplates"
        '
        'BarButtonItem4
        '
@@ -123,6 +124,13 @@ Partial Class frmMain
        Me.btnOpenSchemaDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open26
        Me.btnOpenSchemaDirectory.Name = "btnOpenSchemaDirectory"
        '
+        'btnReloadWinlineData
+        '
+        Me.btnReloadWinlineData.Caption = "WinLine Daten neuladen"
+        Me.btnReloadWinlineData.Id = 13
+        Me.btnReloadWinlineData.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.update
+        Me.btnReloadWinlineData.Name = "btnReloadWinlineData"
+        '
        'RibbonPage1
        '
        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3})
@@ -138,7 +146,8 @@ Partial Class frmMain
        'RibbonPageGroup3
        '
        Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.btnReloadTemplates)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.btnReloadWinlineData)
        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
        Me.RibbonPageGroup3.Text = "Daten"
        '
@@ -263,7 +272,7 @@ Partial Class frmMain
    Friend WithEvents colFileName As DevExpress.XtraGrid.Columns.GridColumn
    Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage
    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
-    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnReloadTemplates As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
@@ -273,4 +282,5 @@ Partial Class frmMain
    Friend WithEvents txtCulture As DevExpress.XtraBars.BarStaticItem
    Friend WithEvents btnOpenSchemaDirectory As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents btnReloadWinlineData As DevExpress.XtraBars.BarButtonItem
 End Class
--- a/MultiTool.Form/frmMain.vb
+++ b/MultiTool.Form/frmMain.vb
@@ -6,14 +6,14 @@ Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Winline
-Imports MultiTool.Shared.Winline.Entities
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Winline
+Imports MultiTool.Common.Winline.Entities

 Public Class frmMain
    Private LogConfig As LogConfig
    Private Logger As Logger
-    Private ConfigManager As ConfigManager(Of [Shared].Config)
+    Private ConfigManager As ConfigManager(Of Common.Config)
    Private Database As MSSQLServer
    Private TemplateLoader As TemplateLoader
    Private GridBuilder As GridBuilder
@@ -40,7 +40,7 @@ Public Class frmMain
            SplashScreenManager.SetWaitFormDescription("Initialisierung der Grundfunktionen")

            FormHelper = New FormHelper(LogConfig, Me)
-            ConfigManager = New ConfigManager(Of [Shared].Config)(LogConfig,
+            ConfigManager = New ConfigManager(Of Common.Config)(LogConfig,
                Application.UserAppDataPath,
                Application.CommonAppDataPath,
                Application.StartupPath
@@ -70,13 +70,10 @@ Public Class frmMain
            Database = New MSSQLServer(LogConfig, oConnectionString)

            SplashScreenManager.SetWaitFormDescription("Lade Vorlagen")
-            Await LoadTemplateData()
+            GridControl1.DataSource = Await LoadTemplateData()

            SplashScreenManager.SetWaitFormDescription("Lade Winline Stammdaten")
            My.Winline = New WinlineData(LogConfig, Database, My.GeneralConfiguration, My.MappingConfiguration, My.MandatorConfiguration)
-            Dim oBindingSource As BindingList(Of Template) = Await LoadWinlineData(My.Winline)
-            GridControl1.DataSource = oBindingSource
-

            txtVersion.Caption = String.Format(My.Resources.frmMainExtra.Version___0_, My.Application.Info.Version.ToString)
            txtCulture.Caption = String.Format(My.Resources.frmMainExtra.Sprache___0_, My.Application.UICulture.ToString)
@@ -89,7 +86,7 @@ Public Class frmMain
        End Try
    End Sub

-    Private Async Function LoadWinlineData(Winline As WinlineData) As Task(Of BindingList(Of Template))
+    Private Async Function LoadWinlineData(Winline As WinlineData) As Task
        Winline.Mandators.Clear()
        Winline.LoadEconomicYears()
        Await Winline.LoadMandators()
@@ -104,15 +101,9 @@ Public Class frmMain
        Next

        My.Winline = Winline
-
-        Dim oBindingSource = New BindingList(Of Template)
-        For Each oTemplate As Template In TemplateLoader.TemplateList
-            oBindingSource.Add(oTemplate)
-        Next
-        Return oBindingSource
    End Function

-    Private Async Function LoadTemplateData() As Task
+    Private Async Function LoadTemplateData() As Task(Of BindingList(Of Template))
        ' Initialize Schemas
        TemplateLoader = New TemplateLoader(LogConfig, Database)
        Await TemplateLoader.LoadTemplates()
@@ -126,6 +117,12 @@ Public Class frmMain
        My.TemplateConfiguration = TemplateLoader.TemplateConfiguration
        My.MandatorConfiguration = TemplateLoader.MandatorConfiguration
        My.GeneralConfiguration = TemplateLoader.GeneralConfiguration
+
+        Dim oBindingSource = New BindingList(Of Template)
+        For Each oTemplate As Template In TemplateLoader.TemplateList
+            oBindingSource.Add(oTemplate)
+        Next
+        Return oBindingSource
    End Function

    Private Sub btnOpenImportExportForm_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenImportExportForm.ItemClick
@@ -233,7 +230,7 @@ Public Class frmMain
        End Try
    End Sub

-    Private Async Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+    Private Async Sub btnReloadTemplates_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadTemplates.ItemClick
        If SplashScreenManager.IsSplashFormVisible Then
            Exit Sub
        End If
@@ -242,11 +239,27 @@ Public Class frmMain

        Try
            SplashScreenManager.SetWaitFormDescription("Lade Vorlagen")
-            Await LoadTemplateData()
+            GridControl1.DataSource = Await LoadTemplateData()

+        Catch ex As Exception
+            FormHelper.ShowError(ex, "Laden der Vorlagen")
+
+        Finally
+            SplashScreenManager.CloseWaitForm()
+
+        End Try
+    End Sub
+
+    Private Async Sub btnReloadWinlineData_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadWinlineData.ItemClick
+        If SplashScreenManager.IsSplashFormVisible Then
+            Exit Sub
+        End If
+
+        SplashScreenManager.ShowWaitForm()
+
+        Try
            SplashScreenManager.SetWaitFormDescription("Lade Winline Stammdaten")
-            Dim oBindingSource As BindingList(Of Template) = Await LoadWinlineData(My.Winline)
-            GridControl1.DataSource = oBindingSource
+            Await LoadWinlineData(My.Winline)

        Catch ex As Exception
            FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Winline_Daten)
--- a/MultiTool.Form/frmRowEditor.vb
+++ b/MultiTool.Form/frmRowEditor.vb
@@ -1,10 +1,10 @@
 Imports System.Globalization
-Imports MultiTool.Shared.Documents
-Imports MultiTool.Shared.Documents.DocumentRow
-Imports MultiTool.Shared.Winline
-Imports MultiTool.Shared.Winline.Entities
-Imports MultiTool.Shared.Templates
-Imports MultiTool.Shared.Constants
+Imports MultiTool.Common.Documents
+Imports MultiTool.Common.Documents.DocumentRow
+Imports MultiTool.Common.Winline
+Imports MultiTool.Common.Winline.Entities
+Imports MultiTool.Common.Templates
+Imports MultiTool.Common.Constants
 Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.Logging
 Imports DevExpress.XtraEditors
--- a/MultiTool.Shared/DataRowEx.vb
+++ b/MultiTool.Shared/DataRowEx.vb
@@ -1,13 +0,0 @@
-Imports System.Runtime.CompilerServices
-Imports DigitalData.Modules.Language
-
-Public Module DataRowEx
-    <Extension()>
-    Public Function ItemEx(Of T)(pRow As DataRow, pFieldName As String, Optional pDefaultValue As T = Nothing) As T
-        Try
-            Return Utils.NotNull(pRow.Item(pFieldName), pDefaultValue)
-        Catch ex As Exception
-            Return Nothing
-        End Try
-    End Function
-End Module
--- a/MultiTool.sln
+++ b/MultiTool.sln
@@ -5,22 +5,40 @@ VisualStudioVersion = 16.0.31005.135
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MultiTool.Form", "MultiTool.Form\MultiTool.Form.vbproj", "{7AAEC958-955D-4F77-964C-38658684E424}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MultiTool.Shared", "MultiTool.Shared\MultiTool.Shared.vbproj", "{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MultiTool.Common", "MultiTool.Common\MultiTool.Common.vbproj", "{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Multitool.Form.Setup", "Multitool.Form.Setup\Multitool.Form.Setup.wixproj", "{A03D1911-C6D6-4AD0-9601-4D277B35E91D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{7AAEC958-955D-4F77-964C-38658684E424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7AAEC958-955D-4F77-964C-38658684E424}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AAEC958-955D-4F77-964C-38658684E424}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7AAEC958-955D-4F77-964C-38658684E424}.Debug|x86.Build.0 = Debug|Any CPU
 		{7AAEC958-955D-4F77-964C-38658684E424}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7AAEC958-955D-4F77-964C-38658684E424}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AAEC958-955D-4F77-964C-38658684E424}.Release|x86.ActiveCfg = Release|Any CPU
+		{7AAEC958-955D-4F77-964C-38658684E424}.Release|x86.Build.0 = Release|Any CPU
 		{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Debug|x86.Build.0 = Debug|Any CPU
 		{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Release|x86.ActiveCfg = Release|Any CPU
+		{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Release|x86.Build.0 = Release|Any CPU
+		{A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Debug|x86.ActiveCfg = Debug|x86
+		{A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Debug|x86.Build.0 = Debug|x86
+		{A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Release|Any CPU.ActiveCfg = Release|x86
+		{A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Release|x86.ActiveCfg = Release|x86
+		{A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Multitool.Form.Setup/Includes/Config.wxi
+++ b/Multitool.Form.Setup/Includes/Config.wxi
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+	<!-- Der Name der Haupt-EXE -->
+	<?define ProgramName="Multitool.Form"?>
+	<!-- Der Volle Name des Programms -->
+	<?define ProductName="WebService Multitool für WinLine"?>
+	<!-- Der Hersteller des Programms -->
+	<?define Manufacturer="Digital Data"?>
+	<!-- Kurze Beschreibung des Programms (optional) -->
+	<?define Description="WebService Multitool für WinLine"?>
+	<!-- Kurzer Kommentar zum Programm (optional) -->
+	<?define Comments="Kommentar wie Copyright-Hinweis"?>
+	<!--
+    UPGRADE CODE
+
+    Sorgt dafür, dass Programm-Updates mit dem Installer
+    die alte Version ersetzen. Darf sich nicht mehr ändern,
+    wenn einmal festgelegt.
+   -->
+	<?define UpgradeCode="46396a9e-6e65-404e-953c-65e8c713ff6f"?>
+</Include>
--- a/Multitool.Form.Setup/Includes/UI.wxi
+++ b/Multitool.Form.Setup/Includes/UI.wxi
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+	<!-- Konfiguriert die Reihenfolge der Installer-Dialoge -->
+	<UI>
+		<UIRef Id="WixUI_FeatureTree"/>
+		<UIRef Id="WixUI_ErrorProgressText" />
+		<Publish Dialog="WelcomeDlg"
+			  Control="Next"
+			  Event="NewDialog"
+			  Value="InstallDirDlg"
+			  Order="2">1</Publish>
+		<Publish Dialog="InstallDirDlg"
+			  Control="Back"
+			  Event="NewDialog"
+			  Value="WelcomeDlg"
+			  Order="2">1</Publish>
+		<Publish Dialog="InstallDirDlg"
+			  Control="Next"
+			  Event="NewDialog"
+			  Value="FeaturesDlg"
+			  Order="2">1</Publish>
+		<Publish Dialog="InstallDirDlg"
+			  Control="ChangeFolder"
+			  Event="NewDialog"
+			  Value="BrowseDlg"
+			  Order="2">1</Publish>
+		<Publish Dialog="FeaturesDlg"
+				Control="Back"
+				Event="NewDialog"
+				Value="InstallDirDlg"
+				Order="2">1</Publish>
+	</UI>
+</Include>
--- a/Multitool.Form.Setup/Multitool.Form.Setup.wixproj
+++ b/Multitool.Form.Setup/Multitool.Form.Setup.wixproj
@@ -0,0 +1,84 @@
+<?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.10</ProductVersion>
+    <ProjectGuid>a03d1911-c6d6-4ad0-9601-4d277b35e91d</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>Multitool.Form.Setup</OutputName>
+    <OutputType>Package</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+    <LinkerAdditionalOptions>
+			-b "$(SolutionDir)MultiTool.Common\bin\$(Configuration)"
+			-b "$(SolutionDir)MultiTool.Form\bin\$(Configuration)"
+		</LinkerAdditionalOptions>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <LinkerAdditionalOptions>
+			-b "$(SolutionDir)MultiTool.Common\bin\$(Configuration)"
+			-b "$(SolutionDir)MultiTool.Form\bin\$(Configuration)"
+		</LinkerAdditionalOptions>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Includes\Config.wxi" />
+    <Content Include="Includes\UI.wxi" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Includes" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <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 -->
+    <GetAssemblyIdentity AssemblyFiles="..\MultiTool.Form\bin\$(Configuration)\Multitool.Form.exe">
+      <Output TaskParameter="Assemblies" ItemName="AsmInfo">
+      </Output>
+    </GetAssemblyIdentity>
+    <!-- Store the assembly version number in ProductVersion preprocessor variable -->
+    <CreateProperty Value="$(DefineConstants);ProductVersion=%(AsmInfo.Version)">
+      <Output TaskParameter="Value" PropertyName="DefineConstants">
+      </Output>
+    </CreateProperty>
+    <!-- Name the .msi file after the solution platform and assembly version e.g TestService-x86-1.4.0.0.msi -->
+    <CreateProperty Value="$(SolutionName)-$(Platform)-%(AsmInfo.Version)">
+      <Output TaskParameter="Value" PropertyName="TargetName">
+      </Output>
+    </CreateProperty>
+    <!-- Name the .wixpdb file after the solution platform and assembly version e.g TestService-x86-1.4.0.0.msi -->
+    <CreateProperty Value="$(TargetName)$(TargetPdbExt)">
+      <Output TaskParameter="Value" PropertyName="TargetPdbName">
+      </Output>
+    </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>
+	-->
+</Project>
--- a/Multitool.Form.Setup/Product.wxs
+++ b/Multitool.Form.Setup/Product.wxs
@@ -0,0 +1,130 @@
+<?include Includes/Config.wxi?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+	<Product Id="*" Name="$(var.ProductName)" Language="1031" Codepage="1252" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+		<Package
+		  Id="*"
+		  Keywords="Installer"
+		  Description="$(var.Description)"
+		  Comments="$(var.Comments)"
+		  Manufacturer="$(var.Manufacturer)"
+		  InstallerVersion="100"
+		  Languages="1031"
+		  Compressed="yes"
+		  SummaryCodepage="1252"
+		  InstallScope="perMachine"
+    />
+
+		<Media Id='1' Cabinet='$(var.ProgramName).cab' EmbedCab='yes' DiskPrompt='$(var.ProgramName)'  />
+		<Property Id='DiskPrompt' Value="$(var.ProgramName) Install" />
+
+		<MajorUpgrade
+		  AllowDowngrades="no"
+		  AllowSameVersionUpgrades="yes"
+		  DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
+    />
+
+		<!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
+		<Property Id="ARPPRODUCTICON" Value="AppIcon" />
+		<!-- Legt das Standard-Installationsverzeichnis fest-->
+		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+		<Property Id="_BrowseProperty" Value="INSTALLDIR" />
+		
+		<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
+		<Upgrade Id="$(var.UpgradeCode)">
+			<UpgradeVersion
+			  Minimum="1.0.0.0" Maximum="99.0.0.0"
+			  Property="PREVIOUSVERSIONSINSTALLED"
+			  IncludeMinimum="yes" IncludeMaximum="no" />
+		</Upgrade>
+
+		<!-- Legt das Icon fest -->
+		<Icon Id="AppIcon.exe" SourceFile="$(var.ProgramName).exe" />	
+
+		<!-- Legt die Verzeichnisstruktur fest -->
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<Directory Id="ProgramFilesFolder">
+				<Directory Id="COMPANYDIR" Name="$(var.Manufacturer)">
+					<Directory Id="INSTALLDIR" Name="$(var.ProductName)"/>
+				</Directory>
+			</Directory>
+
+			<Directory Id="ProgramMenuFolder">
+				<Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
+			</Directory>
+
+			<Directory Id="DesktopFolder" />
+		</Directory>
+
+		<!-- Verknüpfung für Startmenü -->
+		<DirectoryRef Id="ApplicationProgramsFolder">
+			<Component Id="ApplicationShortcut_StartMenu" Guid="9c829c18-cd63-45af-828f-f0c8ccbb034f">
+				<Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
+					 Name="$(var.ProductName)"
+					 Target="[INSTALLDIR]$(var.ProgramName).exe"
+					 WorkingDirectory="INSTALLDIR"/>
+				<RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
+				<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+			</Component>
+		</DirectoryRef>
+
+		<!-- Verknüpfung für Desktop -->
+		<DirectoryRef Id="DesktopFolder">
+			<Component Id="ApplicationShortcut_Desktop" Guid="b5b8c2df-b352-4cde-8c1f-cfae5dc2ce38">
+				<Shortcut Id="ApplicationStartMenuShortcut_Desktop"
+					 Name="$(var.ProductName)"
+					 Target="[INSTALLDIR]$(var.ProgramName).exe"
+					 WorkingDirectory="INSTALLDIR"/>
+				<RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
+				<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+			</Component>
+		</DirectoryRef>
+
+		<DirectoryRef Id="INSTALLDIR">
+			<Component Id="MainApplicationExe" Guid="815c5161-b2eb-412b-8111-f7f9a688c25e">
+				<File Id="MainApplicationExe" 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="ProgramMenuFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
+				</File>
+			</Component>
+
+			<Component Id="MainApplicationDlls" Guid="c18a4e4e-b2ff-4a3a-83a0-9acead8f8863">
+				<File Id="MultiTool.Common.dll" Name="MultiTool.Common.dll" KeyPath="yes" Checksum="yes"></File>			
+			</Component>
+
+			<Component Id="RegistryKeys" Guid="b395d700-520f-4f31-ac64-293881ba1f04">
+				<RegistryKey Root="HKLM" Key="Software">
+					<RegistryKey Key="[Manufacturer]">
+						<RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
+							<RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
+						</RegistryKey>
+					</RegistryKey>
+				</RegistryKey>
+
+				<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+			</Component>
+		</DirectoryRef>
+
+		<Feature Id="MainApplication" Title="Main Application" Level="1">
+			<ComponentRef Id="MainApplicationExe" />
+			<ComponentRef Id="MainApplicationDlls" />
+			<ComponentRef Id="RegistryKeys" />
+			<!-- Weitere Komponenten hier hinzufügen! -->
+		</Feature>
+
+		<!-- 
+      Diese Features können mit einem Parameter beim Aufruf des Installers deaktiviert werden
+    -->
+		<Feature Id="DesktopShortcut" Title="Desktop Shortcut">
+			<Condition Level="0">DISABLE_DESKTOP_ICON</Condition>
+			<ComponentRef Id="ApplicationShortcut_Desktop"/>
+		</Feature>
+
+		<Feature Id="StartmenuShortcut" Title="Startmenu Shortcut">
+			<Condition Level="0">DISABLE_STARTMENU_ICON</Condition>
+			<ComponentRef Id="ApplicationShortcut_StartMenu" />
+		</Feature>
+
+		<?include Includes/UI.wxi?>
+	</Product>
+</Wix>
Author	SHA1	Message	Date
Jonathan Jenne	b6801ab486	Version 1.2.7.5	2022-04-06 16:29:59 +02:00
Jonathan Jenne	8b6821adde	Rename Shared to Common	2022-04-06 14:55:15 +02:00
Jonathan Jenne	54ba722ecb	Add Setup Project	2022-04-06 14:54:57 +02:00