edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: edv:essensbestellungen
Branches Tags
edv:master edv:essensbestellungen edv:change_VM_logic edv:SDL
...
pull from: edv:change_VM_logic
Branches Tags
edv:master edv:essensbestellungen edv:change_VM_logic edv:SDL

1 Commits
essensbest ... change_VM_

Author SHA1 Message Date
d.breimaier
a2c931c6df Login auf Testsystem. 2022-09-14 08:47:44 +02:00
11 changed files with 34 additions and 20 deletions
Expand all files Collapse all files

6
AVISO_CHECKIN/App.config
View File

@@ -7,7 +7,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="GrapeCity.Documents.Common" publicKeyToken="d55d733d2bfd5065" culture="neutral" />
@@ -29,6 +29,10 @@
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.8.2.0" newVersion="1.8.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" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

12
Aviso.sln
View File

@@ -47,7 +47,8 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.ActiveCfg = Debug|x86
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.ActiveCfg = Debug|x64
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.Build.0 = Debug|x64
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.Build.0 = Debug|x64
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x64.ActiveCfg = Debug|x64
@@ -61,7 +62,7 @@ Global
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x64.Build.0 = Release|x64
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x86.ActiveCfg = Release|x86
{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x86.Build.0 = Release|x86
{3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Any CPU.ActiveCfg = Debug|x86
{3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Any CPU.ActiveCfg = Debug|x64
{3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|Mixed Platforms.Build.0 = Debug|x86
{3B5EAEB2-0477-4899-A893-3049DD458B9B}.Debug|x64.ActiveCfg = Debug|x64
@@ -74,7 +75,8 @@ Global
{3B5EAEB2-0477-4899-A893-3049DD458B9B}.Release|x64.Build.0 = Release|x64
{3B5EAEB2-0477-4899-A893-3049DD458B9B}.Release|x86.ActiveCfg = Release|x86
{3B5EAEB2-0477-4899-A893-3049DD458B9B}.Release|x86.Build.0 = Release|x86
{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.ActiveCfg = Debug|x86
{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.ActiveCfg = Debug|x64
{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.Build.0 = Debug|x64
{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x86
{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.ActiveCfg = Debug|x64
@@ -116,8 +118,8 @@ Global
{289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x64.ActiveCfg = Release|Any CPU
{289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x64.Build.0 = Release|Any CPU
{289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x86.ActiveCfg = Release|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|x64
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|x64
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64

2
Aviso/App.config
View File

@@ -65,7 +65,7 @@
</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" />
<bindingRedirect oldVersion="0.0.0.0-2.16.0.0" newVersion="2.16.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>

10
Aviso/Aviso.vbproj
View File

@@ -83,7 +83,8 @@
<ManifestCertificateThumbprint>5A6BD29D23A7643243CD6EFA1FEF21BAF955E653</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>AL20210908.pfx</ManifestKeyFile>
<ManifestKeyFile>
</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
@@ -126,8 +127,11 @@
<Reference Include="Common.Logging.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<HintPath>..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
</Reference>
<Reference Include="DocumentFormat.OpenXml, Version=2.7.2.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
<Reference Include="DocumentFormat.OpenXml, Version=2.16.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.2.16.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
</Reference>
<Reference Include="ExcelNumberFormat, Version=1.1.0.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL">
<HintPath>..\packages\ExcelNumberFormat.1.1.0\lib\net20\ExcelNumberFormat.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports">
<HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.dll</HintPath>

1
Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
View File

@@ -174,6 +174,7 @@
MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)

4
Aviso/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.8.0.3")>
<Assembly: AssemblyFileVersion("3.8.0.3")>
<Assembly: AssemblyVersion("3.8.0.5")>
<Assembly: AssemblyFileVersion("3.8.0.5")>

6
Aviso/frmLogin.vb
View File

@@ -20,8 +20,8 @@ Public Class frmLogin
Icon = cMeineFunktionenAVISO.GetProgrammIcon
End Sub
Dim TESTSYSTEM As Boolean = False
'Dim TESTSYSTEM As Boolean = False !aus Sicherheitsgünden!
Dim TESTSYSTEM As Boolean = True
Private Sub frmLogin_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
If e.Modifiers = Keys.Control And e.KeyCode = Keys.T Then
TESTSYSTEM = Not TESTSYSTEM
@@ -271,6 +271,8 @@ Public Class frmLogin
End Sub
Private Sub btnOK_Click(sender As System.Object, e As System.EventArgs) Handles btnOK.Click
VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG = False
'Auf WARENORT UMSTELLEN

6
Aviso/packages.config
View File

@@ -4,16 +4,18 @@
<package id="cef.redist.x86" version="75.1.14" targetFramework="net47" />
<package id="CefSharp.Common" version="75.1.143" targetFramework="net47" />
<package id="CefSharp.WinForms" version="75.1.143" targetFramework="net47" />
<package id="ClosedXML" version="0.96.0" targetFramework="net47" />
<package id="Common.Logging" version="3.4.1" targetFramework="net47" />
<package id="Common.Logging.Core" version="3.4.1" targetFramework="net47" />
<package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net47" />
<package id="DocumentFormat.OpenXml" version="2.16.0" targetFramework="net47" />
<package id="esendex-dotnet-sdk" version="3.8.0" targetFramework="net47" />
<package id="ExcelNumberFormat" version="1.1.0" targetFramework="net47" />
<package id="GrapeCity.Documents.Common" version="2.2.0.315" targetFramework="net461" />
<package id="GrapeCity.Documents.Imaging" version="2.2.0.315" targetFramework="net461" />
<package id="GrapeCity.Documents.Pdf" version="2.2.0.315" targetFramework="net461" />
<package id="GroupDocs.Viewer" version="19.8.0" targetFramework="net461" />
<package id="itext7" version="7.1.11" targetFramework="net47" />
<package id="Microsoft.CSharp" version="4.0.1" targetFramework="net47" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net47" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net47" />
<package id="Portable.BouncyCastle" version="1.8.5" targetFramework="net47" />
<package id="Spire.PDFViewer" version="4.9.5" targetFramework="net47" />

3
Gemeinsames/Gemeinsames.vbproj
View File

@@ -88,6 +88,9 @@
<PlatformTarget>x64</PlatformTarget>
<OutputPath>bin\x64\Release\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="GrapeCity.ActiveReports">

1
Gemeinsames/My Project/licenses.licx
View File

@@ -1 +0,0 @@
GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff

3
VERAG_TELEINFO/VERAG_TELEINFO.vbproj
View File

@@ -322,9 +322,6 @@
<PackageReference Include="ATAPI">
<Version>2018.3.9</Version>
</PackageReference>
<PackageReference Include="LinphoneSDK.Windows">
<Version>5.2.0-alpha.156</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Folder Include="lib\" />