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

Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

Browse Source
This commit is contained in:
d.breimaier
2024-04-22 09:45:10 +02:00
parent f8f99fe68b 80f9b1385c
commit 62b35fb9f1
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aviso/App.config
View File

@@ -67,6 +67,10 @@
<assemblyIdentity name="DocumentFormat.OpenXml" publicKeyToken="8fb06cb64d019a17" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.7.2.0" newVersion="2.7.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

18
Aviso/Aviso.vbproj
View File

@@ -147,10 +147,6 @@
<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="DAKOSY_Worker, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\ADMIN\ADMIN\DAKOSY_Worker\bin\Debug\DAKOSY_Worker.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>
@@ -240,6 +236,9 @@
<Reference Include="Microsoft.AspNetCore.Http.Abstractions">
<HintPath>..\..\..\dll\ASP.NET\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Extensions.Configuration">
<HintPath>..\..\..\dll\ASP.NET\Microsoft.Extensions.Configuration.dll</HintPath>
@@ -319,11 +318,14 @@
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization.Formatters.Soap" />
<Reference Include="System.Security" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
@@ -1466,6 +1468,10 @@
<None Include="Resources\Versionsinfo.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\ADMIN\ADMIN\DAKOSY_Worker\DAKOSY_Worker_lib.vbproj">
<Project>{50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f}</Project>
<Name>DAKOSY_Worker_lib</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>

4
Aviso/packages.config
View File

@@ -13,6 +13,7 @@
<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.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net47" />
<package id="Microsoft.CSharp" version="4.0.1" targetFramework="net47" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net47" />
<package id="Portable.BouncyCastle" version="1.8.5" targetFramework="net47" />
@@ -22,6 +23,7 @@
<package id="System.IO.Packaging" version="4.0.0" targetFramework="net47" />
<package id="System.Memory" version="4.5.0" targetFramework="net461" />
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net47" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net47" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages>

8
Gemeinsames/Gemeinsames.vbproj
View File

@@ -96,10 +96,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="DAKOSY_Worker, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\ADMIN\ADMIN\DAKOSY_Worker\bin\Debug\DAKOSY_Worker.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports">
<HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.dll</HintPath>
</Reference>
@@ -310,6 +306,10 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\ADMIN\ADMIN\DAKOSY_Worker\DAKOSY_Worker_lib.vbproj">
<Project>{50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f}</Project>
<Name>DAKOSY_Worker_lib</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>