Skip to content

Commit 78ca7cd

Browse files
committed
Merge branch 'main' into feat-net10
# Conflicts: # .github/workflows/pack.yml
2 parents b4dbb48 + a14b67e commit 78ca7cd

File tree

112 files changed

+2623
-1520
lines changed

Some content is hidden

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

112 files changed

+2623
-1520
lines changed

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches:
66
- master
77
- main
8-
- dev
98

109
jobs:
1110
run_test:
@@ -20,6 +19,17 @@ jobs:
2019
with:
2120
dotnet-version: 10.0.x
2221

22+
- name: Cache NuGet packages
23+
uses: actions/cache@v4
24+
with:
25+
path: ~/.nuget/packages
26+
key: ${{runner.os}}-nuget-bb-${{hashFiles('**/*.csproj')}}
27+
restore-keys: |
28+
${{runner.os}}-nuget-bb-
29+
30+
- name: Restore dependencies
31+
run: dotnet restore src/BootstrapBlazor
32+
2333
- name: Test
2434
run: |
2535
dotnet test test/UnitTest --collect:"XPlat Code Coverage"

.github/workflows/build.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches:
66
- master
77
- main
8-
- dev
98

109
jobs:
1110
build:
@@ -19,12 +18,22 @@ jobs:
1918
with:
2019
dotnet-version: 10.0.x
2120

21+
- name: Cache NuGet packages
22+
uses: actions/cache@v4
23+
with:
24+
path: ~/.nuget/packages
25+
key: ${{runner.os}}-nuget-bb-${{hashFiles('**/*.csproj')}}
26+
restore-keys: |
27+
${{runner.os}}-nuget-bb-
28+
29+
- name: Restore dependencies
30+
run: dotnet restore src/BootstrapBlazor
31+
2232
- name: Build
2333
env:
2434
NUGET_API_KEY: ${{secrets.NUGET_API_KEY}}
2535
Bundle: True
2636
run: |
27-
dotnet restore src/BootstrapBlazor --no-cache
2837
dotnet build src/BootstrapBlazor
2938
3039
- name: Test

.github/workflows/pack.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,17 @@ jobs:
2222
with:
2323
dotnet-version: 10.0.x
2424

25+
- name: Cache NuGet packages
26+
uses: actions/cache@v4
27+
with:
28+
path: ~/.nuget/packages
29+
key: ${{runner.os}}-nuget-bb-${{hashFiles('**/*.csproj')}}
30+
restore-keys: |
31+
${{runner.os}}-nuget-bb-
32+
33+
- name: Restore dependencies
34+
run: dotnet restore src/BootstrapBlazor
35+
2536
- name: NuGet login
2637
uses: NuGet/login@v1
2738
id: login

.gitignore

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -373,14 +373,9 @@ src/**/wwwroot/**/uploader
373373
# npm
374374
**/package-lock.json
375375

376-
# sass
377-
**/BootstrapBlazor/wwwroot/css/animate.min.css
378-
**/BootstrapBlazor/wwwroot/css/bootstrapblazor.min.css
379-
**/BootstrapBlazor/wwwroot/css/bootstrap.min.css
380-
**/BootstrapBlazor/wwwroot/css/bootstrap.rtl.min.css
381-
**/BootstrapBlazor/wwwroot/css/sweetalert2.css
382-
**/BootstrapBlazor/wwwroot/css/motronic.min.css
383-
**/BootstrapBlazor/wwwroot/css/nano.min.css
384-
385376
# Bootstrap
386377
**/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js
378+
**/BootstrapBlazor/wwwroot/css/bootstrapblazor.min.css
379+
380+
# css
381+
**/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.*.css

BootstrapBlazor.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<Folder Name="/localization/">
2121
<File Path="localization/de.json" />
2222
<File Path="localization/es.json" />
23+
<File Path="localization/it.json" />
2324
<File Path="localization/pt.json" />
2425
<File Path="localization/ru-RU.json" />
2526
<File Path="localization/th-TH.json" />

dotnet-tools.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"bootstrapblazor.cssbundler": {
6+
"version": "1.0.1",
7+
"commands": [
8+
"css-bundler"
9+
],
10+
"rollForward": false
11+
}
12+
}
13+
}

0 commit comments

Comments
 (0)