Skip to content

Commit bd6e886

Browse files
ping9719ping9719
authored
Merge branch 'mini-software:master' into master
2 parents 22f522b + 6f54d45 commit bd6e886

1,237 files changed

Lines changed: 49311 additions & 21184 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: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[*.{cs,vb}]
2+
3+
# IDE0009: Member access should be qualified.
4+
dotnet_style_qualification_for_event = false
5+
6+
# IDE0009: Member access should be qualified.
7+
dotnet_style_qualification_for_field = false
8+
9+
# IDE0009: Member access should be qualified.
10+
dotnet_style_qualification_for_property = false
11+
12+
# IDE0009: Member access should be qualified.
13+
dotnet_style_qualification_for_method = false
14+
15+
# IDE0065: Misplaced using directive
16+
csharp_using_directive_placement = outside_namespace
17+
18+
# IDE0161: Use file-scoped namespace
19+
csharp_style_namespace_declarations = file_scoped:silent

‎.gitattributes‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*.png binary
1616
*.gif binary
1717

18-
*.cs -text diff=csharp
18+
*.cs -text diff=csharp
1919
*.vb -text
2020
*.c -text
2121
*.cpp -text
@@ -44,8 +44,8 @@
4444
*.fsx -text
4545
*.hs -text
4646

47-
*.csproj -text merge=union
48-
*.vbproj -text merge=union
49-
*.fsproj -text merge=union
50-
*.dbproj -text merge=union
51-
*.sln -text merge=union
47+
*.csproj -text merge=union
48+
*.vbproj -text merge=union
49+
*.fsproj -text merge=union
50+
*.dbproj -text merge=union
51+
*.sln -text merge=union

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,35 @@
11
---
2-
name: Bug report
3-
about: Create a report to help us improve
4-
title: ''
5-
labels: ''
2+
name: Bug Report
3+
about: Create a report to help us improve the project
4+
title: "[BUG] - [Short description of the issue]"
5+
labels: bug
66
assignees: ''
7-
87
---
98

10-
### Excel Type
11-
12-
- [ ] XLSX
13-
- [ ] XLSM
14-
- [ ] CSV
15-
- [ ] OTHER
16-
17-
### Upload Excel File
18-
19-
Please attach your issue file by dragging or droppng, selecting or pasting them.
20-
21-
e.g : [https://github.com/shps951023/MiniExcel/files/6538107/demo.xlsx](https://github.com/shps951023/MiniExcel/files/6538107/demo.xlsx)
9+
## Description
10+
A clear and concise description of what the bug is about.
11+
Include a minimum reproducible sample of the code and, if applicable, the exception message and its stack trace.
12+
Please write in English for the sake of our international contributors!
2213

14+
## Expected Behavior
15+
A brief description of what you expected to happen.
2316

17+
## Actual Behavior
18+
A brief description of what actually happened.
2419

25-
### MiniExcel Version
20+
## Workarounds
21+
Please share what adjacent solutions you've found for the issue, if any.
2622

23+
## Environment (please fill the following information):
24+
- MiniExcel Version: [e.g. 1.42.0, 1.41.4, 2.0.0-preview.2]
25+
- .NET Version: [e.g. net10.0, net481]
26+
- OS: [e.g. Windows, macOS, Linux]
2727

28+
## Files and/or Screenshots
29+
If applicable, please upload:
30+
- The document you're trying to query, or a mock if not available
31+
- The malformed result of the document you're tying to generate
32+
- The template document you're trying to fill
2833

29-
### Description
34+
## Additional Context
35+
Include here any extra info, diagrams, or links.

‎.github/ISSUE_TEMPLATE/custom.md‎

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

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
11
---
2-
name: Feature request
3-
about: Suggest an idea for this project
4-
title: ''
5-
labels: ''
6-
assignees: ''
7-
2+
name: Feature Request
3+
about: Suggest an idea or improvement for this project
4+
title: "[Feature] - [Title of the request]"
5+
labels: enhancement
6+
assignees: ""
87
---
98

10-
### Excel Type
9+
## Feature Summary
10+
A clear and concise description of what the feature is about.
11+
Please write in English for the sake of our international contributors!
12+
13+
## Document Formats
14+
What document formats will benefit from this new functionality?
1115

1216
- [ ] XLSX
13-
- [ ] XLSM
1417
- [ ] CSV
15-
- [ ] OTHER
16-
17-
### Upload Excel File
18-
19-
Please attach your issue file by dragging or droppng, selecting or pasting them.
20-
21-
e.g : [https://github.com/shps951023/MiniExcel/files/6538107/demo.xlsx](https://github.com/shps951023/MiniExcel/files/6538107/demo.xlsx)
22-
23-
18+
- [ ] XLSM
19+
- [ ] Other
2420

25-
### MiniExcel Version
21+
## Motivation
22+
How does the need for this feature arise? What problem does it solve?
2623

24+
## Proposed Solution
25+
Describe how you envision this feature working. Be as detailed as you can.
2726

27+
## Alternatives Considered
28+
Have you considered any alternative solutions or workarounds?
2829

29-
### Description
30+
## Additional Context
31+
Include any extra info, screenshots, diagrams, or links.

‎.github/ISSUE_TEMPLATE/report_issue.md‎

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

‎.github/workflows/benchmark.yml‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
name: MiniExcel Benchmarks
2+
3+
on:
4+
workflow_dispatch:
5+
release:
6+
branches: [master, v1.x-maintenance]
7+
types: [published]
8+
9+
permissions:
10+
contents: write
11+
12+
jobs:
13+
QueryBenchmark:
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Setup .NET
19+
uses: actions/setup-dotnet@v4
20+
with:
21+
dotnet-version: 10.0.x
22+
- name: Restore dependencies
23+
run: dotnet restore
24+
working-directory: ./benchmarks/MiniExcel.Benchmarks
25+
- name: Build
26+
run: dotnet build --no-restore
27+
working-directory: ./benchmarks/MiniExcel.Benchmarks
28+
- name: Benchmark
29+
run: dotnet run -c Release -f net10.0
30+
working-directory: ./benchmarks/MiniExcel.Benchmarks
31+
env:
32+
BenchmarkMode: Automatic
33+
BenchmarkSection: query
34+
- name: Renaming result file
35+
run: mv MiniExcelLib.Benchmarks.BenchmarkSections.QueryExcelBenchmark-report-github.md query-benchmark.md
36+
working-directory: ./benchmarks/MiniExcel.Benchmarks/BenchmarkDotNet.Artifacts/results
37+
- name: Save benchmark results
38+
uses: actions/upload-artifact@v4
39+
with:
40+
name: query-benchmark-result
41+
path: ./benchmarks/MiniExcel.Benchmarks/BenchmarkDotNet.Artifacts/results/*.md
42+
43+
CreateBenchmark:
44+
runs-on: ubuntu-latest
45+
46+
steps:
47+
- uses: actions/checkout@v4
48+
- name: Setup .NET
49+
uses: actions/setup-dotnet@v4
50+
with:
51+
dotnet-version: 10.0.x
52+
- name: Restore dependencies
53+
run: dotnet restore
54+
working-directory: ./benchmarks/MiniExcel.Benchmarks
55+
- name: Build
56+
run: dotnet build --no-restore
57+
working-directory: ./benchmarks/MiniExcel.Benchmarks
58+
- name: Benchmark
59+
run: dotnet run -c Release -f net10.0
60+
working-directory: ./benchmarks/MiniExcel.Benchmarks
61+
env:
62+
BenchmarkMode: Automatic
63+
BenchmarkSection: create
64+
- name: Renaming result file
65+
run: mv MiniExcelLib.Benchmarks.BenchmarkSections.CreateExcelBenchmark-report-github.md create-benchmark.md
66+
working-directory: ./benchmarks/MiniExcel.Benchmarks/BenchmarkDotNet.Artifacts/results
67+
- name: Save benchmark results
68+
uses: actions/upload-artifact@v4
69+
with:
70+
name: create-benchmark-result
71+
path: ./benchmarks/MiniExcel.Benchmarks/BenchmarkDotNet.Artifacts/results/*.md
72+
73+
TemplateBenchmark:
74+
runs-on: ubuntu-latest
75+
76+
steps:
77+
- uses: actions/checkout@v4
78+
- name: Setup .NET
79+
uses: actions/setup-dotnet@v4
80+
with:
81+
dotnet-version: 10.0.x
82+
- name: Restore dependencies
83+
run: dotnet restore
84+
working-directory: ./benchmarks/MiniExcel.Benchmarks
85+
- name: Build
86+
run: dotnet build --no-restore
87+
working-directory: ./benchmarks/MiniExcel.Benchmarks
88+
- name: Benchmark
89+
run: dotnet run -c Release -f net10.0
90+
working-directory: ./benchmarks/MiniExcel.Benchmarks
91+
env:
92+
BenchmarkMode: Automatic
93+
BenchmarkSection: template
94+
- name: Renaming result file
95+
run: mv MiniExcelLib.Benchmarks.BenchmarkSections.TemplateExcelBenchmark-report-github.md template-benchmark.md
96+
working-directory: ./benchmarks/MiniExcel.Benchmarks/BenchmarkDotNet.Artifacts/results
97+
- name: Save benchmark results
98+
uses: actions/upload-artifact@v4
99+
with:
100+
name: template-benchmark-result
101+
path: ./benchmarks/MiniExcel.Benchmarks/BenchmarkDotNet.Artifacts/results/*.md
102+
103+
PushBenchmarksResults:
104+
runs-on: ubuntu-latest
105+
needs: [ QueryBenchmark, CreateBenchmark, TemplateBenchmark ]
106+
107+
steps:
108+
- uses: actions/checkout@v4
109+
with:
110+
fetch-depth: 0
111+
- name: Fetch benchmark results
112+
uses: actions/download-artifact@v4
113+
with:
114+
path: ./benchmarks/results
115+
merge-multiple: true
116+
- name: Commit reports
117+
working-directory: ./benchmarks/results
118+
run: |
119+
git config user.name github-actions
120+
git config user.email github-actions@github.com
121+
git add ./*.md
122+
git commit -am "Automated benchmark report - ${{ github.ref_name }}"
123+
git push origin master --force-with-lease

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ master ]
16+
branches: [ master, v1.x-maintenance ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ master ]
19+
branches: [ master, v1.x-maintenance ]
2020
schedule:
2121
- cron: '18 0 * * 0'
2222

@@ -38,11 +38,19 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v2
42-
41+
uses: actions/checkout@v4
42+
43+
- name: Setup .NET
44+
uses: actions/setup-dotnet@v4
45+
with:
46+
dotnet-version: 10.0.x
47+
48+
- name: Restore dependencies
49+
run: dotnet restore
50+
4351
# Initializes the CodeQL tools for scanning.
4452
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v1
53+
uses: github/codeql-action/init@v3
4654
with:
4755
languages: ${{ matrix.language }}
4856
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,8 +60,9 @@ jobs:
5260

5361
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5462
# If this step fails, then you should remove it and run the build manually (see below)
55-
- name: Autobuild
56-
uses: github/codeql-action/autobuild@v1
63+
64+
# - name: Autobuild
65+
# uses: github/codeql-action/autobuild@v3
5766

5867
# ℹ️ Command-line programs to run using the OS shell.
5968
# 📚 https://git.io/JvXDl
@@ -62,9 +71,8 @@ jobs:
6271
# and modify them (or add more) to build your code if your project
6372
# uses a compiled language
6473

65-
#- run: |
66-
# make bootstrap
67-
# make release
74+
- name: Manual build
75+
run: dotnet build MiniExcel.slnx -c Release -f net10.0
6876

6977
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v1
78+
uses: github/codeql-action/analyze@v3

0 commit comments

Comments
 (0)