Skip to content

Commit 3ba2106

Browse files
committed
feat: Updated Web UI to support .NET Standard 2.0
1 parent 50f5fef commit 3ba2106

File tree

3 files changed

+29
-7
lines changed

3 files changed

+29
-7
lines changed

src/Rules.Framework.WebUI/Handlers/GetRulesHandler.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,23 @@ private IEnumerable<RuleDto> ApplyFilters(RulesFilterDto rulesFilter, IEnumerabl
8181
{
8282
genericRulesDto = genericRulesDto.Where(g =>
8383
{
84+
#if NETSTANDARD2_0
85+
return JsonSerializer.Serialize(g.Value).ToUpper().Contains(rulesFilter.Content.ToUpper());
86+
#else
8487
return JsonSerializer.Serialize(g.Value).Contains(rulesFilter.Content, StringComparison.OrdinalIgnoreCase);
88+
#endif
8589
});
8690
}
8791

8892
if (!string.IsNullOrWhiteSpace(rulesFilter.Name))
8993
{
9094
genericRulesDto = genericRulesDto.Where(g =>
9195
{
96+
#if NETSTANDARD2_0
97+
return g.Name.ToUpper().Contains(rulesFilter.Name.ToUpper());
98+
#else
9299
return g.Name.Contains(rulesFilter.Name, StringComparison.OrdinalIgnoreCase);
100+
#endif
93101
});
94102
}
95103
if (rulesFilter.Status != null)
@@ -148,4 +156,4 @@ private async Task<IEnumerable<RuleDto>> GetRulesForContentyType(string identifi
148156
return Enumerable.Empty<RuleDto>();
149157
}
150158
}
151-
}
159+
}

src/Rules.Framework.WebUI/Rules.Framework.WebUI.csproj

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<GenerateDocumentationFile>true</GenerateDocumentationFile>
55
<SignAssembly Condition="'$(OS)'=='Windows_NT'">true</SignAssembly>
6-
<TargetFrameworks>net6.0</TargetFrameworks>
6+
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
77
<LangVersion>10.0</LangVersion>
88
<Authors></Authors>
99
<Version></Version>
@@ -34,11 +34,7 @@
3434
<EmbeddedResource Include="node_modules/bootstrap/**/*" Exclude="**/*/index.html;**/*/*.map;**/*/*.json;**/*/*.md" />
3535
<EmbeddedResource Include="index.html" />
3636
<EmbeddedResource Include="node_modules/rules_list.ico" />
37-
</ItemGroup>
38-
39-
<ItemGroup>
40-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
41-
</ItemGroup>
37+
</ItemGroup>
4238

4339
<ItemGroup>
4440
<ProjectReference Include="..\Rules.Framework\Rules.Framework.csproj" />
@@ -64,4 +60,16 @@
6460
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6561
</EmbeddedResource>
6662
</ItemGroup>
63+
64+
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
65+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
66+
</ItemGroup>
67+
68+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
69+
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.2" />
70+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
71+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.9" />
72+
<PackageReference Include="System.Text.Json" Version="6.0.6" />
73+
</ItemGroup>
74+
6775
</Project>

src/Rules.Framework.WebUI/WebUIMiddleware.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ namespace Rules.Framework.WebUI
1212
using Microsoft.Extensions.Logging;
1313
using Microsoft.Extensions.Options;
1414

15+
#if NETSTANDARD2_0
16+
17+
using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
18+
19+
#endif
20+
1521
internal sealed class WebUIMiddleware
1622
{
1723
private readonly IEnumerable<IHttpRequestHandler> httpRequestHandlers;

0 commit comments

Comments
 (0)