Skip to content

Commit

Permalink
feat: .net8.0 LTS release support (#770)
Browse files Browse the repository at this point in the history
* feat: .net8.0 LTS release support

* Pin setup-dotnet step to version 8.0.x

* Change dotnet-setup step to use version wildcard

---------

Co-authored-by: Paul Czywczynski <paul@djanno.com>
  • Loading branch information
paulczy and Paul Czywczynski committed Nov 16, 2023
1 parent be83d01 commit d7f08f9
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 22 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Expand Up @@ -9,16 +9,15 @@ jobs:
build-and-test:
strategy:
matrix:
dotnet: ["6.0", "7.0", "8.0"]
dotnet: ['6.0.x', '7.0.x', '8.0.x']
os: [ubuntu-latest, windows-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- name: checkout repo
uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
with:
dotnet-version: "8.0.100-preview.7.23376.3"

dotnet-version: '8.0.x'
- name: build
run: dotnet build
- name: test Finbuckle.MultiTenant
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nuget-push-public.yml
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
with:
dotnet-version: "8.0.100-preview.7.23376.3"
dotnet-version: "8.0.x"
- name: Create the package
run: dotnet test -c Release && dotnet pack --no-build -c Release --output nupkgs
- name: Publish the package to NuGet.org
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
with:
dotnet-version: "8.0.100-preview.7.23376.3"
dotnet-version: "8.0.x"
- uses: actions/setup-node@v3
with:
node-version: 18
Expand Down
Expand Up @@ -16,7 +16,7 @@
<When Condition=" '$(TargetFramework)' == 'net8.0' ">
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0-*" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
</ItemGroup>
</When>
<When Condition=" '$(TargetFramework)' == 'net7.0' ">
Expand Down
Expand Up @@ -15,9 +15,9 @@
<Choose>
<When Condition=" '$(TargetFramework)' == 'net8.0' ">
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0-*" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.0-*" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0-*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
</ItemGroup>
</When>
<When Condition=" '$(TargetFramework)' == 'net7.0' ">
Expand Down
14 changes: 7 additions & 7 deletions src/Finbuckle.MultiTenant/Finbuckle.MultiTenant.csproj
Expand Up @@ -14,13 +14,13 @@
<Choose>
<When Condition=" '$(TargetFramework)' == 'net8.0' ">
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0-*" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-*" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0-*" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-*" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0-*" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-*" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0-*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
</ItemGroup>
</When>
<When Condition=" '$(TargetFramework)' == 'net7.0' ">
Expand Down
Expand Up @@ -13,7 +13,7 @@
<When Condition=" '$(TargetFramework)' == 'net8.0' ">
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.*-*" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.*" />
</ItemGroup>
</When>
<When Condition=" '$(TargetFramework)' == 'net7.0' ">
Expand Down
Expand Up @@ -13,8 +13,8 @@
<Choose>
<When Condition=" '$(TargetFramework)' == 'net8.0' ">
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.*-*" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.*-*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.*" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.*" />
</ItemGroup>
</When>
<When Condition=" '$(TargetFramework)' == 'net7.0' ">
Expand Down
Expand Up @@ -12,9 +12,9 @@
<Choose>
<When Condition=" '$(TargetFramework)' == 'net8.0' ">
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.*-*" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.*-*" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.*-*" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.*" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.*" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.*" />
</ItemGroup>
</When>
<When Condition=" '$(TargetFramework)' == 'net7.0' ">
Expand Down

0 comments on commit d7f08f9

Please sign in to comment.