Skip to content

Commit

Permalink
Support net8 (#50)
Browse files Browse the repository at this point in the history
* NET8 Support

* Bump to v2.0.0
David-Moreira authored Nov 15, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 9e58831 commit de24aa1
Showing 5 changed files with 20 additions and 15 deletions.
8 changes: 4 additions & 4 deletions sample/Demo/Demo.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
<PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
12 changes: 6 additions & 6 deletions sample/DemoAuth/DemoAuth.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<UserSecretsId>aspnet-WebApplication2-BE3CB597-3006-40BA-9FE0-C651562C4A99</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
2 changes: 1 addition & 1 deletion sample/DemoServer/DemoServer.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
9 changes: 7 additions & 2 deletions src/XTabs/BlazorXTabs.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
@@ -32,12 +32,17 @@
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
</ItemGroup>

<PropertyGroup>
</PropertyGroup>

<PropertyGroup>
<PackageId>BlazorXTabs</PackageId>
<Version>1.9.0</Version>
<Version>2.0.0</Version>
<Authors>David Moreira</Authors>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<ProjectUrl>https://github.com/David-Moreira/XTabs</ProjectUrl>
4 changes: 2 additions & 2 deletions src/XTabs/XTabs.razor
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
</div>

<div class="xtabs-content tab-content">
@if ( RenderMode == RenderMode.Full )
@if ( RenderMode == BlazorXTabs.Configuration.RenderMode.Full )
{
@foreach ( var tab in TabContent )
{
@@ -65,7 +65,7 @@
}
}

@if ( RenderMode == RenderMode.Steps )
@if ( RenderMode == BlazorXTabs.Configuration.RenderMode.Steps )
{
<div class="xtabs-steps-buttons d-flex justify-content-center mb-1">
@if ( PreviousStepsContent is object )

0 comments on commit de24aa1

Please sign in to comment.