From ddc245f323f650dc4e76c462ea1a5a83c18c449b Mon Sep 17 00:00:00 2001 From: Paul Welter Date: Wed, 13 Nov 2024 14:22:09 -0600 Subject: [PATCH] .net 9.0 --- .github/dependabot.yml | 2 ++ .github/workflows/merge.yml | 1 - EntityFrameworkCore.Generator.sln | 2 ++ .../Tracker/Tracker.Core/Tracker.Core.csproj | 2 +- .../Tracker.Scaffold/Tracker.Scaffold.csproj | 4 +-- .../EntityFrameworkCore.Generator.Core.csproj | 26 ++++++++-------- .../DatabaseFixture.cs | 31 +++++++++++++++---- 7 files changed, 45 insertions(+), 23 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fa8c583b..c3dc7ad0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,6 +15,8 @@ updates: time: "02:00" timezone: "America/Chicago" open-pull-requests-limit: 10 + ignore: + - dependency-name: "Microsoft.CodeAnalysis.CSharp.Scripting" groups: Azure: patterns: diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 491b8fca..c52640d1 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -18,7 +18,6 @@ jobs: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Dependabot Auto-Merge PRs - if: steps.metadata.outputs.update-type == 'version-update:semver-patch' run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} diff --git a/EntityFrameworkCore.Generator.sln b/EntityFrameworkCore.Generator.sln index 5b00fe7c..01d20eb1 100644 --- a/EntityFrameworkCore.Generator.sln +++ b/EntityFrameworkCore.Generator.sln @@ -13,8 +13,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFrameworkCore.Generat EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{6A18343D-8DEC-4FCC-861E-FA8312E25153}" ProjectSection(SolutionItems) = preProject + .github\dependabot.yml = .github\dependabot.yml src\Directory.Build.props = src\Directory.Build.props .github\workflows\dotnet.yml = .github\workflows\dotnet.yml + .github\workflows\merge.yml = .github\workflows\merge.yml README.md = README.md EndProjectSection EndProject diff --git a/sample/Tracker/Tracker.Core/Tracker.Core.csproj b/sample/Tracker/Tracker.Core/Tracker.Core.csproj index 9e96f476..793a5674 100644 --- a/sample/Tracker/Tracker.Core/Tracker.Core.csproj +++ b/sample/Tracker/Tracker.Core/Tracker.Core.csproj @@ -10,7 +10,7 @@ - + diff --git a/sample/Tracker/Tracker.Scaffold/Tracker.Scaffold.csproj b/sample/Tracker/Tracker.Scaffold/Tracker.Scaffold.csproj index 77af7fd3..aa186ede 100644 --- a/sample/Tracker/Tracker.Scaffold/Tracker.Scaffold.csproj +++ b/sample/Tracker/Tracker.Scaffold/Tracker.Scaffold.csproj @@ -8,11 +8,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/EntityFrameworkCore.Generator.Core/EntityFrameworkCore.Generator.Core.csproj b/src/EntityFrameworkCore.Generator.Core/EntityFrameworkCore.Generator.Core.csproj index 2f6b6e8b..e2282d33 100644 --- a/src/EntityFrameworkCore.Generator.Core/EntityFrameworkCore.Generator.Core.csproj +++ b/src/EntityFrameworkCore.Generator.Core/EntityFrameworkCore.Generator.Core.csproj @@ -6,20 +6,20 @@ - - - - - - - - - - - - + + + + + + + + + + + - + + diff --git a/test/EntityFrameworkCore.Generator.Core.Tests/DatabaseFixture.cs b/test/EntityFrameworkCore.Generator.Core.Tests/DatabaseFixture.cs index b67bff96..5601f2bb 100644 --- a/test/EntityFrameworkCore.Generator.Core.Tests/DatabaseFixture.cs +++ b/test/EntityFrameworkCore.Generator.Core.Tests/DatabaseFixture.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Reflection; using System.Text; @@ -88,22 +88,41 @@ public void Dispose() } - public void WriteInformation(string format, params object[] args) + public void LogDebug(string format, params object[] args) + { + _logger.Write("DEBUG : "); + _logger.WriteLine(format, args); + } + + public void LogError(string format, params object[] args) + { + _logger.Write("ERROR : "); + _logger.WriteLine(format, args); + } + + public void LogError(Exception ex, string format, params object[] args) + { + _logger.Write("ERROR : "); + _logger.WriteLine(format, args); + _logger.WriteLine(ex.ToString()); + } + + public void LogInformation(string format, params object[] args) { _logger.Write("INFO : "); _logger.WriteLine(format, args); } - public void WriteError(string format, params object[] args) + public void LogTrace(string format, params object[] args) { - _logger.Write("ERROR: "); + _logger.Write("TRACE : "); _logger.WriteLine(format, args); } - public void WriteWarning(string format, params object[] args) + public void LogWarning(string format, params object[] args) { _logger.Write("WARN : "); _logger.WriteLine(format, args); } -} \ No newline at end of file +}