Skip to content

Commit 13a8a9a

Browse files
ArgoZhangArgoZhang
committed
Merge branch 'main' into test
2 parents 3e64343 + 1ac25d9 commit 13a8a9a

400 files changed

Lines changed: 13802 additions & 2285 deletions

File tree

Some content is hidden

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

‎.github/ISSUE_TEMPLATE/20_feature_request.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ body:
1818
description: A clear and concise description of what the problem is.
1919
placeholder: I am trying to do [...] but [...]
2020
validations:
21-
required: false
21+
required: true
2222
- type: textarea
2323
attributes:
2424
label: Describe the solution you'd like
2525
description: |
2626
A clear and concise description of what you want to happen. Include any alternative solutions you've considered.
2727
validations:
28-
required: true
28+
required: false
2929
- type: textarea
3030
attributes:
3131
label: Additional context

‎.github/pull_request_template.md‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,39 @@
1-
# {PR title}
1+
## Link issues
2+
fixes #{issue number}
3+
<!--
4+
[Please fill in the relevant Issue number after the # above, such as #42]
5+
[请在上方 # 后面填写相关 Issue 编号，如 #42]
6+
-->
7+
## Summary By Copilot
28

3-
Summary of the changes (Less than 80 chars)
4-
5-
简单描述你更改了什么, 不超过80个字符；如果有关联 Issue 请在下方填写相关编号
6-
7-
## Description
8-
9-
fixes #{bug number} (in this specific format)
109

1110
## Regression?
12-
1311
- [ ] Yes
1412
- [ ] No
1513

14+
<!--
1615
[If yes, specify the version the behavior has regressed from]
17-
1816
[是否影响老版本]
19-
17+
-->
2018
## Risk
21-
2219
- [ ] High
2320
- [ ] Medium
2421
- [ ] Low
2522

23+
<!--
2624
[Justify the selection above]
27-
25+
-->
2826
## Verification
29-
3027
- [ ] Manual (required)
3128
- [ ] Automated
3229

3330
## Packaging changes reviewed?
34-
3531
- [ ] Yes
3632
- [ ] No
3733
- [ ] N/A
3834

3935
## ☑️ Self Check before Merge
40-
4136
⚠️ Please check all items below before review. ⚠️
42-
4337
- [ ] Doc is updated/provided or not needed
4438
- [ ] Demo is updated/provided or not needed
4539
- [ ] Merge the latest code from the main branch

‎.github/workflows/docker.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- pack
7+
- release
78

89
jobs:
910
docker:

‎.github/workflows/pack.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ on:
44
push:
55
branches:
66
- pack
7+
- release
78
- hotfix
89

910
jobs:
1011
pack:
1112
runs-on: ubuntu-latest
12-
13+
1314
steps:
1415
- uses: actions/checkout@v4
1516

@@ -19,7 +20,7 @@ jobs:
1920
dotnet-version: 9.0.x
2021

2122
- name: Publish to Nuget
22-
env:
23+
env:
2324
NUGET_API_KEY: ${{secrets.NUGET_API_KEY}}
2425
Bundle: True
2526

‎BootstrapBlazor.sln‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cert", "cert", "{C075C6C8-B
7474
scripts\linux\cert\www.blazor.zone.key = scripts\linux\cert\www.blazor.zone.key
7575
EndProjectSection
7676
EndProject
77+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{9BAF50BE-141D-4429-93A9-942F373D1F68}"
78+
EndProject
79+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTest.Benchmarks", "tools\Benchmarks\UnitTest.Benchmarks.csproj", "{3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}"
80+
EndProject
7781
Global
7882
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7983
Debug|Any CPU = Debug|Any CPU
@@ -104,6 +108,10 @@ Global
104108
{D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
105109
{D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
106110
{D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF}.Release|Any CPU.Build.0 = Release|Any CPU
111+
{3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112+
{3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
113+
{3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
114+
{3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}.Release|Any CPU.Build.0 = Release|Any CPU
107115
EndGlobalSection
108116
GlobalSection(SolutionProperties) = preSolution
109117
HideSolutionNode = FALSE
@@ -119,6 +127,7 @@ Global
119127
{6D73FED6-0086-460B-84FA-1FA78176BF59} = {7C1D79F1-87BC-42C1-BD5A-CDE4044AC1BD}
120128
{D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF} = {7C1D79F1-87BC-42C1-BD5A-CDE4044AC1BD}
121129
{C075C6C8-B9CB-4AC0-9BDF-B2002B4AB99C} = {EA765165-0542-41C8-93F2-85787FEDEDFF}
130+
{3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1} = {9BAF50BE-141D-4429-93A9-942F373D1F68}
122131
EndGlobalSection
123132
GlobalSection(ExtensibilityGlobals) = postSolution
124133
SolutionGuid = {0DCB0756-34FA-4FD0-AE1D-D3F08B5B3A6B}

‎BootstrapBlazor.slnx‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<Solution>
2+
<Folder Name="/configuration/">
3+
<File Path=".editorconfig" />
4+
<File Path=".gitignore" />
5+
<File Path="exclusion.dic" />
6+
<File Path="Framework.props" />
7+
</Folder>
8+
<Folder Name="/docs/">
9+
<File Path="README.md" />
10+
<File Path="README.zh-CN.md" />
11+
</Folder>
12+
<Folder Name="/localization/">
13+
<File Path="localization/de.json" />
14+
<File Path="localization/es.json" />
15+
<File Path="localization/pt.json" />
16+
<File Path="localization/th-TH.json" />
17+
<File Path="localization/zh-TW.json" />
18+
</Folder>
19+
<Folder Name="/scripts/" />
20+
<Folder Name="/scripts/linux/">
21+
<File Path="scripts/linux/ba.blazor.service" />
22+
<File Path="scripts/linux/deploy-blazor.sh" />
23+
<File Path="scripts/linux/deploy.sh" />
24+
<File Path="scripts/linux/nginx.conf" />
25+
<File Path="scripts/linux/remove.sh" />
26+
</Folder>
27+
<Folder Name="/scripts/linux/cert/">
28+
<File Path="scripts/linux/cert/blazor.zone.cer" />
29+
<File Path="scripts/linux/cert/blazor.zone.key" />
30+
<File Path="scripts/linux/cert/www.blazor.zone.cer" />
31+
<File Path="scripts/linux/cert/www.blazor.zone.key" />
32+
</Folder>
33+
<Folder Name="/scripts/wasm/">
34+
<File Path="scripts/wasm/sync.cmd" />
35+
<File Path="scripts/wasm/sync.sh" />
36+
</Folder>
37+
<Folder Name="/scripts/windows/">
38+
<File Path="scripts/windows/pack.cmd" />
39+
<File Path="scripts/windows/push.cmd" />
40+
<File Path="scripts/windows/push.ps1" />
41+
</Folder>
42+
<Folder Name="/src/">
43+
<Project Path="src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj" />
44+
<Project Path="src/BootstrapBlazor/BootstrapBlazor.csproj" />
45+
</Folder>
46+
<Folder Name="/test/">
47+
<Project Path="test/UniTest.Sass/UniTest.Sass.csproj" />
48+
<Project Path="test/UnitTest.Localization/UnitTest.Localization.csproj" />
49+
<Project Path="test/UnitTest/UnitTest.csproj" />
50+
<Project Path="test/UnitTestDocs/UnitTestDocs.csproj" />
51+
</Folder>
52+
<Folder Name="/tools/">
53+
<Project Path="tools/Benchmarks/UnitTest.Benchmarks.csproj" />
54+
</Folder>
55+
</Solution>

‎scripts/git/run.cmd‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎scripts/git/run.sh‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎scripts/linux/deploy.sh‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,50 @@
11
#! /bin/bash
22

3-
echo "clean env"
4-
3+
echo "*********************** clean env ***********************"
54
sudo rm -fr BootstrapBlazor
6-
75
sudo rm -fr /usr/local/ba/blazor
86

9-
echo "apt update"
7+
echo "*********************** apt update ***********************"
108
sudo apt update
119

12-
echo "install git"
10+
echo "*********************** install git ***********************"
1311
echo yes|sudo apt install git
1412

15-
echo "install BootstrapBlazor"
13+
echo "*********************** install BootstrapBlazor ***********************"
1614
sudo git clone https://gitee.com/LongbowEnterprise/BootstrapBlazor.git
1715

18-
echo "make directory BA/Blazor"
16+
echo "*********************** make directory BA/Blazor ***********************"
1917
sudo mkdir /usr/local/ba
2018
sudo mkdir /usr/local/ba/blazor
2119

22-
echo "copy scripts"
20+
echo "*********************** copy scripts ***********************"
2321
sudo cp BootstrapBlazor/scripts/linux/deploy-blazor.sh deploy-blazor.sh
2422
sudo cp BootstrapBlazor/scripts/linux/ba.blazor.service /usr/lib/systemd/system/ba.blazor.service
2523

26-
echo "install ba.blazor.service"
24+
echo "*********************** install ba.blazor.service ***********************"
2725
sudo systemctl enable ba.blazor
2826

29-
echo "install nginx"
27+
echo "*********************** install nginx ***********************"
3028
echo yes|sudo apt install nginx
3129

32-
echo "copy nginx config"
30+
echo "*********************** copy nginx config ***********************"
3331
sudo cp BootstrapBlazor/scripts/linux/nginx.conf /etc/nginx/
3432

35-
echo "copy cert"
33+
echo "*********************** copy cert ***********************"
3634
sudo mkdir /etc/nginx/cert
3735
sudo cp BootstrapBlazor/scripts/linux/cert/* /etc/nginx/cert/
36+
37+
echo "*********************** install chrome ***********************"
38+
wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
39+
sudo yes|sudo apt install ./google-chrome-stable_current_amd64.deb
40+
41+
echo "*********************** install support font ***********************"
42+
sudo apt install fonts-wqy-microhei
43+
44+
echo "*********************** install DOTNET ***********************"
45+
wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
46+
sudo dpkg -i packages-microsoft-prod.deb
47+
rm packages-microsoft-prod.deb
48+
49+
sudo apt-get update && \
50+
sudo apt-get install -y dotnet-sdk-9.0

‎scripts/services/ba.blazor.service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[Unit]
2-
Description=Bootstrap Admin Blazor Application
2+
Description=BootstrapBlazor Offical Web Application
33

44
[Service]
55
Type=simple

0 commit comments

Comments
 (0)