Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024-11-13 5.3.12 #1343

Merged
merged 3 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ updates:
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 0



Expand All @@ -19,13 +20,15 @@ updates:
interval: "weekly"
ignore:
- dependency-name: "sass"
open-pull-requests-limit: 0

- package-ecosystem: "npm"
directory: "/materia.blazor.website"
schedule:
interval: "weekly"
ignore:
- dependency-name: "sass"
open-pull-requests-limit: 0



Expand All @@ -35,24 +38,28 @@ updates:
interval: "weekly"
ignore:
- dependency-name: "Nager.Date"
open-pull-requests-limit: 0

- package-ecosystem: "nuget"
directory: "/materia.blazor.website"
schedule:
interval: "weekly"
ignore:
- dependency-name: "Nager.Date"
open-pull-requests-limit: 0

- package-ecosystem: "nuget"
directory: "/materia.blazor.website.server"
schedule:
interval: "weekly"
ignore:
- dependency-name: "Nager.Date"
open-pull-requests-limit: 0

- package-ecosystem: "nuget"
directory: "/materia.blazor.website.webassembly"
schedule:
interval: "weekly"
ignore:
- dependency-name: "Nager.Date"
open-pull-requests-limit: 0
25 changes: 25 additions & 0 deletions .github/workflows/GithubActionsRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ jobs:
with:
dotnet-version: '8.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9.12.2

- name: Run the acceptance tests as the first build action and cancel out the rest if it fails
run: dotnet test ${{env.projectTest}} --configuration ${{env.buildConfiguration}}
############################################################################################################
Expand All @@ -72,6 +77,11 @@ jobs:
run: dotnet tool update -g docfx

- name: Build Material.Blazor
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9.12.2

run: dotnet build ${{env.projectMB}} --configuration ${{env.buildConfiguration}}

- name: Create documentation 🔧
Expand Down Expand Up @@ -107,6 +117,11 @@ jobs:
dotnet-version: '8.x'

- name: Build and Publish Website 🔧
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9.12.2

run: >
dotnet publish ${{env.projectWeb}}
--configuration ${{env.buildConfiguration}}
Expand Down Expand Up @@ -139,6 +154,11 @@ jobs:
with:
dotnet-version: '8.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9.12.2

- name: Download Artifacts 🔻 # The documentation is downloaded into the 'siteDocFx' folder.
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -185,6 +205,11 @@ jobs:
with:
dotnet-version: '8.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9.12.2

- name: Build Material.Blazor & Generate the NuGet package 🔧
run: >
dotnet pack ${{env.projectMB}}
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/GithubActionsWIP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ jobs:
with:
dotnet-version: '8.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9.12.2

- name: Run the acceptance tests as the first build action and cancel out the rest if it fails
run: dotnet test ${{env.projectTest}} --configuration ${{env.buildConfiguration}}

Expand All @@ -104,6 +109,11 @@ jobs:
- name: Setup docfx
run: dotnet tool update -g docfx

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9.12.2

- name: Build Material.Blazor
run: dotnet build ${{env.projectMB}} --configuration ${{env.buildConfiguration}}

Expand Down Expand Up @@ -146,6 +156,11 @@ jobs:
with:
dotnet-version: '8.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9.12.2

- name: Build & Publish Website 🔧
run: >
dotnet publish ${{env.projectWeb}}
Expand Down Expand Up @@ -205,6 +220,11 @@ jobs:
with:
dotnet-version: '8.x'

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9.12.2

- name: Build Material.Blazor & Generate the NuGet package 🔧
run: >
dotnet pack ${{env.projectMB}}
Expand Down
8 changes: 4 additions & 4 deletions Material.Blazor.Test/Material.Blazor.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="bunit" Version="1.32.7" />
<PackageReference Include="bunit.core" Version="1.32.7" />
<PackageReference Include="bunit.web" Version="1.32.7" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="bunit" Version="1.36.0" />
<PackageReference Include="bunit.core" Version="1.36.0" />
<PackageReference Include="bunit.web" Version="1.36.0" />
<PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.11" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.10" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.11" PrivateAssets="all" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
<PackageReference Include="Serilog.Sinks.BrowserConsole" Version="8.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
</ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions Material.Blazor.Website/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
engine-strict = true
shamefully-hoist=true
50 changes: 24 additions & 26 deletions Material.Blazor.Website/Material.Blazor.Website.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,17 @@
</ItemGroup>

<ItemGroup>
<Content Remove="package-lock.json" />
<Content Remove="package.json" />
</ItemGroup>

<ItemGroup>
<None Include="package-lock.json" />
<None Include="package.json" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="GoogleAnalytics.Blazor" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.11" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
</ItemGroup>

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

<!--

<ItemGroup>
<InputStaticAssetsScripts Include="scripts\*.ts" />
<OutputStaticAssetsScripts Include="wwwroot\js\material.blazor.website.js;wwwroot\js\material.blazor.website.min.js" />
-->

<!-- Keep this Remove/Include pair -->
<!--

<Content Remove="@(OutputStaticAssetsScripts)" />
<Content Include="@(OutputStaticAssetsScripts)" />
</ItemGroup>
-->


<ItemGroup>
<InputStaticAssetsStyles Include="styles\*.scss;" />
Expand All @@ -67,59 +65,59 @@
<ProjectReference Include="..\Material.Blazor\Material.Blazor.csproj" />
</ItemGroup>

<Target Name="CheckIfNpmExists" BeforeTargets="PreBuildEvent">
<Target Name="CheckIfpnpmExists" BeforeTargets="PreBuildEvent">
<Message Importance="high" Text="***** Building M.B.W" />
<Exec Command="npm install" ContinueOnError="true" StandardOutputImportance="low" StandardErrorImportance="low" LogStandardErrorAsError="false" IgnoreExitCode="true">
<Output TaskParameter="ExitCode" PropertyName="NpmReturnCode" />
<Exec Command="pnpm install" ContinueOnError="true" StandardOutputImportance="low" StandardErrorImportance="low" LogStandardErrorAsError="false" IgnoreExitCode="true">
<Output TaskParameter="ExitCode" PropertyName="pnpmReturnCode" />
</Exec>
</Target>

<Target Name="ErrorOutput" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfNpmExists" Condition=" '$(NpmReturnCode)' != '0' ">
<Target Name="ErrorOutput" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfpnpmExists" Condition=" '$(pnpmReturnCode)' != '0' ">
<Message Importance="high" Text="**********************************************************************************" />
<Message Importance="high" Text="**********************************************************************************" />
<Message Importance="high" Text="**********************************************************************************" />
<Message Importance="high" Text="***** 'npm --version' return code was $(NpmReturnCode)" />
<Message Importance="high" Text="***** 'pnpm --version' return code was $(pnpmReturnCode)" />
<Message Importance="high" Text="CSS and JS not built due to the lack of a proper development environment" />
<Message Importance="high" Text="See https://material-blazor.com/docs/articles/DevelopmentEnvironment.html" />
<Message Importance="high" Text="If the return code is 1, check package.json and package-lock.json" />
<Message Importance="high" Text="If the return code is 9009, npm is not present" />
<Message Importance="high" Text="For other non-zero return codes, check npm documentation" />
<Message Importance="high" Text="If the return code is 9009, pnpm is not present" />
<Message Importance="high" Text="For other non-zero return codes, check pnpm documentation" />
<Message Importance="high" Text="**********************************************************************************" />
<Message Importance="high" Text="**********************************************************************************" />
<Message Importance="high" Text="**********************************************************************************" />
</Target>

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

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

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

</Target>

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

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

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

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

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

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

</Target>

Expand Down
Loading
Loading