Skip to content

Commit

Permalink
Update to MudBlazor 7.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fgilde committed Aug 6, 2024
1 parent 74f14cc commit bd9a53f
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 31 deletions.
12 changes: 6 additions & 6 deletions MudBlazor.Extensions.Tests/MudBlazor.Extensions.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.17" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.Playwright" Version="1.35.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="bunit" Version="1.21.9" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.Playwright" Version="1.45.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="bunit" Version="1.30.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
12 changes: 6 additions & 6 deletions MudBlazor.Extensions/Components/TreeView/MudExTreeView.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,21 @@ private IDictionary<string, object> GetParameters()
{
var componentType = GetComponentForViewMode();
var res = ComponentRenderHelper.GetCompatibleParameters(this, componentType)
.Where(p => IsOverwritten(p.Key)).ToDictionary();
.Where(p => IsOverwritten(p.Key)).ToDictionary(p => p.Key, p => p.Value);

if(!FiltersChanged.HasDelegate)
res = res.Where(p => p.Key != nameof(Filters)).ToDictionary();
if (!FiltersChanged.HasDelegate)
res = res.Where(p => p.Key != nameof(Filters)).ToDictionary(p => p.Key, p => p.Value);
if (!FilterChanged.HasDelegate)
res = res.Where(p => p.Key != nameof(Filter)).ToDictionary();
res = res.Where(p => p.Key != nameof(Filter)).ToDictionary(p => p.Key, p => p.Value);

foreach (var parameter in Parameters ?? new Dictionary<string, object>())
{
if (ComponentRenderHelper.IsValidParameter(componentType, parameter.Key, parameter.Value))
res.AddOrUpdate(parameter.Key, parameter.Value);
}

res.AddOrUpdate(nameof(ToolBarContent), ToggleComponent().CombineWith(ToolBarContent));
return res.ToDictionary();
return res.ToDictionary(p => p.Key, p => p.Value);
}

private static RenderWithAttribute GetRenderWithAttribute(Enum val)
Expand Down
2 changes: 2 additions & 0 deletions MudBlazor.Extensions/Docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## Change Log
- 2.0.3 > Update MudBlazor to 7.5.0
- 2.0.3 > Fix small bugs
- 2.0.0 > Update MudBlazor to 7.0.0
- 2.0.0 > **_Breaking:_** Rename: Many properties and behavoirs as MudBlazor does. Se migration gide from MudBlazor 6 to 7 [here](https://github.com/MudBlazor/MudBlazor/issues/8447)
- 1.7.89 > Fix bug that uploadable file is not updated in MudExObjectEditDialog
Expand Down
10 changes: 5 additions & 5 deletions MudBlazor.Extensions/MudBlazor.Extensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PropertyGroup>
<MajorVersion>2</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>03</PatchVersion>
<PatchVersion>3</PatchVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)'=='Debug'">
Expand Down Expand Up @@ -67,8 +67,8 @@
</Target>

<ItemGroup>
<PackageReference Include="ExcelDataReader" Version="3.6.0" />
<PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
<PackageReference Include="ExcelDataReader" Version="3.7.0" />
<PackageReference Include="ExcelDataReader.DataSet" Version="3.7.0" />
<PackageReference Include="AuralizeBlazor" Version="1.0.2" />
<PackageReference Include="MudBlazor.Markdown" Version="1.0.2" />
<PackageReference Include="Nextended.Blazor" Version="7.0.38" />
Expand All @@ -78,10 +78,10 @@
<PackageReference Include="Blazored.FluentValidation" Version="2.2.0" />
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="MudBlazor" Version="7.2.0" />
<PackageReference Include="MudBlazor" Version="7.5.0" />
<PackageReference Include="BlazorParameterCastingMagic" Version="1.2.23060811" />
<PackageReference Include="SharpCompress" Version="0.37.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Samples/MainSample.WebAssembly/MainSample.WebAssembly.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.7" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.7" />
<PackageReference Include="BlazorMonaco" Version="3.2.0" />
<PackageReference Condition="'$(Configuration)' == 'Release'" Include="MudBlazor.Extensions" Version="*-*" />
<PackageReference Condition="'$(Configuration)' == 'Release'" Include="MudExObjectEdit.CodeGatorAdapter" Version="*-*" />
Expand Down
7 changes: 6 additions & 1 deletion Samples/MainSample.WebAssembly/Shared/NavMenu.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ public NavigationEntry SelectedNavEntry
_selectedNavEntry = value;
if (HasAction(value))
{
NavigationManager.NavigateTo(value.Href);
try
{
NavigationManager.NavigateTo(value.Href);
}
catch
{}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Samples/MainSample.WebAssembly/wwwroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<button onclick="closeOverlay()">Close</button>
</div>-->

<mud-ex-app-loader AppName="MudBlazor.Extensions" SubTitle="for MudBlazor 7.2.0" AccentColor="#ff4081" MainAppId="app" Logo="/sample-data/logo.png">
<mud-ex-app-loader AppName="MudBlazor.Extensions" SubTitle="for MudBlazor 7.5.0" AccentColor="#ff4081" MainAppId="app" Logo="/sample-data/logo.png">
</mud-ex-app-loader>


Expand Down
6 changes: 3 additions & 3 deletions TryMudEx/Try.Core/Try.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentValidation" Version="11.9.1" />
<PackageReference Include="FluentValidation" Version="11.9.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.20" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.31" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.32" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
<PackageReference Include="MudBlazor" Version="7.0.0" />
<PackageReference Include="MudBlazor" Version="7.5.0" />
<PackageReference Include="MudBlazor.Extensions" Version="*" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions TryMudEx/Try.Tests/Try.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

<ItemGroup>
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions TryMudEx/TryMudEx.Client/TryMudEx.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

<ItemGroup>
<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
<PackageReference Include="FluentValidation" Version="11.9.1" />
<PackageReference Include="FluentValidation" Version="11.9.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.20" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.20" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
<PackageReference Include="MudBlazor" Version="7.2.0" />
<PackageReference Include="MudBlazor" Version="7.5.0" />
<PackageReference Include="MudBlazor.Markdown" Version="1.0.2" />
<PackageReference Condition="'$(Configuration)' == 'Release'" Include="MudBlazor.Extensions" Version="*-*" />

Expand Down
4 changes: 2 additions & 2 deletions TryMudEx/TryMudEx.Server/TryMudEx.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageReference Include="Azure.Identity" Version="1.12.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.21.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.20" NoWarn="NU1605" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.20" NoWarn="NU1605" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.20" />
Expand Down

0 comments on commit bd9a53f

Please sign in to comment.