Skip to content

Commit b15c7bd

Browse files
committed
Upgrade to .NET 10.0 and enhance project maintainability
Updated target frameworks to .NET 10.0 in `BlazorBootstrap.Demo.RCL.csproj` and `BlazorBootstrap.Demo.WebAssembly.csproj`. Upgraded package references to version `10.0.0` of relevant libraries. Enabled HTML asset placeholders in `BlazorBootstrap.Demo.WebAssembly.csproj`. Improved `App.razor` formatting and added preloading and import map support in `index.html`. Introduced cache-busting placeholders for JavaScript files. Removed unused `<Folder>` entry in `BlazorBootstrap.Demo.RCL.csproj` to clean up the project structure.
1 parent 38c99fa commit b15c7bd

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

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

Lines changed: 3 additions & 7 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>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
@@ -11,18 +11,14 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>
1919
<ProjectReference Include="..\blazorbootstrap\BlazorBootstrap.csproj" />
2020
</ItemGroup>
2121

22-
<ItemGroup>
23-
<Folder Include="Components\Pages\Form\EnumInput\" />
24-
</ItemGroup>
25-
2622
<Target Name="EmbedDemos" BeforeTargets="PrepareForBuild">
2723
<!-- Let's embed demos sources into the assembly to show the source at runtime. -->
2824
<ItemGroup>

BlazorBootstrap.Demo.WebAssembly/App.razor

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="new []{ typeof(BlazorBootstrap.Demo.RCL.App).Assembly }">
1+
<Router AppAssembly="@typeof(Program).Assembly"
2+
AdditionalAssemblies="new[] { typeof(BlazorBootstrap.Demo.RCL.App).Assembly }">
23
<Found Context="routeData">
34
<RouteView RouteData="@routeData" DefaultLayout="@typeof(BlazorBootstrap.Demo.RCL.MainLayout)" />
45
<FocusOnNavigate RouteData="@routeData" Selector="h1" />

BlazorBootstrap.Demo.WebAssembly/BlazorBootstrap.Demo.WebAssembly.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
7+
<OverrideHtmlAssetPlaceholders>true</OverrideHtmlAssetPlaceholders>
78
</PropertyGroup>
89

910
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
12-
<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0" PrivateAssets="all" />
13+
<PackageReference Include="System.Net.Http.Json" Version="10.0.0" />
1314
</ItemGroup>
1415

1516
<ItemGroup>

BlazorBootstrap.Demo.WebAssembly/wwwroot/index.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<title>Demos & Examples | Enterprise-class Blazor Bootstrap Component library built on the Blazor and Bootstrap CSS framework | Blazor Bootstrap</title>
88
<base href="/" />
9+
<link rel="preload" id="webassembly" />
910
<link href="images/logo/128X128.png" rel="icon" type="image/png" />
1011
<!-- CSS only -->
1112
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-LN+7fdVzj6u52u30Kp6M/trliBMCMKTyK833zpbD+pXdCLuTusPj697FH4R/5mcr" crossorigin="anonymous">
@@ -35,6 +36,7 @@
3536
y = l.getElementsByTagName(r)[0]; y.parentNode.insertBefore(t, y);
3637
})(window, document, "clarity", "script", "er4vb2d8gr");
3738
</script>
39+
<script type="importmap"></script>
3840
</head>
3941

4042
<body>
@@ -46,15 +48,15 @@
4648
</div>
4749
</div>
4850
</div>
49-
<script src="_framework/blazor.webassembly.js" autostart="false"></script>
51+
<script src="_framework/blazor.webassembly#[.{fingerprint}].js" autostart="false"></script>
5052
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js" integrity="sha384-ndDqU0Gzau9qJ1lfW4pNLlhNTkCfHzAVBReH9diLvGRem5+R9g2FzA8ZGN954O5Q" crossorigin="anonymous"></script>
5153
<!-- Add chart.js reference if chart components are used in your application. -->
5254
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.1/chart.umd.js" integrity="sha512-ZwR1/gSZM3ai6vCdI+LVF1zSq/5HznD3ZSTk7kajkaj4D292NLuduDCO1c/NT8Id+jE58KYLKT7hXnbtryGmMg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
5355
<!-- Add chartjs-plugin-datalabels.min.js reference if chart components with data label feature is used in your application. -->
5456
<script src="https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-datalabels/2.2.0/chartjs-plugin-datalabels.min.js" integrity="sha512-JPcRR8yFa8mmCsfrw4TNte1ZvF1e3+1SdGMslZvmrzDYxS69J7J49vkFL8u6u8PlPJK+H3voElBtUCzaXj+6ig==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
5557
<!-- Add sortable.js reference if SortableList component is used in your application. -->
5658
<script src="https://cdn.jsdelivr.net/npm/sortablejs@latest/Sortable.min.js"></script>
57-
<script src="_content/Blazor.Bootstrap/blazor.bootstrap.js"></script>
59+
<script src="_content/Blazor.Bootstrap/blazor.bootstrap#[.{fingerprint}].js"></script>
5860
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/prism.min.js" integrity="sha512-7Z9J3l1+EYfeaPKcGXu3MS/7T+w19WtKQY/n+xzmw4hZhJ9tyYmcUS+4QqAlzhicE5LAfMQSF3iFTK9bQdTxXg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
5961
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/plugins/autoloader/prism-autoloader.min.js" integrity="sha512-SkmBfuA2hqjzEVpmnMt/LINrjop3GKWqsuLSSB3e7iBmYK7JuWw4ldmmxwD9mdm2IRTTi0OxSAfEGvgEi0i2Kw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
6062
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.29.0/plugins/custom-class/prism-custom-class.min.js" integrity="sha512-7uKPAecn+SrAT5xVovlVdFCkXTM9LzNzjaK3yzb3ht22SwjnUTjWHNAp7dq3OPFmPb+DCAFjWnDT8Qrf256GeQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>

0 commit comments

Comments
 (0)