diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 23900ab7..62d11cab 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -3,6 +3,7 @@ name: Build env: DOTNET_NOLOGO: true DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_ENVIRONMENT: github ASPNETCORE_ENVIRONMENT: github BUILD_PATH: '${{github.workspace}}/artifacts' COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} @@ -41,12 +42,12 @@ jobs: with: fetch-depth: 0 - - name: Install .NET Core + - name: Install .NET uses: actions/setup-dotnet@v3 with: dotnet-version: | 6.0.x - 7.0.x + 8.0.x - name: Restore Dependencies run: dotnet restore @@ -55,21 +56,14 @@ jobs: run: dotnet build --no-restore --configuration Release - name: Run Test - run: dotnet test --configuration Release --collect:"XPlat Code Coverage" --settings coverlet.runsettings - - - name: Generate Coverage - uses: danielpalme/ReportGenerator-GitHub-Action@5.1.24 - with: - reports: '${{github.workspace}}/test/*/TestResults/*/coverage.info' - targetdir: ${{env.BUILD_PATH}} - reporttypes: lcov + run: dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --settings coverlet.runsettings - name: Report Coverage if: success() uses: coverallsapp/github-action@v2 with: - file: artifacts/lcov.info - format: lcov + file: "${{github.workspace}}/test/*/TestResults/*/coverage.info" + format: lcov - name: Create Packages if: success() && github.event_name != 'pull_request' diff --git a/sample/Tracker/Tracker.Core/Data/Entities/Priority.cs b/sample/Tracker/Tracker.Core/Data/Entities/Priority.cs index 88d76070..561a6c9a 100644 --- a/sample/Tracker/Tracker.Core/Data/Entities/Priority.cs +++ b/sample/Tracker/Tracker.Core/Data/Entities/Priority.cs @@ -108,7 +108,7 @@ public Priority() /// Gets or sets the navigation collection for entity . /// /// - /// The the navigation collection for entity . + /// The navigation collection for entity . /// public virtual ICollection Tasks { get; set; } diff --git a/sample/Tracker/Tracker.Core/Data/Entities/Role.cs b/sample/Tracker/Tracker.Core/Data/Entities/Role.cs index f956fa03..825db086 100644 --- a/sample/Tracker/Tracker.Core/Data/Entities/Role.cs +++ b/sample/Tracker/Tracker.Core/Data/Entities/Role.cs @@ -91,7 +91,7 @@ public Role() /// Gets or sets the navigation collection for entity . /// /// - /// The the navigation collection for entity . + /// The navigation collection for entity . /// public virtual ICollection UserRoles { get; set; } diff --git a/sample/Tracker/Tracker.Core/Data/Entities/Status.cs b/sample/Tracker/Tracker.Core/Data/Entities/Status.cs index 0b4e1edd..8022cf3d 100644 --- a/sample/Tracker/Tracker.Core/Data/Entities/Status.cs +++ b/sample/Tracker/Tracker.Core/Data/Entities/Status.cs @@ -107,7 +107,7 @@ public Status() /// Gets or sets the navigation collection for entity . /// /// - /// The the navigation collection for entity . + /// The navigation collection for entity . /// public virtual ICollection Tasks { get; set; } diff --git a/sample/Tracker/Tracker.Core/Data/Entities/Task.cs b/sample/Tracker/Tracker.Core/Data/Entities/Task.cs index 0c9cbc73..584f7029 100644 --- a/sample/Tracker/Tracker.Core/Data/Entities/Task.cs +++ b/sample/Tracker/Tracker.Core/Data/Entities/Task.cs @@ -146,7 +146,7 @@ public Task() /// Gets or sets the navigation property for entity . /// /// - /// The the navigation property for entity . + /// The navigation property for entity . /// /// public virtual User? AssignedUser { get; set; } @@ -155,7 +155,7 @@ public Task() /// Gets or sets the navigation property for entity . /// /// - /// The the navigation property for entity . + /// The navigation property for entity . /// /// public virtual Priority? Priority { get; set; } @@ -164,7 +164,7 @@ public Task() /// Gets or sets the navigation property for entity . /// /// - /// The the navigation property for entity . + /// The navigation property for entity . /// /// public virtual Status Status { get; set; } = null!; @@ -173,7 +173,7 @@ public Task() /// Gets or sets the navigation property for entity . /// /// - /// The the navigation property for entity . + /// The navigation property for entity . /// /// public virtual TaskExtended TaskExtended { get; set; } = null!; @@ -182,7 +182,7 @@ public Task() /// Gets or sets the navigation property for entity . /// /// - /// The the navigation property for entity . + /// The navigation property for entity . /// /// public virtual Tenant Tenant { get; set; } = null!; diff --git a/sample/Tracker/Tracker.Core/Data/Entities/TaskExtended.cs b/sample/Tracker/Tracker.Core/Data/Entities/TaskExtended.cs index 94c04e67..f6ae27f0 100644 --- a/sample/Tracker/Tracker.Core/Data/Entities/TaskExtended.cs +++ b/sample/Tracker/Tracker.Core/Data/Entities/TaskExtended.cs @@ -98,7 +98,7 @@ public TaskExtended() /// Gets or sets the navigation property for entity . /// /// - /// The the navigation property for entity . + /// The navigation property for entity . /// /// public virtual Task Task { get; set; } = null!; diff --git a/sample/Tracker/Tracker.Core/Data/Entities/Tenant.cs b/sample/Tracker/Tracker.Core/Data/Entities/Tenant.cs index bfe4875c..39903697 100644 --- a/sample/Tracker/Tracker.Core/Data/Entities/Tenant.cs +++ b/sample/Tracker/Tracker.Core/Data/Entities/Tenant.cs @@ -99,7 +99,7 @@ public Tenant() /// Gets or sets the navigation collection for entity . /// /// - /// The the navigation collection for entity . + /// The navigation collection for entity . /// public virtual ICollection Tasks { get; set; } diff --git a/sample/Tracker/Tracker.Core/Data/Entities/User.cs b/sample/Tracker/Tracker.Core/Data/Entities/User.cs index 58e5dc6e..9f40bf96 100644 --- a/sample/Tracker/Tracker.Core/Data/Entities/User.cs +++ b/sample/Tracker/Tracker.Core/Data/Entities/User.cs @@ -165,7 +165,7 @@ public User() /// Gets or sets the navigation collection for entity . /// /// - /// The the navigation collection for entity . + /// The navigation collection for entity . /// public virtual ICollection AssignedTasks { get; set; } @@ -173,7 +173,7 @@ public User() /// Gets or sets the navigation collection for entity . /// /// - /// The the navigation collection for entity . + /// The navigation collection for entity . /// public virtual ICollection UserLogins { get; set; } @@ -181,7 +181,7 @@ public User() /// Gets or sets the navigation collection for entity . /// /// - /// The the navigation collection for entity . + /// The navigation collection for entity . /// public virtual ICollection UserRoles { get; set; } diff --git a/sample/Tracker/Tracker.Core/Data/Entities/UserLogin.cs b/sample/Tracker/Tracker.Core/Data/Entities/UserLogin.cs index 556578bc..549abdb0 100644 --- a/sample/Tracker/Tracker.Core/Data/Entities/UserLogin.cs +++ b/sample/Tracker/Tracker.Core/Data/Entities/UserLogin.cs @@ -162,7 +162,7 @@ public UserLogin() /// Gets or sets the navigation property for entity . /// /// - /// The the navigation property for entity . + /// The navigation property for entity . /// /// public virtual User? User { get; set; } diff --git a/sample/Tracker/Tracker.Core/Data/Entities/UserRole.cs b/sample/Tracker/Tracker.Core/Data/Entities/UserRole.cs index cef891b9..dbc01941 100644 --- a/sample/Tracker/Tracker.Core/Data/Entities/UserRole.cs +++ b/sample/Tracker/Tracker.Core/Data/Entities/UserRole.cs @@ -41,7 +41,7 @@ public UserRole() /// Gets or sets the navigation property for entity . /// /// - /// The the navigation property for entity . + /// The navigation property for entity . /// /// public virtual Role Role { get; set; } = null!; @@ -50,7 +50,7 @@ public UserRole() /// Gets or sets the navigation property for entity . /// /// - /// The the navigation property for entity . + /// The navigation property for entity . /// /// public virtual User User { get; set; } = null!; diff --git a/sample/Tracker/Tracker.Core/Tracker.Core.csproj b/sample/Tracker/Tracker.Core/Tracker.Core.csproj index 0450c677..7abee753 100644 --- a/sample/Tracker/Tracker.Core/Tracker.Core.csproj +++ b/sample/Tracker/Tracker.Core/Tracker.Core.csproj @@ -1,15 +1,15 @@ - net6.0 + net8.0 enable false - - + + diff --git a/sample/Tracker/Tracker.Database/Tracker.Database.csproj b/sample/Tracker/Tracker.Database/Tracker.Database.csproj index 24aeed60..9f5fd378 100644 --- a/sample/Tracker/Tracker.Database/Tracker.Database.csproj +++ b/sample/Tracker/Tracker.Database/Tracker.Database.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 false @@ -15,9 +15,9 @@ - - - + + + diff --git a/sample/Tracker/Tracker.Scaffold/Tracker.Scaffold.csproj b/sample/Tracker/Tracker.Scaffold/Tracker.Scaffold.csproj index de3e71e0..6758f12f 100644 --- a/sample/Tracker/Tracker.Scaffold/Tracker.Scaffold.csproj +++ b/sample/Tracker/Tracker.Scaffold/Tracker.Scaffold.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable false @@ -12,7 +12,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/sample/Tracker/Tracker.Web/Tracker.Web.csproj b/sample/Tracker/Tracker.Web/Tracker.Web.csproj index 38e4a432..00c1aae9 100644 --- a/sample/Tracker/Tracker.Web/Tracker.Web.csproj +++ b/sample/Tracker/Tracker.Web/Tracker.Web.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 984ef0cf-2b22-4fd1-876d-e01499da4c1f false diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e406f088..5642ac00 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -35,7 +35,7 @@ - + diff --git a/src/EntityFrameworkCore.Generator.Core/EntityFrameworkCore.Generator.Core.csproj b/src/EntityFrameworkCore.Generator.Core/EntityFrameworkCore.Generator.Core.csproj index 4cb9e315..cc040c59 100644 --- a/src/EntityFrameworkCore.Generator.Core/EntityFrameworkCore.Generator.Core.csproj +++ b/src/EntityFrameworkCore.Generator.Core/EntityFrameworkCore.Generator.Core.csproj @@ -1,20 +1,32 @@ - net6.0 + net6.0;net8.0 EntityFrameworkCore.Generator 1591,EF1001 - - - + + + + + + + + + + + + + + + + + + + + - - - - - diff --git a/src/EntityFrameworkCore.Generator/EntityFrameworkCore.Generator.csproj b/src/EntityFrameworkCore.Generator/EntityFrameworkCore.Generator.csproj index e29e53ab..4a08c3b0 100644 --- a/src/EntityFrameworkCore.Generator/EntityFrameworkCore.Generator.csproj +++ b/src/EntityFrameworkCore.Generator/EntityFrameworkCore.Generator.csproj @@ -1,16 +1,16 @@ Exe - net6.0 + net6.0;net8.0 efg true 1591,EF1001 - - - + + + diff --git a/test/EntityFrameworkCore.Generator.Core.Tests/EntityFrameworkCore.Generator.Core.Tests.csproj b/test/EntityFrameworkCore.Generator.Core.Tests/EntityFrameworkCore.Generator.Core.Tests.csproj index 67f169d7..2974bc5d 100644 --- a/test/EntityFrameworkCore.Generator.Core.Tests/EntityFrameworkCore.Generator.Core.Tests.csproj +++ b/test/EntityFrameworkCore.Generator.Core.Tests/EntityFrameworkCore.Generator.Core.Tests.csproj @@ -22,13 +22,13 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers