Skip to content

Commit 05d930c

Browse files
MarkStegaMarkStega
authored
2024-11-13 5.3.12 (#1343)
* 2024-11-13 5.3.12 * 2024-11-13 Dependabot PR limit * 2024-11-13 Add pnpm to GHA
1 parent fd2eac3 commit 05d930c

25 files changed

Lines changed: 8205 additions & 12199 deletions

‎.github/dependabot.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ updates:
1010
directory: "/"
1111
schedule:
1212
interval: "weekly"
13+
open-pull-requests-limit: 0
1314

1415

1516

@@ -19,13 +20,15 @@ updates:
1920
interval: "weekly"
2021
ignore:
2122
- dependency-name: "sass"
23+
open-pull-requests-limit: 0
2224

2325
- package-ecosystem: "npm"
2426
directory: "/materia.blazor.website"
2527
schedule:
2628
interval: "weekly"
2729
ignore:
2830
- dependency-name: "sass"
31+
open-pull-requests-limit: 0
2932

3033

3134

@@ -35,24 +38,28 @@ updates:
3538
interval: "weekly"
3639
ignore:
3740
- dependency-name: "Nager.Date"
41+
open-pull-requests-limit: 0
3842

3943
- package-ecosystem: "nuget"
4044
directory: "/materia.blazor.website"
4145
schedule:
4246
interval: "weekly"
4347
ignore:
4448
- dependency-name: "Nager.Date"
49+
open-pull-requests-limit: 0
4550

4651
- package-ecosystem: "nuget"
4752
directory: "/materia.blazor.website.server"
4853
schedule:
4954
interval: "weekly"
5055
ignore:
5156
- dependency-name: "Nager.Date"
57+
open-pull-requests-limit: 0
5258

5359
- package-ecosystem: "nuget"
5460
directory: "/materia.blazor.website.webassembly"
5561
schedule:
5662
interval: "weekly"
5763
ignore:
5864
- dependency-name: "Nager.Date"
65+
open-pull-requests-limit: 0

‎.github/workflows/GithubActionsRelease.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ jobs:
5050
with:
5151
dotnet-version: '8.x'
5252

53+
- name: Install pnpm
54+
uses: pnpm/action-setup@v4
55+
with:
56+
version: 9.12.2
57+
5358
- name: Run the acceptance tests as the first build action and cancel out the rest if it fails
5459
run: dotnet test ${{env.projectTest}} --configuration ${{env.buildConfiguration}}
5560
############################################################################################################
@@ -72,6 +77,11 @@ jobs:
7277
run: dotnet tool update -g docfx
7378

7479
- name: Build Material.Blazor
80+
- name: Install pnpm
81+
uses: pnpm/action-setup@v4
82+
with:
83+
version: 9.12.2
84+
7585
run: dotnet build ${{env.projectMB}} --configuration ${{env.buildConfiguration}}
7686

7787
- name: Create documentation 🔧
@@ -107,6 +117,11 @@ jobs:
107117
dotnet-version: '8.x'
108118

109119
- name: Build and Publish Website 🔧
120+
- name: Install pnpm
121+
uses: pnpm/action-setup@v4
122+
with:
123+
version: 9.12.2
124+
110125
run: >
111126
dotnet publish ${{env.projectWeb}}
112127
--configuration ${{env.buildConfiguration}}
@@ -139,6 +154,11 @@ jobs:
139154
with:
140155
dotnet-version: '8.x'
141156

157+
- name: Install pnpm
158+
uses: pnpm/action-setup@v4
159+
with:
160+
version: 9.12.2
161+
142162
- name: Download Artifacts 🔻 # The documentation is downloaded into the 'siteDocFx' folder.
143163
uses: actions/download-artifact@v4
144164
with:
@@ -185,6 +205,11 @@ jobs:
185205
with:
186206
dotnet-version: '8.x'
187207

208+
- name: Install pnpm
209+
uses: pnpm/action-setup@v4
210+
with:
211+
version: 9.12.2
212+
188213
- name: Build Material.Blazor & Generate the NuGet package 🔧
189214
run: >
190215
dotnet pack ${{env.projectMB}}

‎.github/workflows/GithubActionsWIP.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ jobs:
8181
with:
8282
dotnet-version: '8.x'
8383

84+
- name: Install pnpm
85+
uses: pnpm/action-setup@v4
86+
with:
87+
version: 9.12.2
88+
8489
- name: Run the acceptance tests as the first build action and cancel out the rest if it fails
8590
run: dotnet test ${{env.projectTest}} --configuration ${{env.buildConfiguration}}
8691

@@ -104,6 +109,11 @@ jobs:
104109
- name: Setup docfx
105110
run: dotnet tool update -g docfx
106111

112+
- name: Install pnpm
113+
uses: pnpm/action-setup@v4
114+
with:
115+
version: 9.12.2
116+
107117
- name: Build Material.Blazor
108118
run: dotnet build ${{env.projectMB}} --configuration ${{env.buildConfiguration}}
109119

@@ -146,6 +156,11 @@ jobs:
146156
with:
147157
dotnet-version: '8.x'
148158

159+
- name: Install pnpm
160+
uses: pnpm/action-setup@v4
161+
with:
162+
version: 9.12.2
163+
149164
- name: Build & Publish Website 🔧
150165
run: >
151166
dotnet publish ${{env.projectWeb}}
@@ -205,6 +220,11 @@ jobs:
205220
with:
206221
dotnet-version: '8.x'
207222

223+
- name: Install pnpm
224+
uses: pnpm/action-setup@v4
225+
with:
226+
version: 9.12.2
227+
208228
- name: Build Material.Blazor & Generate the NuGet package 🔧
209229
run: >
210230
dotnet pack ${{env.projectMB}}

‎Material.Blazor.Test/Material.Blazor.Test.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
</PropertyGroup>
55

66
<ItemGroup>
7-
<PackageReference Include="bunit" Version="1.32.7" />
8-
<PackageReference Include="bunit.core" Version="1.32.7" />
9-
<PackageReference Include="bunit.web" Version="1.32.7" />
10-
<PackageReference Include="NSubstitute" Version="5.1.0" />
7+
<PackageReference Include="bunit" Version="1.36.0" />
8+
<PackageReference Include="bunit.core" Version="1.36.0" />
9+
<PackageReference Include="bunit.web" Version="1.36.0" />
10+
<PackageReference Include="NSubstitute" Version="5.3.0" />
1111
<PackageReference Include="xunit" Version="2.9.2" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1313
<PrivateAssets>all</PrivateAssets>

‎Material.Blazor.Website.Server/Material.Blazor.Website.Server.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.10" />
17-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.10" />
18-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.10" />
16+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.11" />
17+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.11" />
18+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.11" />
1919
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
2020
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
2121
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
22-
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
23-
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
22+
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
23+
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎Material.Blazor.Website.WebAssembly/Material.Blazor.Website.WebAssembly.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
9-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.10" PrivateAssets="all" />
8+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
9+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.11" PrivateAssets="all" />
1010
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
11-
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
11+
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
1212
<PackageReference Include="Serilog.Sinks.BrowserConsole" Version="8.0.0" />
1313
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
1414
</ItemGroup>

‎Material.Blazor.Website/.npmrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
engine-strict = true
2+
shamefully-hoist=true

‎Material.Blazor.Website/Material.Blazor.Website.csproj‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,17 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<Content Remove="package-lock.json" />
2423
<Content Remove="package.json" />
2524
</ItemGroup>
2625

2726
<ItemGroup>
28-
<None Include="package-lock.json" />
2927
<None Include="package.json" />
3028
</ItemGroup>
3129

3230
<ItemGroup>
3331
<PackageReference Include="GoogleAnalytics.Blazor" Version="1.0.3" />
34-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.10" />
35-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.10" />
32+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.11" />
33+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.11" />
3634
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
3735
</ItemGroup>
3836

@@ -43,17 +41,17 @@
4341
<UpToDateCheckOutput Include="@(OutputStaticAssetsStyles)" Set="Styles" />
4442
</ItemGroup>
4543

46-
<!--
44+
4745
<ItemGroup>
4846
<InputStaticAssetsScripts Include="scripts\*.ts" />
4947
<OutputStaticAssetsScripts Include="wwwroot\js\material.blazor.website.js;wwwroot\js\material.blazor.website.min.js" />
50-
-->
48+
5149
<!-- Keep this Remove/Include pair -->
52-
<!--
50+
5351
<Content Remove="@(OutputStaticAssetsScripts)" />
5452
<Content Include="@(OutputStaticAssetsScripts)" />
5553
</ItemGroup>
56-
-->
54+
5755

5856
<ItemGroup>
5957
<InputStaticAssetsStyles Include="styles\*.scss;" />
@@ -67,59 +65,59 @@
6765
<ProjectReference Include="..\Material.Blazor\Material.Blazor.csproj" />
6866
</ItemGroup>
6967

70-
<Target Name="CheckIfNpmExists" BeforeTargets="PreBuildEvent">
68+
<Target Name="CheckIfpnpmExists" BeforeTargets="PreBuildEvent">
7169
<Message Importance="high" Text="***** Building M.B.W" />
72-
<Exec Command="npm install" ContinueOnError="true" StandardOutputImportance="low" StandardErrorImportance="low" LogStandardErrorAsError="false" IgnoreExitCode="true">
73-
<Output TaskParameter="ExitCode" PropertyName="NpmReturnCode" />
70+
<Exec Command="pnpm install" ContinueOnError="true" StandardOutputImportance="low" StandardErrorImportance="low" LogStandardErrorAsError="false" IgnoreExitCode="true">
71+
<Output TaskParameter="ExitCode" PropertyName="pnpmReturnCode" />
7472
</Exec>
7573
</Target>
7674

77-
<Target Name="ErrorOutput" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfNpmExists" Condition=" '$(NpmReturnCode)' != '0' ">
75+
<Target Name="ErrorOutput" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfpnpmExists" Condition=" '$(pnpmReturnCode)' != '0' ">
7876
<Message Importance="high" Text="**********************************************************************************" />
7977
<Message Importance="high" Text="**********************************************************************************" />
8078
<Message Importance="high" Text="**********************************************************************************" />
81-
<Message Importance="high" Text="***** 'npm --version' return code was $(NpmReturnCode)" />
79+
<Message Importance="high" Text="***** 'pnpm --version' return code was $(pnpmReturnCode)" />
8280
<Message Importance="high" Text="CSS and JS not built due to the lack of a proper development environment" />
8381
<Message Importance="high" Text="See https://material-blazor.com/docs/articles/DevelopmentEnvironment.html" />
8482
<Message Importance="high" Text="If the return code is 1, check package.json and package-lock.json" />
85-
<Message Importance="high" Text="If the return code is 9009, npm is not present" />
86-
<Message Importance="high" Text="For other non-zero return codes, check npm documentation" />
83+
<Message Importance="high" Text="If the return code is 9009, pnpm is not present" />
84+
<Message Importance="high" Text="For other non-zero return codes, check pnpm documentation" />
8785
<Message Importance="high" Text="**********************************************************************************" />
8886
<Message Importance="high" Text="**********************************************************************************" />
8987
<Message Importance="high" Text="**********************************************************************************" />
9088
</Target>
9189

92-
<Target Name="BuildScripts" Inputs="@(InputStaticAssetsScripts)" Outputs="@(OutputStaticAssetsScripts)" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfNpmExists" Condition=" '$(NpmReturnCode)' == '0' ">
90+
<Target Name="BuildScripts" Inputs="@(InputStaticAssetsScripts)" Outputs="@(OutputStaticAssetsScripts)" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfpnpmExists" Condition=" '$(pnpmReturnCode)' == '0' ">
9391
<Message Importance="high" Text="***** MakeDir wwwroot and wwwroot\js (M.B.W Scripts)" />
9492
<Exec Command="mkdir wwwroot\js" IgnoreExitCode="true" />
9593

96-
<Message Importance="high" Text="***** npm run build-js (M.B.W Scripts)" />
97-
<Exec Command="npm run build-js" />
94+
<Message Importance="high" Text="***** pnpm run build-js (M.B.W Scripts)" />
95+
<Exec Command="pnpm run build-js" />
9896

99-
<Message Importance="high" Text="***** npm run build-js-minify (M.B.W Scripts)" />
100-
<Exec Command="npm run build-js-minify" />
97+
<Message Importance="high" Text="***** pnpm run build-js-minify (M.B.W Scripts)" />
98+
<Exec Command="pnpm run build-js-minify" />
10199

102100
</Target>
103101

104-
<Target Name="BuildStyles" Inputs="@(InputStaticAssetsStyles)" Outputs="@(OutputStaticAssetsStyles)" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfNpmExists" Condition=" '$(NpmReturnCode)' == '0' ">
102+
<Target Name="BuildStyles" Inputs="@(InputStaticAssetsStyles)" Outputs="@(OutputStaticAssetsStyles)" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfpnpmExists" Condition=" '$(pnpmReturnCode)' == '0' ">
105103
<Message Importance="high" Text="***** mkdir wwwroot and wwwroot\css (M.B.W Styles)" />
106104
<Exec Command="mkdir wwwroot\css" IgnoreExitCode="true" />
107105

108106
<!-- Build minified themes -->
109107
<Message Importance="high" Text="***** build material default theme (M.B.W Styles)" />
110-
<Exec Command="npm run build-min-material-default" />
108+
<Exec Command="pnpm run build-min-material-default" />
111109

112110
<Message Importance="high" Text="***** build light square theme (M.B.W Styles)" />
113-
<Exec Command="npm run build-min-light-square" />
111+
<Exec Command="pnpm run build-min-light-square" />
114112

115113
<Message Importance="high" Text="***** build dark square theme (M.B.W Styles)" />
116-
<Exec Command="npm run build-min-dark-square" />
114+
<Exec Command="pnpm run build-min-dark-square" />
117115

118116
<Message Importance="high" Text="***** build rounded theme (M.B.W Styles)" />
119-
<Exec Command="npm run build-min-rounded" />
117+
<Exec Command="pnpm run build-min-rounded" />
120118

121119
<Message Importance="high" Text="***** build asymmetric theme (M.B.W Styles)" />
122-
<Exec Command="npm run build-min-asymmetric" />
120+
<Exec Command="pnpm run build-min-asymmetric" />
123121

124122
</Target>
125123

0 commit comments

Comments
 (0)