addIn

2025-05-26 09:27:04 +02:00
parent 389575ff56
commit 192f25a608
4 changed files with 60 additions and 31 deletions
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -12,15 +12,16 @@ Option Strict On
 Option Explicit On


-
-<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
- Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
- Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
-Partial Friend NotInheritable Class MySettings
-    Inherits Global.System.Configuration.ApplicationSettingsBase
-    
-    Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+Namespace My
    
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+        
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        
 #Region "Automatische My.Settings-Speicherfunktion"
 #If _MyType = "WindowsForms" Then
    Private Shared addedHandler As Boolean
@@ -35,10 +36,10 @@ Partial Friend NotInheritable Class MySettings
    End Sub
 #End If
 #End Region
-    
-    Public Shared ReadOnly Property [Default]() As MySettings
-        Get
-            
+        
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+                
 #If _MyType = "WindowsForms" Then
               If Not addedHandler Then
                    SyncLock addedHandlerLockObject
@@ -49,10 +50,11 @@ Partial Friend NotInheritable Class MySettings
                    End SyncLock
                End If
 #End If
-            Return defaultInstance
-        End Get
-    End Property
-End Class
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace

 Namespace My
    
@@ -62,9 +64,9 @@ Namespace My
    Friend Module MySettingsProperty
        
        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.VERAGAddIn.MySettings
+        Friend ReadOnly Property Settings() As Global.VERAGAddIn.My.MySettings
            Get
-                Return Global.VERAGAddIn.MySettings.Default
+                Return Global.VERAGAddIn.My.MySettings.Default
            End Get
        End Property
    End Module
--- a/VERAGAddIn/VERAGAddIn.vbproj
+++ b/VERAGAddIn/VERAGAddIn.vbproj
@@ -26,7 +26,7 @@
    <OutputType>Library</OutputType>
    <RootNamespace>VERAGAddIn</RootNamespace>
    <AssemblyName>VERAGAddIn</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <DefineConstants>VSTO40</DefineConstants>
    <StartupObject>
    </StartupObject>
@@ -36,7 +36,7 @@
    <PublishUrl>\\ftps.verag.ag\g\ftp\programme\VERAGAddin\</PublishUrl>
    <InstallUrl>http://ftps.verag.ag/VERAGAddin/</InstallUrl>
    <TargetCulture>de</TargetCulture>
-    <ApplicationVersion>1.0.1.128</ApplicationVersion>
+    <ApplicationVersion>1.0.1.129</ApplicationVersion>
    <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
    <UpdateEnabled>true</UpdateEnabled>
    <UpdateInterval>0</UpdateInterval>
@@ -366,6 +366,9 @@
      <Name>SDL</Name>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\CHAT_EMOJIS\" />
+  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
--- a/VERAGAddIn/app.config
+++ b/VERAGAddIn/app.config
@@ -16,11 +16,11 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.8.2.0" newVersion="1.8.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.6.0.0" newVersion="7.6.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-11.1.5.0" newVersion="11.1.5.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Dynamsoft.Twain" publicKeyToken="298ad97013b423eb" culture="neutral" />
@@ -43,9 +43,29 @@
        <bindingRedirect oldVersion="0.0.0.0-2.7.2.0" newVersion="2.7.2.0" />
      </dependentAssembly>
      <dependentAssembly>
-        <assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="8fb06cb64d019a17" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.7.2.0" newVersion="2.7.2.0" />
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Spire.PdfViewer.Forms" publicKeyToken="663f351905198cb3" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.9.5.3046" newVersion="4.9.5.3046" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>
--- a/VERAGAddIn/rbnVERAG.vb
+++ b/VERAGAddIn/rbnVERAG.vb
@@ -583,6 +583,9 @@ Public Class AVISO_Mail_Functions
    End Function

    Shared Function isMail_Barsan(mailItem As Outlook.MailItem) As Boolean
+        '--------------------- WIRD NICHT MEHR GENUTZT
+        Return False
+        '--------------------- WIRD NICHT MEHR GENUTZT
        Try
            If mailItem IsNot Nothing Then
                Dim srch As String = "<a href=""https://portal.barsan.com/Dokuman/DokumanGoster.aspx"
@@ -619,13 +622,14 @@ Public Class AVISO_Mail_Functions
                        System.Net.ServicePointManager.SecurityProtocol = System.Net.ServicePointManager.SecurityProtocol Or SecurityProtocolType.Tls11 Or SecurityProtocolType.Tls12

                        Dim TMP_PATH = GetTempFilePathWithExtension(".pdf")
+                        Try
+                            My.Computer.Network.DownloadFile(link, TMP_PATH)
+                            If IO.File.Exists(TMP_PATH) AndAlso TMP_PATH.Contains(".pdf") Then
+                                ATT.Add(TMP_PATH)
+                            End If
+                        Catch ex As Exception

-                        My.Computer.Network.DownloadFile(link, TMP_PATH)
-
-
-                        If IO.File.Exists(TMP_PATH) AndAlso TMP_PATH.Contains(".pdf") Then
-                            ATT.Add(TMP_PATH)
-                        End If
+                        End Try

                    End If
                    cnt += 1