Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<DefineDebug>true</DefineDebug>
|
||||
@@ -73,67 +73,70 @@
|
||||
<AssemblyOriginatorKeyFile>ProgAllg.pfx</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="ChilkatDotNet47, Version=9.5.0.88, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
|
||||
<Reference Include="ChilkatDotNet47, Version=9.5.0.96, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\dll\ChillKat64\neu 2023\chilkatdotnet47-9.5.0-x64\ChilkatDotNet47.dll</HintPath>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\ChillKat64\neu 2023\chilkatdotnet47-9.5.0-x64\ChilkatDotNet47.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ClosedXML, Version=0.76.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
|
||||
<Reference Include="ClosedXML, Version=0.68.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\AVISO\Aviso\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll</HintPath>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\closedxml\Neuer Ordner\ClosedXML.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dynamsoft.Forms.Viewer, Version=8.0.0.510, Culture=neutral, PublicKeyToken=298ad97013b423eb, processorArchitecture=MSIL">
|
||||
<Reference Include="Dynamsoft.Forms.Viewer, Version=8.3.3.726, Culture=neutral, PublicKeyToken=298ad97013b423eb, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\dll\Dynamsoft\8.3.3\Dynamsoft.Forms.Viewer.dll</HintPath>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Dynamsoft\8.3.3\Dynamsoft.Forms.Viewer.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dynamsoft.ImageCore, Version=8.0.0.510, Culture=neutral, PublicKeyToken=298ad97013b423eb, processorArchitecture=MSIL">
|
||||
<Reference Include="Dynamsoft.ImageCore, Version=8.3.3.726, Culture=neutral, PublicKeyToken=298ad97013b423eb, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\dll\Dynamsoft\8.3.3\Dynamsoft.ImageCore.dll</HintPath>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Dynamsoft\8.3.3\Dynamsoft.ImageCore.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dynamsoft.PDF, Version=7.0.0.320, Culture=neutral, PublicKeyToken=298ad97013b423eb, processorArchitecture=MSIL">
|
||||
<Reference Include="Dynamsoft.PDF, Version=8.3.3.726, Culture=neutral, PublicKeyToken=298ad97013b423eb, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\dll\Dynamsoft\8.3.3\Dynamsoft.PDF.dll</HintPath>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Dynamsoft\8.3.3\Dynamsoft.PDF.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dynamsoft.Twain, Version=8.0.0.510, Culture=neutral, PublicKeyToken=298ad97013b423eb, processorArchitecture=MSIL">
|
||||
<Reference Include="Dynamsoft.Twain, Version=8.3.3.726, Culture=neutral, PublicKeyToken=298ad97013b423eb, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\dll\Dynamsoft\8.3.3\Dynamsoft.Twain.dll</HintPath>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Dynamsoft\8.3.3\Dynamsoft.Twain.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dynamsoft.WPF.Viewer, Version=8.0.0.510, Culture=neutral, PublicKeyToken=298ad97013b423eb, processorArchitecture=MSIL">
|
||||
<Reference Include="Dynamsoft.WPF.Viewer, Version=8.3.3.726, Culture=neutral, PublicKeyToken=298ad97013b423eb, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\dll\Dynamsoft\8.3.3\Dynamsoft.WPF.Viewer.dll</HintPath>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Dynamsoft\8.3.3\Dynamsoft.WPF.Viewer.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Ghostscript.NET">
|
||||
<HintPath>..\..\..\dll\Ghostscript.NET.dll</HintPath>
|
||||
<Reference Include="Ghostscript.NET, Version=1.2.1.0, Culture=neutral, PublicKeyToken=f85051de34525b59, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Ghostscript.NET.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Interop.Therefore.API">
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Interop.Therefore.API.dll</HintPath>
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</Reference>
|
||||
<Reference Include="itextsharp, Version=5.5.5.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\dll\itextsharp.dll</HintPath>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\itextsharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="McDull.Windows.Forms">
|
||||
<HintPath>..\..\..\dll\McDull.Windows.Forms.dll</HintPath>
|
||||
<Reference Include="McDull.Windows.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\McDull.Windows.Forms.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Office.Interop.Outlook, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||
<Reference Include="Microsoft.Office.Interop.Outlook, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Microsoft.Office.Interop.Outlook.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NetSpell.SpellChecker">
|
||||
<HintPath>..\..\..\dll\NetSpell.SpellChecker.DLL</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NumericBox">
|
||||
<HintPath>..\..\..\dll\NumericBox.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="RichTextBoxEx">
|
||||
<HintPath>..\..\..\dll\RichTextBoxEx.dll</HintPath>
|
||||
<Reference Include="NetSpell.SpellChecker, Version=2.1.7.41329, Culture=neutral, PublicKeyToken=318b389f0db66e46">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\NetSpell.SpellChecker.DLL</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Spire.License, Version=1.4.0.46, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\dll\Spire.PDF\2023\Spire.License.dll</HintPath>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Spire.PDF\2023\Spire.License.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Spire.Pdf, Version=8.1.4.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
|
||||
<Reference Include="Spire.Pdf, Version=8.10.2.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\dll\Spire.PDF\2023\Spire.Pdf.dll</HintPath>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Spire.PDF\2023\Spire.Pdf.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Spire.PdfViewer.Forms, Version=7.1.4.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
|
||||
<Reference Include="Spire.PdfViewer.Forms, Version=7.10.3.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\dll\Spire.PDF\2023\Spire.PdfViewer.Forms.dll</HintPath>
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Spire.PDF\2023\Spire.PdfViewer.Forms.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
@@ -372,12 +375,19 @@
|
||||
<Compile Include="Classes\cOffene_Posten_DVO.vb" />
|
||||
<Compile Include="Classes\cOriginalATR.vb" />
|
||||
<Compile Include="Classes\cParkzeiten.vb" />
|
||||
<Compile Include="Classes\cUeberstunden.vb" />
|
||||
<Compile Include="frmErrorMeldung.Designer.vb">
|
||||
<DependentUpon>frmErrorMeldung.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="frmErrorMeldung.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Mitarbeiterverzeichnis\frmUeberstundenauszahlen.Designer.vb">
|
||||
<DependentUpon>frmUeberstundenauszahlen.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Mitarbeiterverzeichnis\frmUeberstundenauszahlen.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="My Project\Resources.Designer.vb">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
@@ -765,6 +775,9 @@
|
||||
<EmbeddedResource Include="Mitarbeiterverzeichnis\frmMitarbeitersuche.resx">
|
||||
<DependentUpon>frmMitarbeitersuche.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Mitarbeiterverzeichnis\frmUeberstundenauszahlen.resx">
|
||||
<DependentUpon>frmUeberstundenauszahlen.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="My Project\Resources.resx">
|
||||
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
|
||||
<CustomToolNamespace>My.Resources</CustomToolNamespace>
|
||||
@@ -1207,17 +1220,6 @@
|
||||
<ItemGroup>
|
||||
<None Include="Resources\aviso.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<COMReference Include="Therefore.API">
|
||||
<Guid>{37687F89-8603-4E42-A5F4-4FBAB011D5F3}</Guid>
|
||||
<VersionMajor>3</VersionMajor>
|
||||
<VersionMinor>0</VersionMinor>
|
||||
<Lcid>0</Lcid>
|
||||
<WrapperTool>tlbimp</WrapperTool>
|
||||
<Isolated>False</Isolated>
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</COMReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\docAllgemein.png" />
|
||||
</ItemGroup>
|
||||
|
||||
Reference in New Issue
Block a user