Skip to content

Commit

Permalink
chore: remove eol net7 target
Browse files Browse the repository at this point in the history
  • Loading branch information
ascott18 committed May 30, 2024
1 parent 7a2aa36 commit eb9db37
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 25 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/part-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ jobs:
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
include-prerelease: true

Expand Down Expand Up @@ -128,7 +127,6 @@ jobs:
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
include-prerelease: true

Expand All @@ -152,7 +150,6 @@ jobs:
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
include-prerelease: true

Expand Down
4 changes: 2 additions & 2 deletions docs/stacks/agnostic/generation.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ Coalesce's code generation is ran via a dotnet CLI tool, ``dotnet coalesce``. In
``` xml
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<!-- Necessary to use DotNetCliToolReference with modern framework versions -->
<DotnetCliToolTargetFramework>net7.0</DotnetCliToolTargetFramework>
<DotnetCliToolTargetFramework>net8.0</DotnetCliToolTargetFramework>
</PropertyGroup>

...
Expand Down
14 changes: 2 additions & 12 deletions playground/Coalesce.Domain/Coalesce.Domain.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<!-- All these frameworks are included for testing code generation.
Override the used framework by specifying (framework: "tfm") in coalesce.json. -->
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand All @@ -13,21 +13,11 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.*" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.*" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.*-*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.*-*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.*-*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Common.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
</PropertyGroup>
</Project>
5 changes: 1 addition & 4 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,8 @@
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<DotNetPackageVersionSpec>6.0.*</DotNetPackageVersionSpec>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
<DotNetPackageVersionSpec>7.0.*</DotNetPackageVersionSpec>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<DotNetPackageVersionSpec>8.0.*-*</DotNetPackageVersionSpec>
<DotNetPackageVersionSpec>8.0.6</DotNetPackageVersionSpec>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[6.101.2, 7.0.0)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[7.101.2, 8.0.0)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[8.101.2, 9.0.0)" />
</ItemGroup>
Expand Down

0 comments on commit eb9db37

Please sign in to comment.