Unverified Commit 57404e7b authored by Marius Göcke's avatar Marius Göcke
Browse files

updated dependencies

parent f545c739

Other/Resources/Dependencies/Debian/Version.txt

+1 −1
Original line number Diff line number Diff line 
13.1
 
13.2-slim

SimpleOCR/Other/Build/Build.py

+6 −6
Original line number Diff line number Diff line 
from pathlib import Path

from packaging.version import Version

from ScriptCollection.GeneralUtilities import GeneralUtilities

from ScriptCollection.ImageUpdater import ConcreteImageUpdaterForDebian

from ScriptCollection.TFCPS.Docker.TFCPS_CodeUnitSpecific_Docker import TFCPS_CodeUnitSpecific_Docker_Functions,TFCPS_CodeUnitSpecific_Docker_CLI
@@ -6,12 +7,11 @@ from ScriptCollection.TFCPS.Docker.TFCPS_CodeUnitSpecific_Docker import TFCPS_Co 
 

def build():

    tf:TFCPS_CodeUnitSpecific_Docker_Functions=TFCPS_CodeUnitSpecific_Docker_CLI.parse(__file__)

    concreteImageUpdaterForDebian=ConcreteImageUpdaterForDebian()

    debian_version=GeneralUtilities.read_text_from_file_without_linebreak(GeneralUtilities.resolve_relative_path("../../../../Other/Resources/Dependencies/Debian/Version.txt",str(Path(__file__).absolute())))

    debian_tag:str=concreteImageUpdaterForDebian.version_to_tag(debian_version)

    tf.build(None,{

        "debian":tf._protected_sc.default_fallback_docker_registry,

    debian_tag:str=GeneralUtilities.read_text_from_file_without_linebreak(GeneralUtilities.resolve_relative_path("../../../../Other/Resources/Dependencies/Debian/Version.txt",str(Path(__file__).absolute())))

    tf.build({

        "debianversion":debian_tag,

    },{

        "debian":tf._protected_sc.default_fallback_docker_registry,

    })

    tf.tfcps_Tools_General.merge_sbom_file_from_dependent_codeunit_into_this(tf.get_codeunit_folder(),"SimpleOCR","SimpleOCRService",tf.use_cache())

SimpleOCR/SimpleOCR/Dockerfile

+1 −1
Original line number Diff line number Diff line 
ARG debianversion

ARG CodeUnitVersion

ARG image_debian

FROM ${image_debian}:{debianversion}

FROM ${image_debian}:${debianversion}

LABEL version=${CodeUnitVersion}

ENV ISRUNNINGINCONTAINER="true"

SimpleOCRService/SimpleOCRService/Program.cs

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ namespace SimpleOCR.Service.Core 
                    functionalInformation.WebApplicationBuilder.Services.AddSingleton(functionalInformation.PersistedAPIServerConfiguration.ApplicationSpecificConfiguration.ConfigurationForDLoggingMiddleware);

                    IGeneralLogger logger = functionalInformation.Logger;



                    IAuditLog auditLog = new AuditLog(functionalInformation.InitializationInformation.ApplicationConstants.ExecutionMode.Accept(new GetLoggerVisitor(functionalInformation.PersistedAPIServerConfiguration.ApplicationSpecificConfiguration.AuditLogConfiguration, functionalInformation.InitializationInformation.ApplicationConstants.GetLogFolder(), "AuditLog")));

                    IAuditLog auditLog = new AuditLog(functionalInformation.InitializationInformation.ApplicationConstants.ExecutionMode.Accept(new GetLoggerVisitor(functionalInformation.PersistedAPIServerConfiguration.ApplicationSpecificConfiguration.AuditLogConfiguration, functionalInformation.InitializationInformation.ApplicationConstants.GetLogFolder(), "AuditLog",GRYLog.Create())));

                    functionalInformation.WebApplicationBuilder.Services.AddSingleton<IAuditLog>(auditLog);



                    functionalInformation.WebApplicationBuilder.Services.AddSingleton(functionalInformation.PersistedAPIServerConfiguration.ApplicationSpecificConfiguration.CommonRoutesInformation);
@@ -110,7 +110,7 @@ namespace SimpleOCR.Service.Core 
                    {

                    };

                };

            });

            },GRYLog.Create());

        }

    }

}

SimpleOCRService/SimpleOCRService/SimpleOCRService.csproj

+10 −10
Original line number Diff line number Diff line
@@ -60,23 +60,23 @@ 
    <ItemGroup>

        <PackageReference Include="CommandLineParser" Version="2.9.1" />

        <PackageReference Include="ExtendedXmlSerializer" Version="3.9.6" />

        <PackageReference Include="GRYLibrary" Version="1.0.4" />

        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.1" />

        <PackageReference Include="GRYLibrary" Version="2.0.5" />

        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.2" />

        <PackageReference Include="HtmlAgilityPack" Version="1.12.4" />

        <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />

        <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.9" />

        <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />

        <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="10.0.1" />

        <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="10.0.1" />

        <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="10.0.2" />

        <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="10.0.2" />

        <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />

        <PackageReference Include="prometheus-net" Version="8.2.1" />

        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />

        <PackageReference Include="System.Collections.Immutable" Version="10.0.1" />

        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />

        <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.1" />

        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />

        <PackageReference Include="System.Collections.Immutable" Version="10.0.2" />

        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />

        <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.2" />

        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />

        <PackageReference Include="NJsonSchema" Version="11.5.2" />

        <PackageReference Include="NSwag.AspNetCore" Version="14.6.3" />

        <PackageReference Include="System.Drawing.Common" Version="10.0.1" />

        <PackageReference Include="System.Drawing.Common" Version="10.0.2" />

        <PackageReference Include="System.Reactive" Version="6.1.0" />

        <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />

        <PackageReference Include="Tesseract" Version="5.2.0" />