MERGE

2024-02-26 12:43:42 +01:00
parent a08b48ca78 beaf4e7ade
commit d611bb02c5
12 changed files with 489 additions and 391 deletions
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -47,7 +47,8 @@
    <DefineTrace>true</DefineTrace>
    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>AVISO.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn>
+    <NoWarn>
+    </NoWarn>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
@@ -58,7 +59,8 @@
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>AVISO.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</NoWarn>
+    <NoWarn>
+    </NoWarn>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup>
@@ -76,9 +78,7 @@
  <PropertyGroup>
    <ApplicationIcon>aviso.ico</ApplicationIcon>
  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
-  </PropertyGroup>
+  <PropertyGroup />
  <PropertyGroup>
    <ManifestCertificateThumbprint>34D75D5089806BE69485715D014CE0611D10E677</ManifestCertificateThumbprint>
  </PropertyGroup>
@@ -87,7 +87,7 @@
    </ManifestKeyFile>
  </PropertyGroup>
  <PropertyGroup>
-    <GenerateManifests>false</GenerateManifests>
+    <GenerateManifests>true</GenerateManifests>
  </PropertyGroup>
  <PropertyGroup>
    <TargetZone>LocalIntranet</TargetZone>
@@ -107,11 +107,11 @@
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Aviso_1_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>PrivateCodeSignaturDaniel20240131.pfx</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    <OutputPath>bin\Release\</OutputPath>
@@ -126,14 +126,17 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll</HintPath>
    </Reference>
-    <Reference Include="ChilkatDotNet47, Version=9.5.0.88, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\ChillKat64\neu 2023\chilkatdotnet47-9.5.0-x64\ChilkatDotNet47.dll</HintPath>
+    <Reference Include="ChilkatDotNet47">
+      <HintPath>..\..\..\dll\ChillKat64\ChilkatDotNet47.dll</HintPath>
    </Reference>
    <Reference Include="ClosedXML, Version=0.95.4.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll</HintPath>
    </Reference>
+    <Reference Include="cNCTSPartnerWorker, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\ADMIN\ADMIN\cNCTSPartnerWorker\bin\Debug\cNCTSPartnerWorker.dll</HintPath>
+    </Reference>
    <Reference Include="com.esendex.sdk, Version=3.8.0.0, Culture=neutral, PublicKeyToken=9dceac28a20578e2, processorArchitecture=MSIL">
      <HintPath>..\packages\esendex-dotnet-sdk.3.8.0\lib\net35\com.esendex.sdk.dll</HintPath>
    </Reference>
@@ -337,10 +340,6 @@
    <Reference Include="ThoughtWorks.QRCode">
      <HintPath>..\..\..\dll\ThoughtWorks.QRCode.dll</HintPath>
    </Reference>
-    <Reference Include="VERAG_PROG_ALLGEMEIN, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
-    </Reference>
    <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
@@ -1329,7 +1328,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="My Project\licenses.licx" />
    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <Generator>PublicVbMyResourcesResXFileCodeGenerator</Generator>
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
      <SubType>Designer</SubType>
      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
@@ -1399,16 +1398,13 @@
    <None Include="AL20210908.pfx" />
    <None Include="AL20231110.pfx" />
    <None Include="App.config" />
-    <None Include="Aviso_1_TemporaryKey.pfx" />
-    <None Include="Aviso_TemporaryKey.pfx" />
+    <None Include="app.manifest" />
    <None Include="Dokumentenbeschriftung\PageReport1.rdlx">
      <SubType>Component</SubType>
    </None>
    <None Include="GenerelleGestellungenVorlagen\GenerelleGestellung_DE.pdf">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
-    <None Include="LME.pfx" />
-    <None Include="My Project\app.manifest" />
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
@@ -1419,6 +1415,7 @@
      <CustomToolNamespace>My</CustomToolNamespace>
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
+    <None Include="PrivateCodeSignaturDaniel20240131.pfx" />
    <None Include="Resources\Flender_Bocholt.xlsx" />
    <None Include="Resources\ATANAK_Instructions_Export.xlsx">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -1459,10 +1456,6 @@
    <None Include="Resources\Versionsinfo.txt" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\..\ADMIN\ADMIN\cNCTSPartnerWorker\NCTSPartnerWorker.vbproj">
-      <Project>{2bbd7643-82a1-481f-a014-eb7fcdeed3b5}</Project>
-      <Name>NCTSPartnerWorker</Name>
-    </ProjectReference>
    <ProjectReference Include="..\..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj">
      <Project>{5b947a66-009a-4bb6-b925-f84a01045095}</Project>
      <Name>TELOTEC_Worker_lib</Name>
@@ -1471,6 +1464,11 @@
      <Project>{289bcd77-bc00-4ba1-95ed-a79176d99525}</Project>
      <Name>SDL</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>
    <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
@@ -1502,6 +1500,7 @@
  </ItemGroup>
  <ItemGroup>
    <Content Include="aviso.ico" />
+    <None Include="bin\Debug\Resources\ambar_boarder.png" />
    <Content Include="My Project\aktAlt.jpg" />
    <None Include="Resources\ZwAbEinfuegen.png" />
    <None Include="Resources\unisped_aeo_DE.jpg" />