Skip to content

Commit 8dd303f

Browse files
jenscskigvreddy04
jenscski
and
gvreddy04
authored
Multitarget net6 and net8 (#693)
* Update demo to net8 * Compile BlazorBootstrap for both .NET6 and .NET8. --------- Co-authored-by: Vikram Reddy <[email protected]>
1 parent 0335650 commit 8dd303f

File tree

4 files changed

+56
-52
lines changed

4 files changed

+56
-52
lines changed

‎BlazorBootstrap.Demo.Hosted/Client/BlazorBootstrap.Demo.Hosted.Client.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.15" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.15" PrivateAssets="all" />
12-
<PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
10+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" PrivateAssets="all" />
12+
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎BlazorBootstrap.Demo.Hosted/Server/BlazorBootstrap.Demo.Hosted.Server.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.15" />
10+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.4" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎BlazorBootstrap.Demo.RCL/BlazorBootstrap.Demo.RCL.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
@@ -11,8 +11,8 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.15" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.4" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎blazorbootstrap/BlazorBootstrap.csproj‎

Lines changed: 47 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,55 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

3-
<PropertyGroup>
3+
<PropertyGroup>
44

5-
<PackageId>Blazor.Bootstrap</PackageId>
5+
<PackageId>Blazor.Bootstrap</PackageId>
66
<Version>2.2.1</Version>
7-
<PackageVersion>2.2.1</PackageVersion>
8-
9-
<!--<PackageIconUrl></PackageIconUrl>-->
10-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
11-
<PackageProjectUrl>https://docs.blazorbootstrap.com/</PackageProjectUrl>
12-
<RepositoryUrl>https://github.com/vikramlearning/blazorbootstrap</RepositoryUrl>
13-
<PackageTags>Blazor, WebAssembly, BlazorWebAssembly, Bootstrap, Bootstrap5, BlazorBootstrap, BlazorAlert, BlazorAutoComplete, BlazorButtons, BlazorCallout, BlazorCharts, BlazorConfirmDialog, BlazorGrid, BlazorIcon, BlazorModal, BlazorCurrencyInput, BlazorNumberInput, BlazorInput, BlazorNumber, BlazorDate, BlazorDateInput, BlazorDatePicker, BlazorTime, BlazorTimeInput, BlazorTimePicker, BlazorOffcanvas, BlazorPagination, BlazorPdfViewer, BlazorPlaceholders, BlazorPreload, BlazorProgress, BlazorRibbon, BlazorScriptLoader, BlazorSidebar, BlazorSidebar2, BlazorSortableList, BlazorSwitch, BlazorSpinners, BlazorTabs, BlazorToasts, BlazorTooltips, BlazorTooltips, BlazorBarChart, BlazorDoughnutChart, BlazorLineChart, BlazorPieChart</PackageTags>
14-
<Description>Blazor Bootstrap is a component library built on top of Blazor and Bootstrap5 CSS framework.</Description>
15-
<Authors>Vikram Reddy</Authors>
16-
<!--<Company>your_company</Company>-->
17-
<Copyright>Copyright © 2024 Blazor Bootstrap</Copyright>
18-
19-
<TargetFramework>net6.0</TargetFramework>
20-
<Nullable>enable</Nullable>
21-
<ImplicitUsings>enable</ImplicitUsings>
22-
<OutputType>Library</OutputType>
23-
<IsPackable>true</IsPackable>
24-
<LangVersion>10.0</LangVersion>
25-
<PackageIcon>128X128.png</PackageIcon>
26-
<PackageReadmeFile>README.md</PackageReadmeFile>
27-
<RepositoryType>git</RepositoryType>
28-
<PackageReleaseNotes>https://github.com/vikramlearning/blazorbootstrap/releases</PackageReleaseNotes>
29-
30-
</PropertyGroup>
31-
32-
<ItemGroup>
33-
<None Include="..\nuget\README.md">
34-
<Pack>True</Pack>
35-
<PackagePath>\</PackagePath>
36-
</None>
37-
<None Include="..\BlazorBootstrap.Demo.WebAssembly\wwwroot\images\logo\128X128.png">
38-
<Pack>True</Pack>
39-
<PackagePath>\</PackagePath>
40-
</None>
7+
<PackageVersion>2.2.1</PackageVersion>
8+
9+
<!--<PackageIconUrl></PackageIconUrl>-->
10+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
11+
<PackageProjectUrl>https://docs.blazorbootstrap.com/</PackageProjectUrl>
12+
<RepositoryUrl>https://github.com/vikramlearning/blazorbootstrap</RepositoryUrl>
13+
<PackageTags>Blazor, WebAssembly, BlazorWebAssembly, Bootstrap, Bootstrap5, BlazorBootstrap, BlazorAlert, BlazorAutoComplete, BlazorButtons, BlazorCallout, BlazorCharts, BlazorConfirmDialog, BlazorGrid, BlazorIcon, BlazorModal, BlazorCurrencyInput, BlazorNumberInput, BlazorInput, BlazorNumber, BlazorDate, BlazorDateInput, BlazorDatePicker, BlazorTime, BlazorTimeInput, BlazorTimePicker, BlazorOffcanvas, BlazorPagination, BlazorPdfViewer, BlazorPlaceholders, BlazorPreload, BlazorProgress, BlazorRibbon, BlazorScriptLoader, BlazorSidebar, BlazorSidebar2, BlazorSortableList, BlazorSwitch, BlazorSpinners, BlazorTabs, BlazorToasts, BlazorTooltips, BlazorTooltips, BlazorBarChart, BlazorDoughnutChart, BlazorLineChart, BlazorPieChart</PackageTags>
14+
<Description>Blazor Bootstrap is a component library built on top of Blazor and Bootstrap5 CSS framework.</Description>
15+
<Authors>Vikram Reddy</Authors>
16+
<!--<Company>your_company</Company>-->
17+
<Copyright>Copyright © 2024 Blazor Bootstrap</Copyright>
18+
19+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
20+
<Nullable>enable</Nullable>
21+
<ImplicitUsings>enable</ImplicitUsings>
22+
<OutputType>Library</OutputType>
23+
<IsPackable>true</IsPackable>
24+
<LangVersion>10.0</LangVersion>
25+
<PackageIcon>128X128.png</PackageIcon>
26+
<PackageReadmeFile>README.md</PackageReadmeFile>
27+
<RepositoryType>git</RepositoryType>
28+
<PackageReleaseNotes>https://github.com/vikramlearning/blazorbootstrap/releases</PackageReleaseNotes>
29+
30+
</PropertyGroup>
31+
32+
<ItemGroup>
33+
<None Include="..\nuget\README.md">
34+
<Pack>True</Pack>
35+
<PackagePath>\</PackagePath>
36+
</None>
37+
<None Include="..\BlazorBootstrap.Demo.WebAssembly\wwwroot\images\logo\128X128.png">
38+
<Pack>True</Pack>
39+
<PackagePath>\</PackagePath>
40+
</None>
4141
</ItemGroup>
4242

43-
<ItemGroup>
44-
<SupportedPlatform Include="browser" />
45-
</ItemGroup>
43+
<ItemGroup>
44+
<SupportedPlatform Include="browser" />
45+
</ItemGroup>
46+
47+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
48+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.29" />
49+
</ItemGroup>
4650

47-
<ItemGroup>
48-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.26" />
49-
</ItemGroup>
51+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
52+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.4" />
53+
</ItemGroup>
5054

51-
</Project>
55+
</Project>

0 commit comments

Comments
 (0)