Merge branch 'master' of https://verag.visualstudio.com/DISPO/_git/DISPO
This commit is contained in:
106
UID/DISPO.vbproj
106
UID/DISPO.vbproj
@@ -32,7 +32,7 @@
|
||||
<BootstrapperEnabled>false</BootstrapperEnabled>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<DefineDebug>true</DefineDebug>
|
||||
@@ -57,7 +57,7 @@
|
||||
<OptionExplicit>On</OptionExplicit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<OptionCompare>Binary</OptionCompare>
|
||||
<OptionCompare>Text</OptionCompare>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<OptionStrict>Off</OptionStrict>
|
||||
@@ -72,10 +72,10 @@
|
||||
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ManifestCertificateThumbprint>443CA3745EE904EED98572A89099259301BA06D1</ManifestCertificateThumbprint>
|
||||
<ManifestCertificateThumbprint>4BDC042C7E79547CFC124EDDCBA8A805E84C6BDB</ManifestCertificateThumbprint>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ManifestKeyFile>
|
||||
@@ -92,48 +92,81 @@
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Accessibility" />
|
||||
<Reference Include="Dynamsoft.Forms.Viewer, Version=7.0.0.320, Culture=neutral, PublicKeyToken=298ad97013b423eb" />
|
||||
<Reference Include="Dynamsoft.ImageCore, Version=7.0.0.3020, Culture=neutral, PublicKeyToken=298ad97013b423eb" />
|
||||
<Reference Include="Dynamsoft.PDF, Version=7.0.0.320, Culture=neutral, PublicKeyToken=298ad97013b423eb" />
|
||||
<Reference Include="Dynamsoft.Twain, Version=7.0.0.320, Culture=neutral, PublicKeyToken=298ad97013b423eb" />
|
||||
<Reference Include="Ghostscript.NET, Version=1.2.1.0, Culture=neutral, PublicKeyToken=f85051de34525b59" />
|
||||
<Reference Include="GrapeCity.ActiveReports.ArsClient.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff" />
|
||||
<Reference Include="GrapeCity.ActiveReports.Chart.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff" />
|
||||
<Reference Include="GrapeCity.ActiveReports.Design.Win.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL" />
|
||||
<Reference Include="GrapeCity.ActiveReports.Diagnostics.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff" />
|
||||
<Reference Include="GrapeCity.ActiveReports.Document.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff" />
|
||||
<Reference Include="GrapeCity.ActiveReports.Export.Document.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL" />
|
||||
<Reference Include="GrapeCity.ActiveReports.Export.Pdf.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL" />
|
||||
<Reference Include="GrapeCity.ActiveReports.Extensibility.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff" />
|
||||
<Reference Include="GrapeCity.ActiveReports.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff" />
|
||||
<Reference Include="GrapeCity.ActiveReports.Viewer.Win.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL" />
|
||||
<Reference Include="itextsharp, Version=5.5.5.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" />
|
||||
<Reference Include="Dynamsoft.Forms.Viewer">
|
||||
<HintPath>..\..\SDL\SDL\SDL\bin\Debug\Dynamsoft.Forms.Viewer.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dynamsoft.ImageCore">
|
||||
<HintPath>..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\Dynamsoft.ImageCore.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dynamsoft.PDF, Version=7.0.0.320, Culture=neutral, PublicKeyToken=298ad97013b423eb">
|
||||
<HintPath>..\..\dll\Dynamsoft\8.0.0\Dynamsoft.PDF.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Dynamsoft.Twain">
|
||||
<HintPath>..\..\SDL\SDL\SDL\bin\Debug\Dynamsoft.Twain.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Gemeinsames, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\AVISO\AVISO\Gemeinsames\bin\Debug\Gemeinsames.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Ghostscript.NET, Version=1.2.1.0, Culture=neutral, PublicKeyToken=f85051de34525b59">
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Ghostscript.NET.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GrapeCity.ActiveReports">
|
||||
<HintPath>..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GrapeCity.ActiveReports.ArsClient.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff">
|
||||
<HintPath>..\..\dll\GrapeCity.ActiveReports.ArsClient.v12.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GrapeCity.ActiveReports.Chart">
|
||||
<HintPath>..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Chart.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GrapeCity.ActiveReports.Core.Document">
|
||||
<HintPath>..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Core.Document.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GrapeCity.ActiveReports.Design.Win">
|
||||
<HintPath>..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Design.Win.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GrapeCity.ActiveReports.Document">
|
||||
<HintPath>..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Document.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GrapeCity.ActiveReports.Export.Pdf">
|
||||
<HintPath>..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Export.Pdf.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GrapeCity.ActiveReports.Viewer.Common">
|
||||
<HintPath>..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Viewer.Common.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GrapeCity.ActiveReports.Viewer.Win">
|
||||
<HintPath>..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Viewer.Win.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="itextsharp, Version=5.5.5.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca">
|
||||
<HintPath>..\..\dll\itextsharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ReportViewer.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.Common.dll</HintPath>
|
||||
<HintPath>..\..\dll\Report\Microsoft.ReportViewer.Common.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ReportViewer.DataVisualization, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.DataVisualization.dll</HintPath>
|
||||
<HintPath>..\..\dll\Microsoft.ReportViewer.DataVisualization.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ReportViewer.Design, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.Design.dll</HintPath>
|
||||
<HintPath>..\..\dll\Microsoft.ReportViewer.Design.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ReportViewer.WebDesign, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.WebDesign.dll</HintPath>
|
||||
<HintPath>..\..\dll\Microsoft.ReportViewer.WebDesign.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ReportViewer.WebForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.WebForms.dll</HintPath>
|
||||
<HintPath>..\..\dll\Microsoft.ReportViewer.WebForms.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ReportViewer.WinForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.WinForms.dll</HintPath>
|
||||
<HintPath>..\..\dll\Microsoft.ReportViewer.WinForms.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="PdfSharp.resources">
|
||||
<HintPath>..\..\..\dll\PdfSharp.resources.dll</HintPath>
|
||||
<HintPath>..\..\dll\PdfSharp.resources.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Configuration" />
|
||||
@@ -154,9 +187,6 @@
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="WinSCPnet">
|
||||
<HintPath>..\..\..\dll\WinSCPnet.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Import Include="Microsoft.VisualBasic" />
|
||||
@@ -183,9 +213,11 @@
|
||||
<Compile Include="cDispoAuftraege.vb" />
|
||||
<Compile Include="cMeineFunktionen.vb" />
|
||||
<Compile Include="cProgramFunctions.vb" />
|
||||
<Compile Include="cSQL.vb" />
|
||||
<Compile Include="cSqlDb.vb" />
|
||||
<Compile Include="cTripOLD.vb" />
|
||||
<Compile Include="cTrips.vb" />
|
||||
<Compile Include="cUsersettings.vb" />
|
||||
<Compile Include="DataSet1.Designer.vb">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
@@ -248,6 +280,12 @@
|
||||
<Compile Include="frmLeer\usrcntlTrips.vb">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="frmNotify.Designer.vb">
|
||||
<DependentUpon>frmNotify.vb</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="frmNotify.vb">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="My Project\Resources.Designer.vb">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
@@ -499,6 +537,9 @@
|
||||
<EmbeddedResource Include="frmLeer\usrcntlTrips.resx">
|
||||
<DependentUpon>usrcntlTrips.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="frmNotify.resx">
|
||||
<DependentUpon>frmNotify.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Reports\Auswertung\frmAuswertung.resx">
|
||||
<DependentUpon>frmAuswertung.vb</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -742,6 +783,7 @@
|
||||
<None Include="Resources\Auftrag30.png" />
|
||||
<None Include="Resources\Firmen30_2.png" />
|
||||
<None Include="Resources\Auftrag_30.png" />
|
||||
<None Include="Resources\aviso_messenger.png" />
|
||||
<Content Include="Resources\Info.txt" />
|
||||
<None Include="Resources\lorry_motion.jpg" />
|
||||
<None Include="Resources\lorry_motion.png" />
|
||||
@@ -1558,7 +1600,9 @@
|
||||
<FileType>Satellite</FileType>
|
||||
</PublishFile>
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<ItemGroup>
|
||||
<WCFMetadata Include="Connected Services\" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
||||
Reference in New Issue
Block a user