diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b03cd66..6625506 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,9 +2,12 @@ // README at: https://github.com/devcontainers/templates/tree/main/src/dotnet { "name": "C# (.NET)", - "image": "mcr.microsoft.com/devcontainers/dotnet:1.1.6-8.0-jammy", + "image": "mcr.microsoft.com/devcontainers/dotnet:1.3.6-9.0-noble", // Features to add to the dev container. More info: https://containers.dev/features. "features": { + "ghcr.io/devcontainers/features/dotnet:2" : { + "additionalVersions": "9.0.102" + }, "ghcr.io/devcontainers/features/docker-in-docker:2": {} }, // Use 'forwardPorts' to make a list of ports inside the container available locally. diff --git a/Directory.Build.props b/Directory.Build.props index 69ccb6d..1be298d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable disable IDE0005 diff --git a/global.json b/global.json index 0013d0c..ac89485 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.203", + "version": "9.0.102", "rollForward": "feature" } } diff --git a/src/ProjectOrigin.ServiceCommon/Database/DatabaseUpgrader.cs b/src/ProjectOrigin.ServiceCommon/Database/DatabaseUpgrader.cs index 82291ac..6019b20 100644 --- a/src/ProjectOrigin.ServiceCommon/Database/DatabaseUpgrader.cs +++ b/src/ProjectOrigin.ServiceCommon/Database/DatabaseUpgrader.cs @@ -82,19 +82,22 @@ public LoggerWrapper(ILogger logger) _logger = logger; } - public void WriteError(string format, params object[] args) - { - _logger.LogError(format, args); - } + public void LogTrace(string format, params object[] args) => + _logger.LogTrace(format, args); - public void WriteInformation(string format, params object[] args) - { + public void LogDebug(string format, params object[] args) => + _logger.LogDebug(format, args); + + public void LogInformation(string format, params object[] args) => _logger.LogInformation(format, args); - } - public void WriteWarning(string format, params object[] args) - { + public void LogWarning(string format, params object[] args) => _logger.LogWarning(format, args); - } + + public void LogError(string format, params object[] args) => + _logger.LogError(format, args); + + public void LogError(Exception ex, string format, params object[] args) => + _logger.LogError(ex, format, args); } } diff --git a/src/ProjectOrigin.ServiceCommon/ProjectOrigin.ServiceCommon.csproj b/src/ProjectOrigin.ServiceCommon/ProjectOrigin.ServiceCommon.csproj index 757dece..71efa3b 100644 --- a/src/ProjectOrigin.ServiceCommon/ProjectOrigin.ServiceCommon.csproj +++ b/src/ProjectOrigin.ServiceCommon/ProjectOrigin.ServiceCommon.csproj @@ -11,24 +11,24 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + diff --git a/src/ProjectOrigin.TestCommon/ProjectOrigin.TestCommon.csproj b/src/ProjectOrigin.TestCommon/ProjectOrigin.TestCommon.csproj index 000d34c..521f667 100644 --- a/src/ProjectOrigin.TestCommon/ProjectOrigin.TestCommon.csproj +++ b/src/ProjectOrigin.TestCommon/ProjectOrigin.TestCommon.csproj @@ -15,13 +15,13 @@ - - - - - - - + + + + + + + diff --git a/test/ProjectOrigin.ServiceCommon.Tests/ProjectOrigin.ServiceCommon.Tests.csproj b/test/ProjectOrigin.ServiceCommon.Tests/ProjectOrigin.ServiceCommon.Tests.csproj index 40dad6a..a7040f3 100644 --- a/test/ProjectOrigin.ServiceCommon.Tests/ProjectOrigin.ServiceCommon.Tests.csproj +++ b/test/ProjectOrigin.ServiceCommon.Tests/ProjectOrigin.ServiceCommon.Tests.csproj @@ -7,18 +7,18 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - +