merge

VERAGAddIn/VERAGAddIn.vbproj

@@ -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.90</ApplicationVersion>
+    <ApplicationVersion>1.0.1.108</ApplicationVersion>
     <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateInterval>0</UpdateInterval>
@@ -163,11 +163,15 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="VERAG_PROG_ALLGEMEIN">
+      <HintPath>..\..\SDL\SDL\SDL\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Office.Tools.v4.0.Framework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -223,6 +227,12 @@
     <Compile Include="frmAvisoAnfügen.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmAvisoFormularAnfügen.Designer.vb">
+      <DependentUpon>frmAvisoFormularAnfügen.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmAvisoFormularAnfügen.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="rbnMailItem.Designer.vb">
       <DependentUpon>rbnMailItem.vb</DependentUpon>
     </Compile>
@@ -241,6 +251,9 @@
     <EmbeddedResource Include="frmAvisoAnfügen.resx">
       <DependentUpon>frmAvisoAnfügen.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmAvisoFormularAnfügen.resx">
+      <DependentUpon>frmAvisoFormularAnfügen.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="rbnMailItem.resx">
       <DependentUpon>rbnMailItem.vb</DependentUpon>
     </EmbeddedResource>
@@ -249,6 +262,7 @@
     </EmbeddedResource>
     <None Include="AL20210908.pfx" />
     <None Include="app.config" />
+    <None Include="Ich habe keine Ahnung, was ich hier mache.pfx" />
     <None Include="Resources\GS\gsdll32.lib">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -280,18 +294,10 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <None Include="VERAGAddIn_1_TemporaryKey.pfx" />
+    <None Include="VeragAddIn_tempKey.pfx" />
     <None Include="VERAGAddIn_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="Microsoft.Vbe.Interop.Forms">
-      <Guid>{AC2DE821-36A2-11CF-8053-00AA006009FA}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
     <COMReference Include="stdole1">
       <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>2</VersionMajor>
@@ -311,21 +317,6 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\AVISO\Aviso\Aviso\Aviso.vbproj">
-      <Project>{7bdd8c2f-2c9e-49f1-a365-3b1da1c84991}</Project>
-      <Name>Aviso</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\AVISO\Aviso\Gemeinsames\Gemeinsames.vbproj">
-      <Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
-      <Name>Gemeinsames</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
-      <Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
-      <Name>VERAG_PROG_ALLGEMEIN</Name>
-      <Private>True</Private>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\Aviso.png" />
   </ItemGroup>
@@ -336,6 +327,7 @@
     <None Include="Resources\pdf.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\pdf_gray.png" />
     <None Include="Resources\665209_email_512x512.png" />
     <None Include="Resources\email_big1.png" />
     <Content Include="Resources\GS\gsdll32.dll">
@@ -350,6 +342,24 @@
     <None Include="Resources\wheel.png" />
     <None Include="Resources\pdfprint.png" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj">
+      <Project>{5b947a66-009a-4bb6-b925-f84a01045095}</Project>
+      <Name>TELOTEC_Worker_lib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Aviso\AVISO\Aviso\Aviso.vbproj">
+      <Project>{7bdd8c2f-2c9e-49f1-a365-3b1da1c84991}</Project>
+      <Name>Aviso</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Aviso\AVISO\Gemeinsames\Gemeinsames.vbproj">
+      <Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
+      <Name>Gemeinsames</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\SDL\SDL\SDL\SDL.vbproj">
+      <Project>{289BCD77-BC00-4BA1-95ED-A79176D99525}</Project>
+      <Name>SDL</Name>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -370,7 +380,7 @@
     <ManifestKeyFile>AL20210908.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>5A6BD29D23A7643243CD6EFA1FEF21BAF955E653</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>34D75D5089806BE69485715D014CE0611D10E677</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
@@ -381,6 +391,9 @@
   <PropertyGroup>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>VeragAddIn_tempKey.pfx</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <!-- Include the build rules for a Visual Basic project. -->
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- Include additional build rules for an Office application add-in. -->