addin breakfix

This commit is contained in:
2024-02-01 16:54:59 +01:00
parent e2bb75972c
commit cd9810d36b
4 changed files with 20 additions and 30 deletions

View File

@@ -127,8 +127,8 @@ Global
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU {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.ActiveCfg = Debug|x64
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.Build.0 = 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.ActiveCfg = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|x64 {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.ActiveCfg = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.Build.0 = 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 {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU

View File

@@ -28,7 +28,7 @@ Public Class ThisAddIn
inspectors = Me.Application.Inspectors inspectors = Me.Application.Inspectors
currentExplorer = Me.Application.ActiveExplorer currentExplorer = Me.Application.ActiveExplorer
SharedExplorer = currentExplorer SharedExplorer = currentExplorer
checkConnection() 'checkConnection()
AddHandler VERAGRibbon.bla, Sub() AddHandler VERAGRibbon.bla, Sub()
' MsgBox("JOAS") ' MsgBox("JOAS")
@@ -179,7 +179,7 @@ Public Class ThisAddIn
Private Sub checkConnection() Private Sub checkConnection()
Dim con = New VERAG_PROG_ALLGEMEIN.SQL Dim con = New SQL
For Each COMAddIn As COMAddIn In Me.Application.COMAddIns For Each COMAddIn As COMAddIn In Me.Application.COMAddIns

View File

@@ -36,7 +36,7 @@
<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> <InstallUrl>http://ftps.verag.ag/VERAGAddin/</InstallUrl>
<TargetCulture>de</TargetCulture> <TargetCulture>de</TargetCulture>
<ApplicationVersion>1.0.1.109</ApplicationVersion> <ApplicationVersion>1.0.1.114</ApplicationVersion>
<AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision> <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
<UpdateEnabled>true</UpdateEnabled> <UpdateEnabled>true</UpdateEnabled>
<UpdateInterval>0</UpdateInterval> <UpdateInterval>0</UpdateInterval>
@@ -123,6 +123,7 @@
<RegisterForComInterop>false</RegisterForComInterop> <RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks> <RemoveIntegerChecks>false</RemoveIntegerChecks>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn> <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<!-- <!--
This section defines properties that are set when the "Release" configuration is selected. This section defines properties that are set when the "Release" configuration is selected.
@@ -169,7 +170,7 @@
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="VERAG_PROG_ALLGEMEIN"> <Reference Include="VERAG_PROG_ALLGEMEIN">
<HintPath>..\..\SDL\SDL\SDL\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath> <HintPath>..\..\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -262,6 +263,8 @@
</EmbeddedResource> </EmbeddedResource>
<None Include="app.config" /> <None Include="app.config" />
<None Include="Ich habe keine Ahnung, was ich hier mache.pfx" /> <None Include="Ich habe keine Ahnung, was ich hier mache.pfx" />
<None Include="PrivateCodeSignaturDaniel2024.pfx" />
<None Include="PrivateCodeSignaturDaniel20240131.pfx" />
<None Include="Resources\GS\gsdll32.lib"> <None Include="Resources\GS\gsdll32.lib">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
@@ -292,9 +295,6 @@
<DependentUpon>Settings.settings</DependentUpon> <DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput> <DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile> </Compile>
<None Include="VERAGAddIn_1_TemporaryKey.pfx" />
<None Include="VeragAddIn_tempKey.pfx" />
<None Include="VERAGAddIn_TemporaryKey.pfx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<COMReference Include="stdole1"> <COMReference Include="stdole1">
@@ -376,11 +376,10 @@
<SignManifests>true</SignManifests> <SignManifests>true</SignManifests>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ManifestKeyFile> <ManifestKeyFile>AL20231110.pfx</ManifestKeyFile>
</ManifestKeyFile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ManifestCertificateThumbprint>34D75D5089806BE69485715D014CE0611D10E677</ManifestCertificateThumbprint> <ManifestCertificateThumbprint>75156A186435E8542612CE6E7E26CA9FCE0A5BAF</ManifestCertificateThumbprint>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
@@ -392,7 +391,7 @@
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<AssemblyOriginatorKeyFile>VeragAddIn_tempKey.pfx</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>PrivateCodeSignaturDaniel20240131.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<!-- Include the build rules for a Visual Basic project. --> <!-- Include the build rules for a Visual Basic project. -->
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
@@ -409,4 +408,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<PropertyGroup>
<PostBuildEvent>\\192.168.0.90\f\Zertifikate\signtool.exe sign /f \\192.168.0.90\f\Zertifikate\AL20231110.pfx /p zYGNNJRG+tzlw90Rz6NqOXnoeBycFCy07YcUsY5iD0M= "Aviso.exe"</PostBuildEvent>
</PropertyGroup>
</Project> </Project>

View File

@@ -4,25 +4,11 @@ Imports VERAG_PROG_ALLGEMEIN
Imports Microsoft.Office.Tools.Ribbon Imports Microsoft.Office.Tools.Ribbon
Imports System.Windows.Forms Imports System.Windows.Forms
Imports Microsoft.Office.Interop Imports Microsoft.Office.Interop
Imports VERAGAddIn.ThisAddIn
Imports System.Runtime.InteropServices Imports System.Runtime.InteropServices
Imports System.Text.RegularExpressions Imports System.Text.RegularExpressions
Imports System.IO
Imports SDL
Imports System.Net 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.Reflection
Imports System.Diagnostics.Eventing
Imports System.Net.WebRequestMethods
Imports System.Xml
Public Class VERAGRibbon Public Class VERAGRibbon
Dim LOGIN_OK = False 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 Private Sub Ribbon1_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load
cAllgemein.TESTSYSTEM = False cAllgemein.TESTSYSTEM = False
cAllgemein.TESTSYSTEM = True 'cAllgemein.TESTSYSTEM = True
LOGIN_OK = AVISO_Mail_Functions.initFirmaUser() LOGIN_OK = AVISO_Mail_Functions.initFirmaUser()
End Sub End Sub
@@ -61,7 +47,9 @@ Public Class VERAGRibbon
Private Sub Button4_Click(sender As Object, e As RibbonControlEventArgs) Handles Button4.Click Private Sub Button4_Click(sender As Object, e As RibbonControlEventArgs) Handles Button4.Click
Try 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 Catch ex As Exception
End Try End Try
End Sub End Sub