Skip to content

Commit a5720c5

Browse files
committed
Merge branch 'master' into feat-dom2image
# Conflicts: # BootstrapBlazor.Extensions.sln
2 parents 1d50181 + 91ac117 commit a5720c5

3,448 files changed

Lines changed: 10135 additions & 7092 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.

.editorconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ resharper_web_config_wrong_module_highlighting = warning
7171
[*.{cs,csx,vb,vbx}]
7272
indent_size = 4
7373

74-
[*.{cs,css,js,json,*html,razor,txt,log}]
75-
charset = utf-8-bom
76-
7774
[*.{xml,config,*proj,nuspec,props,resx,targets,yml,tasks}]
7875
indent_size = 2
7976

@@ -216,7 +213,7 @@ csharp_preserve_single_line_blocks = true
216213
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
217214
[*.cs]
218215
# Add file header
219-
file_header_template = Copyright (c) Argo Zhang (argo@163.com). All rights reserved.\nLicensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nWebsite: https://www.blazor.zone or https://argozhang.github.io/
216+
file_header_template = Copyright (c) BootstrapBlazor & Argo Zhang (argo@live.ca). All rights reserved.\nLicensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nWebsite: https://www.blazor.zone or https://argozhang.github.io/
220217
csharp_style_namespace_declarations = file_scoped:suggestion
221218
csharp_style_expression_bodied_local_functions = true:silent
222219
csharp_using_directive_placement = outside_namespace:silent

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET SDK
1919
uses: actions/setup-dotnet@v4
2020
with:
21-
dotnet-version: 9.0.x
21+
dotnet-version: 10.0.x
2222

2323
- name: Test
2424
run: |

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup .NET Core SDK
1818
uses: actions/setup-dotnet@v4
1919
with:
20-
dotnet-version: 9.0.x
20+
dotnet-version: 10.0.x
2121

2222
- name: Build
2323
env:

.github/workflows/issue-check-inactive.yml

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

.github/workflows/issue-close-required.yml

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

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET Core SDK
1616
uses: actions/setup-dotnet@v4
1717
with:
18-
dotnet-version: 9.0.x
18+
dotnet-version: 10.0.x
1919

2020
- name: Publish to Nuget
2121
env:

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,3 +382,7 @@ src/**/wwwroot/**/uploader
382382
**/BootstrapBlazor/wwwroot/css/sweetalert2.css
383383
**/BootstrapBlazor/wwwroot/css/motronic.min.css
384384
**/BootstrapBlazor/wwwroot/css/nano.min.css
385+
386+
# test
387+
**/UnitTestSvgIcon/**/*.svg
388+
**/UnitTestSvgIcon/**/*.razor

BootstrapBlazor.Extensions.sln

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

BootstrapBlazor.Extensions.slnx

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
<Solution>
2+
<Folder Name="/actions/">
3+
<File Path=".github/workflows/auto-pull-request-checks.yml" />
4+
<File Path=".github/workflows/build.yml" />
5+
<File Path=".github/workflows/release.yml" />
6+
</Folder>
7+
<Folder Name="/configurations/">
8+
<File Path=".gitignore" />
9+
<File Path="exclusion.dic" />
10+
</Folder>
11+
<Folder Name="/props/">
12+
<File Path="Directory.Build.props" />
13+
</Folder>
14+
<Folder Name="/src/" />
15+
<Folder Name="/src/components/">
16+
<Project Path="src/components/BootstrapBlazor.AntDesignIcon/BootstrapBlazor.AntDesignIcon.csproj" />
17+
<Project Path="src/components/BootstrapBlazor.Authenticator/BootstrapBlazor.Authenticator.csproj" />
18+
<Project Path="src/components/BootstrapBlazor.AzureOpenAI/BootstrapBlazor.AzureOpenAI.csproj" />
19+
<Project Path="src/components/BootstrapBlazor.AzureSpeech/BootstrapBlazor.AzureSpeech.csproj" />
20+
<Project Path="src/components/BootstrapBlazor.AzureTranslator/BootstrapBlazor.AzureTranslator.csproj" />
21+
<Project Path="src/components/BootstrapBlazor.BaiduOcr/BootstrapBlazor.BaiduOcr.csproj" />
22+
<Project Path="src/components/BootstrapBlazor.BaiduSpeech/BootstrapBlazor.BaiduSpeech.csproj" />
23+
<Project Path="src/components/BootstrapBlazor.BarCode/BootstrapBlazor.BarCode.csproj" />
24+
<Project Path="src/components/BootstrapBlazor.BarcodeGenerator/BootstrapBlazor.BarcodeGenerator.csproj" />
25+
<Project Path="src/components/BootstrapBlazor.BootstrapIcon/BootstrapBlazor.BootstrapIcon.csproj" />
26+
<Project Path="src/components/BootstrapBlazor.Chart/BootstrapBlazor.Chart.csproj" />
27+
<Project Path="src/components/BootstrapBlazor.ChatBot/BootstrapBlazor.ChatBot.csproj" />
28+
<Project Path="src/components/BootstrapBlazor.CherryMarkdown/BootstrapBlazor.CherryMarkdown.csproj" />
29+
<Project Path="src/components/BootstrapBlazor.CodeEditor/BootstrapBlazor.CodeEditor.csproj" />
30+
<Project Path="src/components/BootstrapBlazor.Dock/BootstrapBlazor.Dock.csproj" />
31+
<Project Path="src/components/BootstrapBlazor.DockView/BootstrapBlazor.DockView.csproj" />
32+
<Project Path="src/components/BootstrapBlazor.DriverJs/BootstrapBlazor.DriverJs.csproj" />
33+
<Project Path="src/components/BootstrapBlazor.ElementIcon/BootstrapBlazor.ElementIcon.csproj" />
34+
<Project Path="src/components/BootstrapBlazor.FileSystem/BootstrapBlazor.FileSystem.csproj" />
35+
<Project Path="src/components/BootstrapBlazor.FileViewer/BootstrapBlazor.FileViewer.csproj" />
36+
<Project Path="src/components/BootstrapBlazor.FloatingUI/BootstrapBlazor.FloatingUI.csproj" />
37+
<Project Path="src/components/BootstrapBlazor.FluentSystemIcon/BootstrapBlazor.FluentSystemIcon.csproj" />
38+
<Project Path="src/components/BootstrapBlazor.FontAwesome/BootstrapBlazor.FontAwesome.csproj" />
39+
<Project Path="src/components/BootstrapBlazor.Gantt/BootstrapBlazor.Gantt.csproj" />
40+
<Project Path="src/components/BootstrapBlazor.Graph/BootstrapBlazor.Graph.csproj" />
41+
<Project Path="src/components/BootstrapBlazor.Holiday/BootstrapBlazor.Holiday.csproj" />
42+
<Project Path="src/components/BootstrapBlazor.Html2Image/BootstrapBlazor.Html2Image.csproj" />
43+
<Project Path="src/components/BootstrapBlazor.Html2Pdf.Playwright/BootstrapBlazor.Html2Pdf.Playwright.csproj" />
44+
<Project Path="src/components/BootstrapBlazor.Html2Pdf.Select/BootstrapBlazor.Html2Pdf.Select.csproj" />
45+
<Project Path="src/components/BootstrapBlazor.Html2Pdf/BootstrapBlazor.Html2Pdf.csproj" />
46+
<Project Path="src/components/BootstrapBlazor.IconPark/BootstrapBlazor.IconPark.csproj" />
47+
<Project Path="src/components/BootstrapBlazor.ImageCropper/BootstrapBlazor.ImageCropper.csproj" />
48+
<Project Path="src/components/BootstrapBlazor.ImageHelper/BootstrapBlazor.ImageHelper.csproj" />
49+
<Project Path="src/components/BootstrapBlazor.IP2Region/BootstrapBlazor.IP2Region.csproj" />
50+
<Project Path="src/components/BootstrapBlazor.JitsiMeet/BootstrapBlazor.JitsiMeet.csproj" />
51+
<Project Path="src/components/BootstrapBlazor.JuHeIpLocatorProvider/BootstrapBlazor.JuHeIpLocatorProvider.csproj" />
52+
<Project Path="src/components/BootstrapBlazor.Live2DDisplay/BootstrapBlazor.Live2DDisplay.csproj" />
53+
<Project Path="src/components/BootstrapBlazor.Maps/BootstrapBlazor.Maps.csproj" />
54+
<Project Path="src/components/BootstrapBlazor.Markdown/BootstrapBlazor.Markdown.csproj" />
55+
<Project Path="src/components/BootstrapBlazor.MaterialDesign/BootstrapBlazor.MaterialDesign.csproj" />
56+
<Project Path="src/components/BootstrapBlazor.MeiliSearch/BootstrapBlazor.MeiliSearch.csproj" />
57+
<Project Path="src/components/BootstrapBlazor.Mermaid/BootstrapBlazor.Mermaid.csproj" />
58+
<Project Path="src/components/BootstrapBlazor.MindMap/BootstrapBlazor.MindMap.csproj" />
59+
<Project Path="src/components/BootstrapBlazor.MouseFollower/BootstrapBlazor.MouseFollower.csproj" />
60+
<Project Path="src/components/BootstrapBlazor.OctIcon/BootstrapBlazor.OctIcon.csproj" />
61+
<Project Path="src/components/BootstrapBlazor.OfdReader/BootstrapBlazor.OfdReader.csproj" />
62+
<Project Path="src/components/BootstrapBlazor.OfficeViewer/BootstrapBlazor.OfficeViewer.csproj" />
63+
<Project Path="src/components/BootstrapBlazor.OnScreenKeyboard/BootstrapBlazor.OnScreenKeyboard.csproj" />
64+
<Project Path="src/components/BootstrapBlazor.OpcUa/BootstrapBlazor.OpcUa.csproj" />
65+
<Project Path="src/components/BootstrapBlazor.OpenAI.GPT3/BootstrapBlazor.OpenAI.csproj" />
66+
<Project Path="src/components/BootstrapBlazor.PdfReader/BootstrapBlazor.PdfReader.csproj" />
67+
<Project Path="src/components/BootstrapBlazor.PdfViewer/BootstrapBlazor.PdfViewer.csproj" />
68+
<Project Path="src/components/BootstrapBlazor.Player/BootstrapBlazor.Player.csproj" />
69+
<Project Path="src/components/BootstrapBlazor.RDKit/BootstrapBlazor.RDKit.csproj" />
70+
<Project Path="src/components/BootstrapBlazor.Region/BootstrapBlazor.Region.csproj" />
71+
<Project Path="src/components/BootstrapBlazor.SignaturePad/BootstrapBlazor.SignaturePad.csproj" />
72+
<Project Path="src/components/BootstrapBlazor.SmilesDrawer/BootstrapBlazor.SmilesDrawer.csproj" />
73+
<Project Path="src/components/BootstrapBlazor.Sortable/BootstrapBlazor.Sortable.csproj" />
74+
<Project Path="src/components/BootstrapBlazor.Splitting/BootstrapBlazor.Splitting.csproj" />
75+
<Project Path="src/components/BootstrapBlazor.SummerNote/BootstrapBlazor.SummerNote.csproj" />
76+
<Project Path="src/components/BootstrapBlazor.SVGEditor/BootstrapBlazor.SvgEditor.csproj" />
77+
<Project Path="src/components/BootstrapBlazor.TableExport/BootstrapBlazor.TableExport.csproj" />
78+
<Project Path="src/components/BootstrapBlazor.TagHelper/BootstrapBlazor.TagHelper.csproj" />
79+
<Project Path="src/components/BootstrapBlazor.Tasks.Dashboard/BootstrapBlazor.Tasks.Dashboard.csproj" />
80+
<Project Path="src/components/BootstrapBlazor.Topology/BootstrapBlazor.Topology.csproj" />
81+
<Project Path="src/components/BootstrapBlazor.UniverIcon/BootstrapBlazor.UniverIcon.csproj" />
82+
<Project Path="src/components/BootstrapBlazor.UniverSheet/BootstrapBlazor.UniverSheet.csproj" />
83+
<Project Path="src/components/BootstrapBlazor.Vditor/BootstrapBlazor.Vditor.csproj" />
84+
<Project Path="src/components/BootstrapBlazor.VideoPlayer/BootstrapBlazor.VideoPlayer.csproj" />
85+
<Project Path="src/components/BootstrapBlazor.Viewer/BootstrapBlazor.Viewer.csproj" />
86+
<Project Path="src/components/BootstrapBlazor.WebAPI/BootstrapBlazor.WebAPI.csproj" />
87+
<Project Path="src/components/BootstrapBlazor.WinBox/BootstrapBlazor.WinBox.csproj" />
88+
</Folder>
89+
<Folder Name="/src/extensions/">
90+
<Project Path="src/extensions/BootstrapBlazor.DataAccess.EntityFrameworkCore/BootstrapBlazor.DataAccess.EntityFrameworkCore.csproj" />
91+
<Project Path="src/extensions/BootstrapBlazor.DataAccess.FreeSql/BootstrapBlazor.DataAccess.FreeSql.csproj" />
92+
<Project Path="src/extensions/BootstrapBlazor.DataAccess.PetaPoco/BootstrapBlazor.DataAccess.PetaPoco.csproj" />
93+
<Project Path="src/extensions/BootstrapBlazor.DataAccess.SqlSugar/BootstrapBlazor.DataAccess.SqlSugar.csproj" />
94+
<Project Path="src/extensions/BootstrapBlazor.OpcDa/BootstrapBlazor.OpcDa.csproj" />
95+
</Folder>
96+
<Folder Name="/src/middelware/">
97+
<Project Path="src/middleware/BootstrapBlazor.Middleware/BootstrapBlazor.Middleware.csproj" />
98+
</Folder>
99+
<Folder Name="/src/props/">
100+
<File Path="src/.gitignore" />
101+
<File Path="src/Directory.Build.props" />
102+
<File Path="src/Directory.Build.targets" />
103+
<File Path="src/Frameworks.props" />
104+
<File Path="src/Logo.props" />
105+
<File Path="src/readme.md" />
106+
<File Path="src/SourceLink.targets" />
107+
</Folder>
108+
<Folder Name="/test/">
109+
<Project Path="test/UnitTestEditor/UnitTestEditor.csproj" />
110+
<Project Path="test/UnitTestHoliday/UnitTestHoliday.csproj" />
111+
<Project Path="test/UnitTestOpcDa/UnitTestOpcDa.csproj" />
112+
<Project Path="test/UnitTestOpcUa/UnitTestOpcUa.csproj" />
113+
<Project Path="test/UnitTestRegion/UnitTestRegion.csproj" Id="37e8696e-3ae5-468f-b6d9-0a8eb4e81876" />
114+
<Project Path="test/UnitTestSvgIcon/UnitTestSvgIcon.csproj" />
115+
</Folder>
116+
<Folder Name="/test/props/">
117+
<File Path="test/Directory.Build.props" />
118+
</Folder>
119+
<Folder Name="/tools/">
120+
<Project Path="tools/BootstrapBlazor.CssBundler/BootstrapBlazor.CssBundler.csproj" />
121+
</Folder>
122+
</Solution>

exclusion.dic

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,4 @@ scrlang
102102
Validata
103103
Validatable
104104
Totp
105+
Vditor

0 commit comments

Comments
 (0)