Merge branch 'master' of https://git.it.verag.ag/edv/VERAGAddIn
This commit is contained in:
@@ -33,10 +33,10 @@
|
||||
<TargetFrameworkProfile />
|
||||
<IsWebBootstrapper>True</IsWebBootstrapper>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
<PublishUrl>\\ftps.verag.ag\g\ftp\programme\VERAGAddin\</PublishUrl>
|
||||
<PublishUrl>\\ftps.verag.ag\g\FTP\Programme\VeragAddin\</PublishUrl>
|
||||
<InstallUrl>http://ftps.verag.ag/VERAGAddin/</InstallUrl>
|
||||
<TargetCulture>de</TargetCulture>
|
||||
<ApplicationVersion>1.0.1.129</ApplicationVersion>
|
||||
<ApplicationVersion>1.0.1.132</ApplicationVersion>
|
||||
<AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
|
||||
<UpdateEnabled>true</UpdateEnabled>
|
||||
<UpdateInterval>0</UpdateInterval>
|
||||
@@ -64,6 +64,11 @@
|
||||
<ProductName>Microsoft .NET Framework 4.7 %28x86 und x64%29</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Microsoft .NET Framework 4.8 %28x86 und x64%29</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||
@@ -76,7 +81,7 @@
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.VSTORuntime.4.0">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Microsoft Visual Studio 2010-Tools für Office-Laufzeit %28x86 und x64%29</ProductName>
|
||||
<ProductName>Microsoft Visual Studio 2010 Tools for Office Runtime %28x86 and x64%29</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-11.1.5.0" newVersion="11.1.5.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-10.7.21.0" newVersion="10.7.21.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Dynamsoft.Twain" publicKeyToken="298ad97013b423eb" culture="neutral" />
|
||||
|
||||
@@ -217,6 +217,7 @@ Public Class AVISO_Mail_Functions
|
||||
|
||||
Marshal.ReleaseComObject(attachment)
|
||||
If IO.File.Exists(TMP_PATH) Then
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({TMP_PATH}) ', cboPrinter.SelectedItem.ToString)
|
||||
Try : IO.File.Delete(TMP_PATH) : Catch : End Try
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user