Skip to content

Migrate from BuildBundlerMinifier to WebOptimizer #13

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.

Sign up for GitHub

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

Merged
Externius merged 2 commits into from
Nov 2, 2025
Merged

Migrate from BuildBundlerMinifier to WebOptimizer #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
023566c
Migrate from BuildBundlerMinifier to LigerShark.WebOptimizer.Core
Externius Nov 2, 2025
ab02b90
Update libman pkgs
Externius Nov 2, 2025
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
5 changes: 2 additions & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageVersion Include="IdentityModel" Version="7.0.0" />
<PackageVersion Include="LigerShark.WebOptimizer.Core" Version="3.0.477" />
<PackageVersion Include="Mapster" Version="7.4.0" />
<PackageVersion Include="Mapster.DependencyInjection" Version="1.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.10" />
Expand All @@ -20,8 +20,7 @@
<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="Serilog.Sinks.MSSqlServer" Version="9.0.0" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.10" />
<PackageVersion Include="Serilog.Sinks.MSSqlServer" Version="9.0.1" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.10" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
Expand Down
27 changes: 13 additions & 14 deletions src/Open5ETools.Core/Open5ETools.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Mapster" />
<PackageReference Include="Mapster.DependencyInjection" />
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="System.Configuration.ConfigurationManager" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="Serilog.AspNetCore" />
<PackageReference Include="Serilog.Settings.Configuration" />
<PackageReference Include="Serilog.Sinks.File" />
<PackageReference Include="Serilog.Sinks.MSSqlServer" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Open5ETools.Resources\Open5ETools.Resources.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Mapster"/>
<PackageReference Include="Mapster.DependencyInjection"/>
<PackageReference Include="Microsoft.EntityFrameworkCore"/>
<PackageReference Include="System.Text.Json"/>
<PackageReference Include="Serilog.AspNetCore"/>
<PackageReference Include="Serilog.Settings.Configuration"/>
<PackageReference Include="Serilog.Sinks.File"/>
<PackageReference Include="Serilog.Sinks.MSSqlServer"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Open5ETools.Resources\Open5ETools.Resources.csproj"/>
</ItemGroup>
</Project>
18 changes: 9 additions & 9 deletions src/Open5ETools.Infrastructure/Open5ETools.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Open5ETools.Core\Open5ETools.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Open5ETools.Core\Open5ETools.Core.csproj"/>
</ItemGroup>
</Project>
228 changes: 112 additions & 116 deletions src/Open5ETools.Resources/Open5ETools.Resources.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,119 +1,115 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<None Remove="Data\5e-SRD-Monsters.json" />
<None Remove="Data\treasures.json" />
</ItemGroup>

<ItemGroup>
<Content Include="Data\5e-SRD-Monsters.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="Data\treasures.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="Data\5e-SRD-Spells.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<Compile Update="Common.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Common.resx</DependentUpon>
</Compile>
<Compile Update="Dungeon.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Dungeon.resx</DependentUpon>
</Compile>
<Compile Update="Encounter.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Encounter.resx</DependentUpon>
</Compile>
<Compile Update="Error.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Error.resx</DependentUpon>
</Compile>
<Compile Update="Home.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Home.resx</DependentUpon>
</Compile>
<Compile Update="Profile.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Profile.resx</DependentUpon>
</Compile>
<Compile Update="Spell.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Spell.resx</DependentUpon>
</Compile>
<Compile Update="User.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>User.resx</DependentUpon>
</Compile>
<Compile Update="Enum.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Enum.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Common.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Common.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Dungeon.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Dungeon.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Encounter.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Encounter.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Error.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Error.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Error.hu.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Home.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Home.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Profile.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Profile.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Spell.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Spell.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="User.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>User.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Enum.hu.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Enum.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Enum.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Remove="Data\5e-SRD-Monsters.json"/>
<None Remove="Data\treasures.json"/>
</ItemGroup>
<ItemGroup>
<Content Include="Data\5e-SRD-Monsters.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="Data\treasures.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="Data\5e-SRD-Spells.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Compile Update="Common.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Common.resx</DependentUpon>
</Compile>
<Compile Update="Dungeon.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Dungeon.resx</DependentUpon>
</Compile>
<Compile Update="Encounter.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Encounter.resx</DependentUpon>
</Compile>
<Compile Update="Error.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Error.resx</DependentUpon>
</Compile>
<Compile Update="Home.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Home.resx</DependentUpon>
</Compile>
<Compile Update="Profile.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Profile.resx</DependentUpon>
</Compile>
<Compile Update="Spell.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Spell.resx</DependentUpon>
</Compile>
<Compile Update="User.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>User.resx</DependentUpon>
</Compile>
<Compile Update="Enum.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Enum.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Common.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Common.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Dungeon.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Dungeon.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Encounter.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Encounter.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Error.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Error.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Error.hu.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Home.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Home.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Profile.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Profile.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Spell.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Spell.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="User.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>User.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Enum.hu.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Enum.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Enum.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
</Project>
6 changes: 5 additions & 1 deletion src/Open5ETools.Web/ConfigureServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ public static IServiceCollection AddWebServices(this IServiceCollection services
.AddRazorRuntimeCompilation()
#endif
;

services.AddWebOptimizer(pipeline =>
{
pipeline.AddJavaScriptBundle("js/site.min.js", "js/site.js", "js/password.js");
pipeline.AddCssBundle("css/site.min.css", "css/site.css");
});
services.AddHealthChecks();

return services;
Expand Down
8 changes: 2 additions & 6 deletions src/Open5ETools.Web/Open5ETools.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TieredCompilation>true</TieredCompilation>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<AssemblyVersion>1.0.3.1</AssemblyVersion>
<AssemblyVersion>1.0.3.2</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BuildBundlerMinifier"/>
<PackageReference Include="IdentityModel"/>
<PackageReference Include="LigerShark.WebOptimizer.Core"/>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"/>
<PackageReference Include="Microsoft.Web.LibraryManager.Build"/>
<PackageReference Include="System.IdentityModel.Tokens.Jwt"/>
<PackageReference Include="X.PagedList"/>
<PackageReference Include="X.PagedList.Mvc.Core"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Open5ETools.Core\Open5ETools.Core.csproj"/>
<ProjectReference Include="..\Open5ETools.Infrastructure\Open5ETools.Infrastructure.csproj"/>
<ProjectReference Include="..\Open5ETools.Resources\Open5ETools.Resources.csproj"/>
</ItemGroup>

</Project>
3 changes: 2 additions & 1 deletion src/Open5ETools.Web/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
}

app.UseHttpsRedirection();
app.UseWebOptimizer();
app.UseStaticFiles();
app.UseRouting();
app.UseCookiePolicy();
Expand All @@ -61,4 +62,4 @@
pattern: "{controller=Home}/{action=Index}/{id?}");
app.MapHealthChecks("/health");

app.Run();
app.Run();
15 changes: 8 additions & 7 deletions src/Open5ETools.Web/Views/Shared/_ValidationScriptsPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@
<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
</environment>
<environment exclude="Development">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.21.0/jquery.validate.min.js"
asp-fallback-src="~/lib/jquery-validation/jquery.validate.min.js"
asp-fallback-test="window.jQuery && window.jQuery.validator"
integrity="sha512-KFHXdr2oObHKI9w4Hv1XPKc898mE4kgYx58oqsc/JqqdLMDI4YjOLzom+EMlW8HFUd0QfjfAvxSL6sEq/a42fQ=="
crossorigin="anonymous" r
eferrerpolicy="no-referrer">
<script
src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.21.0/jquery.validate.min.js"
asp-fallback-src="~/lib/jquery-validation/jquery.validate.min.js"
asp-fallback-test="window.jQuery && window.jQuery.validator"
integrity="sha512-KFHXdr2oObHKI9w4Hv1XPKc898mE4kgYx58oqsc/JqqdLMDI4YjOLzom+EMlW8HFUd0QfjfAvxSL6sEq/a42fQ=="
crossorigin="anonymous"
referrerpolicy="no-referrer">
</script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/4.0.0/jquery.validate.unobtrusive.min.js"
asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
integrity="sha512-o6XqxgrUsKmchwy9G5VRNWSSxTS4Urr4loO6/0hYdpWmFUfHqGzawGxeQGMDqYzxjY9sbktPbNlkIQJWagVZQg=="
integrity="sha512-xq+Vm8jC94ynOikewaQXMEkJIOBp7iArs3IhFWSWdRT3Pq8wFz46p+ZDFAR7kHnSFf+zUv52B3prRYnbDRdgog=="
crossorigin="anonymous"
referrerpolicy="no-referrer">
</script>
Expand Down
Loading