Skip to content

Commit 41d66c1

Browse files
enisnenisn
authored
Merge pull request #25235 from abpframework/feat/mudblazor
Support MudBlazor.
2 parents 30dee7c + 9bea1ea commit 41d66c1

897 files changed

Lines changed: 66880 additions & 2228 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.

‎.claude/settings.local.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"allow": [
44
"Bash(yarn nx g:*)",
55
"Bash(npx vitest:*)",
6+
"Bash(xargs:*)",
7+
"Bash(dotnet build:*)",
68
"Bash(git show:*)"
79
]
810
}

‎Directory.Packages.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<PackageVersion Include="Blazorise.Components" Version="2.0.4" />
2424
<PackageVersion Include="Blazorise.DataGrid" Version="2.0.4" />
2525
<PackageVersion Include="Blazorise.Snackbar" Version="2.0.4" />
26+
<PackageVersion Include="MudBlazor" Version="8.0.0" />
2627
<PackageVersion Include="Castle.Core" Version="5.2.1" />
2728
<PackageVersion Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
2829
<PackageVersion Include="CommonMark.NET" Version="0.15.1" />

‎docs/en/package-version-changes.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@
7474
| System.Text.Encodings.Web | 10.0.2 | 10.0.7 | #25313 |
7575
| System.Text.Json | 10.0.2 | 10.0.7 | #25313 |
7676

77+
**Added:**
78+
79+
| Package | Version | PR |
80+
|---------|---------|-----|
81+
| MudBlazor | 8.0.0 | #25235 |
82+
7783
## 10.3.1
7884

7985
| Package | Old Version | New Version | PR |

‎framework/Volo.Abp.slnx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@
1010
<Project Path="src/Volo.Abp.AspNetCore.Bundling/Volo.Abp.AspNetCore.Bundling.csproj" />
1111
<Project Path="src/Volo.Abp.AspNetCore.Components.MauiBlazor.Bundling/Volo.Abp.AspNetCore.Components.MauiBlazor.Bundling.csproj" />
1212
<Project Path="src/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.Bundling/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.Bundling.csproj" />
13+
<Project Path="src/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.Bundling/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.Bundling.csproj" />
14+
<Project Path="src/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.csproj" />
1315
<Project Path="src/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.csproj" />
1416
<Project Path="src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo.Abp.AspNetCore.Components.MauiBlazor.csproj" />
17+
<Project Path="src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor.csproj" />
1518
<Project Path="src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.csproj" />
1619
<Project Path="src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.csproj" />
20+
<Project Path="src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.csproj" />
1721
<Project Path="src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.csproj" />
1822
<Project Path="src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.csproj" />
1923
<Project Path="src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Bundling/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Bundling.csproj" />
24+
<Project Path="src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor.Bundling/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor.Bundling.csproj" />
25+
<Project Path="src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor.csproj" />
2026
<Project Path="src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
2127
<Project Path="src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.csproj" />
2228
<Project Path="src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.csproj" />
@@ -137,6 +143,7 @@
137143
<Project Path="src/Volo.Abp.MemoryDb/Volo.Abp.MemoryDb.csproj" />
138144
<Project Path="src/Volo.Abp.Minify/Volo.Abp.Minify.csproj" />
139145
<Project Path="src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj" />
146+
<Project Path="src/Volo.Abp.MudBlazorUI/Volo.Abp.MudBlazorUI.csproj" />
140147
<Project Path="src/Volo.Abp.MultiLingualObjects/Volo.Abp.MultiLingualObjects.csproj" />
141148
<Project Path="src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj" />
142149
<Project Path="src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj" />

‎framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.Bundling/AbpAspNetCoreComponentsMauiBlazorThemingMudBlazorBundlingModule.cs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
2+
using Volo.Abp.Modularity;
3+
4+
namespace Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.Bundling;
5+
6+
[DependsOn(
7+
typeof(AbpAspNetCoreMvcUiBundlingAbstractionsModule)
8+
)]
9+
public class AbpAspNetCoreComponentsMauiBlazorThemingMudBlazorBundlingModule : AbpModule
10+
{
11+
public override void ConfigureServices(ServiceConfigurationContext context)
12+
{
13+
Configure<AbpBundlingOptions>(options =>
14+
{
15+
options.GlobalAssets.Enabled = true;
16+
options.GlobalAssets.GlobalStyleBundleName = MauiBlazorMudBlazorStandardBundles.Styles.Global;
17+
options.GlobalAssets.GlobalScriptBundleName = MauiBlazorMudBlazorStandardBundles.Scripts.Global;
18+
19+
options
20+
.StyleBundles
21+
.Add(MauiBlazorMudBlazorStandardBundles.Styles.Global, bundle =>
22+
{
23+
bundle.AddContributors(typeof(MauiBlazorMudBlazorStyleContributor));
24+
});
25+
26+
options
27+
.ScriptBundles
28+
.Add(MauiBlazorMudBlazorStandardBundles.Scripts.Global, bundle =>
29+
{
30+
bundle.AddContributors(typeof(MauiBlazorMudBlazorScriptContributor));
31+
});
32+
});
33+
}
34+
}

‎framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.Bundling/FodyWeavers.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
2+
<ConfigureAwait ContinueOnCapturedContext="false" />
3+
</Weavers>

‎framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.Bundling/FodyWeavers.xsd‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
3+
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
4+
<xs:element name="Weavers">
5+
<xs:complexType>
6+
<xs:all>
7+
<xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
8+
<xs:complexType>
9+
<xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
10+
</xs:complexType>
11+
</xs:element>
12+
</xs:all>
13+
<xs:attribute name="VerifyAssembly" type="xs:boolean">
14+
<xs:annotation>
15+
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
16+
</xs:annotation>
17+
</xs:attribute>
18+
<xs:attribute name="VerifyIgnoreCodes" type="xs:string">
19+
<xs:annotation>
20+
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
21+
</xs:annotation>
22+
</xs:attribute>
23+
<xs:attribute name="GenerateXsd" type="xs:boolean">
24+
<xs:annotation>
25+
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
26+
</xs:annotation>
27+
</xs:attribute>
28+
</xs:complexType>
29+
</xs:element>
30+
</xs:schema>

‎framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.Bundling/MauiBlazorMudBlazorScriptContributor.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System.Collections.Generic;
2+
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
3+
4+
namespace Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.Bundling;
5+
6+
public class MauiBlazorMudBlazorScriptContributor : BundleContributor
7+
{
8+
public override void ConfigureBundle(BundleConfigurationContext context)
9+
{
10+
context.Files.AddIfNotContains("_content/MudBlazor/MudBlazor.min.js");
11+
context.Files.AddIfNotContains("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/abp.js");
12+
context.Files.AddIfNotContains("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/lang-utils.js");
13+
}
14+
}

‎framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.Bundling/MauiBlazorMudBlazorStandardBundles.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
namespace Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.Bundling;
2+
3+
public class MauiBlazorMudBlazorStandardBundles
4+
{
5+
public static class Styles
6+
{
7+
public static string Global = "MauiBlazorMudBlazor.Global";
8+
}
9+
10+
public static class Scripts
11+
{
12+
public static string Global = "MauiBlazorMudBlazor.Global";
13+
}
14+
}

‎framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.Bundling/MauiBlazorMudBlazorStyleContributor.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System.Collections.Generic;
2+
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
3+
4+
namespace Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor.Bundling;
5+
6+
public class MauiBlazorMudBlazorStyleContributor : BundleContributor
7+
{
8+
public override void ConfigureBundle(BundleConfigurationContext context)
9+
{
10+
context.Files.AddIfNotContains("_content/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor/libs/fontawesome/css/all.css");
11+
context.Files.AddIfNotContains("_content/MudBlazor/MudBlazor.min.css");
12+
context.Files.AddIfNotContains("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/css/abp.css");
13+
context.Files.AddIfNotContains("_content/Volo.Abp.MudBlazorUI/volo.abp.mudblazorui.css");
14+
context.Files.AddIfNotContains("_content/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming.MudBlazor/libs/flag-icon/css/flag-icon.css");
15+
}
16+
}

0 commit comments

Comments
 (0)