diff --git a/VERAGAddIn.sln b/VERAGAddIn.sln index fcc56e6..ebb1973 100644 --- a/VERAGAddIn.sln +++ b/VERAGAddIn.sln @@ -127,8 +127,8 @@ Global {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.Build.0 = Debug|x64 - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64 - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|x64 + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|Any CPU + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.ActiveCfg = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.Build.0 = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/VERAGAddIn/ThisAddIn.vb b/VERAGAddIn/ThisAddIn.vb index be25520..add44e5 100644 --- a/VERAGAddIn/ThisAddIn.vb +++ b/VERAGAddIn/ThisAddIn.vb @@ -28,7 +28,7 @@ Public Class ThisAddIn inspectors = Me.Application.Inspectors currentExplorer = Me.Application.ActiveExplorer SharedExplorer = currentExplorer - checkConnection() + 'checkConnection() AddHandler VERAGRibbon.bla, Sub() ' MsgBox("JOAS") @@ -179,7 +179,7 @@ Public Class ThisAddIn Private Sub checkConnection() - Dim con = New VERAG_PROG_ALLGEMEIN.SQL + Dim con = New SQL For Each COMAddIn As COMAddIn In Me.Application.COMAddIns diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj index ac35e44..20ef5f7 100644 --- a/VERAGAddIn/VERAGAddIn.vbproj +++ b/VERAGAddIn/VERAGAddIn.vbproj @@ -36,7 +36,7 @@ \\ftps.verag.ag\g\ftp\programme\VERAGAddin\ http://ftps.verag.ag/VERAGAddin/ de - 1.0.1.109 + 1.0.1.114 true true 0 @@ -123,6 +123,7 @@ false false 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + x64 @@ -409,4 +408,7 @@ + + \\192.168.0.90\f\Zertifikate\signtool.exe sign /f \\192.168.0.90\f\Zertifikate\AL20231110.pfx /p zYGNNJRG+tzlw90Rz6NqOXnoeBycFCy07YcUsY5iD0M= "Aviso.exe" + \ No newline at end of file diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb index 097fab6..afa141b 100644 --- a/VERAGAddIn/rbnVERAG.vb +++ b/VERAGAddIn/rbnVERAG.vb @@ -4,25 +4,11 @@ Imports VERAG_PROG_ALLGEMEIN Imports Microsoft.Office.Tools.Ribbon Imports System.Windows.Forms Imports Microsoft.Office.Interop -Imports VERAGAddIn.ThisAddIn Imports System.Runtime.InteropServices Imports System.Text.RegularExpressions -Imports System.IO -Imports SDL Imports System.Net -Imports System.Security.Policy -Imports System.Diagnostics.Eventing.Reader -Imports System.Runtime.InteropServices.ComTypes -Imports System.Drawing -Imports System.Threading.Tasks -Imports System.Net.Http -Imports System.Diagnostics -Imports VERAG_PROG_ALLGEMEIN.Kleinma.Controls -Imports System.Data.Odbc Imports System.Reflection -Imports System.Diagnostics.Eventing -Imports System.Net.WebRequestMethods -Imports System.Xml + Public Class VERAGRibbon Dim LOGIN_OK = False @@ -47,7 +33,7 @@ Public Class VERAGRibbon Private Sub Ribbon1_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load cAllgemein.TESTSYSTEM = False - cAllgemein.TESTSYSTEM = True + 'cAllgemein.TESTSYSTEM = True LOGIN_OK = AVISO_Mail_Functions.initFirmaUser() End Sub @@ -61,7 +47,9 @@ Public Class VERAGRibbon Private Sub Button4_Click(sender As Object, e As RibbonControlEventArgs) Handles Button4.Click Try - MsgBox("User: " & System.Security.Principal.WindowsIdentity.GetCurrent().Name & vbNewLine & "Version: " & Assembly.GetExecutingAssembly().GetName().Version.ToString) + 'MsgBox("User: " & System.Security.Principal.WindowsIdentity.GetCurrent().Name & vbNewLine & "Version: " & Assembly.GetExecutingAssembly().GetName().Version.ToString) + + MsgBox("User: " & System.Security.Principal.WindowsIdentity.GetCurrent().Name & vbNewLine & "Version: " & Assembly.GetExecutingAssembly().GetName().Version.ToString & vbNewLine & "System: " & IIf(cAllgemein.TESTSYSTEM, "TEST", "PRODUKTIV")) Catch ex As Exception End Try End Sub