Skip to content

Commit b24e2d8

Browse files
ArgoZhangArgoZhang
committed
Merge branch 'pack'
2 parents 525a4ec + c0e8878 commit b24e2d8

File tree

132 files changed

+5064
-3599
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+5064
-3599
lines changed

‎.github/workflows/auto-pull-request-checks.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
dotnet test test/UnitTest --collect:"XPlat Code Coverage"
2626
2727
- name: Upload to Codecov
28-
uses: codecov/codecov-action@v4
28+
uses: codecov/codecov-action@v5
2929
with:
3030
token: ${{ secrets.CODECOV_TOKEN }}
31+
flags: BB

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
dotnet test test/UnitTest --collect:"XPlat Code Coverage"
3333
3434
- name: Upload to Codecov
35-
uses: codecov/codecov-action@v4
35+
uses: codecov/codecov-action@v5
3636
with:
3737
token: ${{ secrets.CODECOV_TOKEN }}
3838

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,3 +381,6 @@ src/**/wwwroot/**/uploader
381381
**/BootstrapBlazor/wwwroot/css/sweetalert2.css
382382
**/BootstrapBlazor/wwwroot/css/motronic.min.css
383383
**/BootstrapBlazor/wwwroot/css/nano.min.css
384+
385+
# Bootstrap
386+
**/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js

‎exclusion.dic‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,7 @@ inputmode
114114
Totp
115115
otpauth
116116
Hotp
117+
univer
118+
rdkit
119+
webkitdirectory
120+
dotx

‎src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<PackageReference Include="BootstrapBlazor.Html2Image" Version="9.0.2" />
4444
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="9.0.2" />
4545
<PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.3" />
46-
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="9.0.0" />
46+
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="9.0.3" />
4747
<PackageReference Include="BootstrapBlazor.IP2Region" Version="9.0.1" />
4848
<PackageReference Include="BootstrapBlazor.JitsiMeet" Version="9.0.0" />
4949
<PackageReference Include="BootstrapBlazor.JuHeIpLocatorProvider" Version="9.0.0" />
@@ -58,6 +58,7 @@
5858
<PackageReference Include="BootstrapBlazor.OctIcon" Version="9.0.4" />
5959
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.1" />
6060
<PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.1" />
61+
<PackageReference Include="BootstrapBlazor.PdfViewer" Version="9.0.3" />
6162
<PackageReference Include="BootstrapBlazor.Player" Version="9.0.1" />
6263
<PackageReference Include="BootstrapBlazor.RDKit" Version="9.0.2" />
6364
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.1" />

‎src/BootstrapBlazor.Server/Components/Components/InstallContent.razor‎

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
11
@using Microsoft.Extensions.DependencyInjection
22
@inject PackageVersionService VersionManager
33
@inject IStringLocalizer<InstallContent> Localizer
4-
5-
<h3>@Title</h3>
6-
7-
<h4>@Localizer["Heading"]</h4>
84
@inject IOptionsMonitor<WebsiteOptions> WebsiteOption
95

10-
<p>@Localizer["P1"]</p>
11-
<ul class="ul-demo">
12-
<li><code>visual studio</code> @Localizer["P2"]</li>
13-
<li><code>net5</code> @Localizer["P3"] <code>net6</code> <code>net7</code></li>
14-
</ul>
15-
<p><code>BootstrapBlazor</code> @Localizer["P4"] <code>NET6/NET7/NET8/NET9</code></p>
16-
17-
<h4>@Localizer["P5"]</h4>
6+
<h3>@Title</h3>
187

19-
<p>@Localizer["P6"] <a href="template">[@Localizer["P7"]]</a> @Localizer["P8"]</p>
8+
<h5>@Localizer["P5"]</h5>
9+
<p>@((MarkupString)Localizer["InstallByTemplate"].Value)</p>
2010

21-
<h4>@Localizer["P9"]</h4>
11+
<h5 class="code-label">@Localizer["P9"]</h5>
2212

23-
<h5>@Localizer["P10"]</h5>
13+
<p class="code-label">@Localizer["P10"]</p>
2414
<p class="code-label">1. @Localizer["P11"]</p>
2515
<p class="code-label">2. @Localizer["P12"]</p>
2616
<p class="code-label">3. @Localizer["P13"] <b>Blazor App</b> @Localizer["P14"] <b>@Localizer["P15"]</b>, @Localizer["P16"] <b>Create</b></p>
@@ -54,7 +44,7 @@
5444
&lt;link href="BlazorApp1.styles.css" rel="stylesheet"&gt;
5545
&lt;/head&gt;</Pre>
5646

57-
<p class="code-label">4. @Localizer["P25"]</p>
47+
<p class="code-label">4. @((MarkupString)Localizer["P25"].Value)</p>
5848
@ScriptsTemplate
5949
<Pre>&lt;body&gt;
6050
...
@@ -68,25 +58,11 @@
6858
@ServicesTemplate
6959

7060
<p class="code-label">6. @Localizer["P28"]</p>
71-
<p>@Localizer["P29"] <code>~/_Imports.razor</code> @Localizer["P30"] <code>Razor</code> @Localizer["P31"]</p>
61+
<p>@Localizer["P29"] <code>_Imports.razor</code> @Localizer["P30"] <code>Razor</code> @Localizer["P31"]</p>
7262
<Pre><b>@@using BootstrapBlazor.Components</b></Pre>
7363

74-
<p class="code-label">7. @Localizer["P32"] <code>BootstrapBlazorRoot</code> @Localizer["P33"] <code>~/App.razor</code> @Localizer["P34"]</p>
75-
<Pre>&lt;BootstrapBlazorRoot&gt;
76-
&lt;Router AppAssembly="@@typeof(App).Assembly"&gt;
77-
&lt;Found Context="routeData"&gt;
78-
&lt;PageTitle&gt;Title&lt;/PageTitle&gt;
79-
&lt;RouteView RouteData="@@routeData" DefaultLayout="@@typeof(MainLayout)" /&gt;
80-
&lt;FocusOnNavigate RouteData="@@routeData" Selector="h1" /&gt;
81-
&lt;/Found&gt;
82-
&lt;NotFound&gt;
83-
&lt;PageTitle&gt;Not found&lt;/PageTitle&gt;
84-
&lt;LayoutView Layout="@@typeof(MainLayout)"&gt;
85-
&lt;p&gt; @Localizer["P35"] ...&lt;/p&gt;
86-
&lt;/LayoutView&gt;
87-
&lt;/NotFound&gt;
88-
&lt;/Router&gt;
89-
&lt;/BootstrapBlazorRoot&gt;</Pre>
64+
<p class="code-label">7. @((MarkupString)Localizer["AddRootText"].Value)</p>
65+
@RootTemplate
9066

9167
<h5>@Localizer["P36"]</h5>
9268
<p>@Localizer["P37"] <code>BootstrapBlazor</code> @Localizer["P38"]：</p>

‎src/BootstrapBlazor.Server/Components/Components/InstallContent.razor.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ public sealed partial class InstallContent
5151
[Parameter]
5252
public RenderFragment? ServicesTemplate { get; set; }
5353

54+
/// <summary>
55+
///
56+
/// </summary>
57+
[Parameter]
58+
public RenderFragment? RootTemplate { get; set; }
59+
5460
/// <summary>
5561
///
5662
/// </summary>

‎src/BootstrapBlazor.Server/Components/Layout/TutorialsNavMenu.razor.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ protected override async Task OnInitializedAsync()
8080
Template = CreateDownloadButtonComponent("template4", _template4),
8181
Text = "Template 4",
8282
Url = "tutorials/template4"
83+
},
84+
new()
85+
{
86+
Template = CreateDownloadButtonComponent("template5", _template5),
87+
Text = "Template 5",
88+
Url = "/tutorials/template5"
8389
}
8490
]
8591
},
@@ -215,6 +221,14 @@ .. _layoutFileList
215221
.. _layoutFileList
216222
];
217223

224+
private readonly string[] _template5 =
225+
[
226+
"Tutorials/LoginAndRegister/Template5.razor",
227+
"Tutorials/LoginAndRegister/Template5.razor.css",
228+
"../Layout/TutorialsLayout.razor",
229+
"../Layout/TutorialsLayout.razor.css"
230+
];
231+
218232
private readonly string[] _waterfallFileList =
219233
[
220234
"Tutorials/Waterfall.razor",

‎src/BootstrapBlazor.Server/Components/Pages/Install_Maui.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ return builder.Build();
7777
<p>@Localizer["P24"] <code>~/_Imports.razor</code> @Localizer["P25"] <code>Razor</code> @Localizer["P26"]</p>
7878
<Pre><b>@@using BootstrapBlazor.Components</b></Pre>
7979

80-
<p class="code-label">@Localizer["P27"] <code>BootstrapBlazorRoot</code> @Localizer["P28"] <code>~/Components/Routes.razor</code> @Localizer["P29"]</p>
80+
<p class="code-label">@((MarkupString)Localizer["AddRootText"].Value)</p>
8181
<Pre>&lt;BootstrapBlazorRoot&gt;
8282
&lt;Router AppAssembly="@@typeof(App).Assembly"&gt;
8383
&lt;Found Context="routeData"&gt;

‎src/BootstrapBlazor.Server/Components/Pages/Install_Server.razor‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@
99
</ChooseTemplate>
1010
<SheetTemplate>
1111
<ul class="ul-demo">
12-
<li><code>~/Pages/_Host.cshtml</code> <b>.NET5</b></li>
13-
<li><code>~/Pages/_Layout.cshtml</code> <b>.NET6/.NET7</b></li>
12+
<li><code>~/Pages/_Layout.cshtml</code> <b>NET6/NET7</b></li>
13+
<li><code>App.razor</code> <b>NET8/NET9</b></li>
1414
</ul>
1515
</SheetTemplate>
1616
<ScriptsTemplate>
1717
<ul class="ul-demo">
18-
<li><code>~/Pages/_Host.cshtml</code> <b>.NET5</b></li>
19-
<li><code>~/Pages/_Layout.cshtml</code> <b>.NET6/.NET7</b></li>
18+
<li><code>~/Pages/_Layout.cshtml</code> <b>NET6/NET7</b></li>
19+
<li><code>App.razor</code> <b>NET8/NET9</b></li>
2020
</ul>
2121
</ScriptsTemplate>
2222
<ServicesTemplate>
2323
<ul class="ul-demo">
24-
<li><code>Starup.cs</code> <b>.NET5</b></li>
25-
<li><code>Program.cs</code> <b>.NET6/.NET7</b></li>
24+
<li><code>Program.cs</code> <b>NET6/NET7/NET8/NET9</b></li>
2625
</ul>
2726
<p><b>Startup.cs</b></p>
2827
<Pre>namespace MyBlazorAppName
@@ -51,4 +50,21 @@ builder.Services.AddServerSideBlazor();
5150
var app = builder.Build();
5251
//more code may be present here</Pre>
5352
</ServicesTemplate>
53+
<RootTemplate>
54+
<ul class="ul-demo">
55+
<li><code>App.razor</code> <b>NET6/NET7</b></li>
56+
<li><code>MainLayout.razor</code> <b>NET8/NET9</b></li>
57+
</ul>
58+
59+
<Pre>// NET6/NET7
60+
&lt;BootstrapBlazorRoot&gt;
61+
&lt;Router&gt;&lt;Router&gt;
62+
&lt;/BootstrapBlazorRoot&gt;
63+
</Pre>
64+
65+
<Pre>// NET8/NET9
66+
&lt;BootstrapBlazorRoot&gt;
67+
&lt;@@Body
68+
&lt;/BootstrapBlazorRoot&gt;</Pre>
69+
</RootTemplate>
5470
</InstallContent>

0 commit comments

Comments
 (0)