OSOE-49: Enforce Windows newlines for C# files to avoid false positives with IDE0055 warning.

.gitattributes

@@ -1 +1,5 @@
 * text=auto
+
+# Enforce Windows newlines for C# files to avoid false positives with IDE0055 warning.
+# See https://github.com/Lombiq/Open-Source-Orchard-Core-Extensions/issues/106 for more information.
+*.cs text eol=crlf

Lombiq.BaseTheme.Samples/Lombiq.BaseTheme.Samples.csproj

@@ -4,7 +4,6 @@
     <TargetFramework>net6.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <DefaultItemExcludes>$(DefaultItemExcludes);.git*;node_modules\**;Tests\**</DefaultItemExcludes>
-    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

Lombiq.BaseTheme.Samples/Services/ResourceFilters.cs

@@ -4,13 +4,16 @@
 namespace Lombiq.DataTables.Samples.Navigation;
 
 // This service implements conditional configuration to direct the ResourceFilterMiddleware when and what styles need to
-// be added to the resources.
+// be added to the resources. The attribute indicates that the middleware should only invoke this provider if the
+// current admin or site theme is equal to the one in the attribute constructor.
+[ResourceFilterThemeRequirement(FeatureIds.BaseThemeSamples)]
 public class ResourceFilters : IResourceFilterProvider
 {
     public void AddResourceFilter(ResourceFilterBuilder builder)
     {
-        // We always want to add the site style. If you only have "Always" styles then it's easier to inject them via
-        // the Views/Widget-LayoutInjection.cshtml file and skip using a ResourceFilterMiddleware.
+        // We always want to add the site style. If you only have "Always" styles and you are going to override
+        // Views/Widget-LayoutInjection.cshtml anyway, then it's easier to inject your style there and skip using a
+        // ResourceFilterMiddleware altogether.
         builder.Always().RegisterStylesheet(ResourceNames.Site);
         builder.WhenContentType("BlogPost").RegisterStylesheet(ResourceNames.BlogPost);
     }

Lombiq.BaseTheme.Samples/Startup.cs

@@ -7,6 +7,8 @@
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
 using OrchardCore.ResourceManagement;
+using System;
+using System.Threading.Tasks;
 using static Lombiq.BaseTheme.Samples.Constants.FeatureIds;
 
 namespace Lombiq.BaseTheme.Samples;

Lombiq.BaseTheme.Tests.UI/Lombiq.BaseTheme.Tests.UI.csproj

@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="2.1.1" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="2.2.0-alpha.6" />
   </ItemGroup>
 
   <ItemGroup>

Lombiq.BaseTheme/Lombiq.BaseTheme.csproj

@@ -44,10 +44,11 @@
     <ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.csproj" />
     <ProjectReference Include="..\..\..\Modules\Lombiq.HelpfulExtensions\Lombiq.HelpfulExtensions.csproj" />
     <ProjectReference Include="..\..\..\Utilities\Lombiq.Gulp.Extensions\Lombiq.Gulp.Extensions.csproj" />
+    <ProjectReference Include="..\..\..\Utilities\Lombiq.Npm.Targets\Lombiq.Npm.Targets.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.HelpfulLibraries" Version="4.2.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries" Version="4.2.1-alpha.4" />
     <PackageReference Include="Lombiq.HelpfulExtensions" Version="3.2.0" />
 
     <Content Include="Assets/Styles/**/*.*">

Lombiq.BaseTheme/Services/ResourceFilters.cs

@@ -0,0 +1,11 @@
+using Lombiq.BaseTheme.Constants;
+using Lombiq.HelpfulLibraries.OrchardCore.ResourceManagement;
+
+namespace Lombiq.DataTables.Navigation;
+
+[ResourceFilterThemeRequirement(FeatureIds.BaseTheme)]
+public class ResourceFilters : IResourceFilterProvider
+{
+    public void AddResourceFilter(ResourceFilterBuilder builder) =>
+        builder.Always().RegisterStylesheet(ResourceNames.Site);
+}

Lombiq.BaseTheme/Startup.cs

@@ -1,5 +1,7 @@
 using Lombiq.BaseTheme.Migrations;
 using Lombiq.BaseTheme.Services;
+using Lombiq.DataTables.Navigation;
+using Lombiq.HelpfulLibraries.OrchardCore.ResourceManagement;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -18,5 +20,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.Configure<MvcOptions>(options => options.Filters.Add(typeof(MainMenuWidgetFilter)));
 
         services.AddScoped<IDataMigration, LayoutInjectionMigrations>();
+
+        services.AddScoped<IResourceFilterProvider, ResourceFilters>();
     }
 }