Skip to content

Commit 4084b81

Browse files
sebastienrossebastienros
authored
Fix System.Text.Json versions (#771)
1 parent 03384cc commit 4084b81

6 files changed

Lines changed: 14 additions & 24 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@
99

1010
<!-- TFM specific reference since they could lift some framework dependencies -->
1111
<PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
12-
12+
1313
<!-- Only used with netstandard2.0 -->
14-
<PackageVersion Include="System.Text.Json" Version="9.0.3" />
14+
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonPackageVersion)" />
1515
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
1616
<PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
17-
17+
1818
<!-- Common to all TFMs -->
1919
<PackageVersion Include="Parlot" Version="1.3.5" />
2020
<PackageVersion Include="TimeZoneConverter" Version="7.0.0" />
21-
21+
2222
<!-- Benchmarks -->
2323
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
2424
<PackageVersion Include="DotLiquid" Version="2.3.107" />
2525
<PackageVersion Include="Liquid.NET" Version="0.10.0" />
2626
<PackageVersion Include="Scriban" Version="6.0.0" />
2727
<PackageVersion Include="Handlebars.Net" Version="2.1.6" />
28-
28+
2929
<!-- Testing -->
3030
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
3131
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />

‎Fluid.Tests/TemplateTests.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,13 +1139,8 @@ public void MemberNameStrategiesHandleSuccessiveUppercase()
11391139
var camelCase = MemberNameStrategies.CamelCase(memberInfo);
11401140
var snakeCase = MemberNameStrategies.SnakeCase(memberInfo);
11411141

1142-
#if NET8_0_OR_GREATER
11431142
Assert.Equal("uvIndex", camelCase);
11441143
Assert.Equal("uv_index", snakeCase);
1145-
#else
1146-
Assert.Equal("uVIndex", camelCase);
1147-
Assert.Equal("uv_index", snakeCase);
1148-
#endif
11491144
}
11501145

11511146
[Fact]
@@ -1206,7 +1201,7 @@ public async Task ArraysShouldCompareElements()
12061201
{% assign people1 = "alice, bob, carol" | split: ", " %}
12071202
{% assign people2 = "alice, bob, carol" | split: ", " %}
12081203
1209-
{% if people1 == people2 %}true{%else%}false{% endif %}
1204+
{% if people1 == people2 %}true{%else%}false{% endif %}
12101205
""";
12111206

12121207
_parser.TryParse(source, out var template);

‎Fluid/Fluid.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<ItemGroup>
3434
<None Include="../Assets/logo_64x64.png" Pack="true" Visible="false" PackagePath="" />
3535
</ItemGroup>
36-
36+
3737
<ItemGroup>
3838
<PackageReference Include="Parlot" />
3939
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" />
@@ -48,6 +48,7 @@
4848

4949
<!-- Keep specific targets since it removes some dependencies -->
5050
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
51+
<PackageReference Include="System.Text.Json" />
5152
</ItemGroup>
5253

5354
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">

‎Fluid/MemberNameStrategies.cs‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
using System.Reflection;
2-
#if NET8_0_OR_GREATER
32
using System.Text.Json;
4-
#else
53
using System.Text;
6-
#endif
4+
75
namespace Fluid
86
{
97
public sealed class MemberNameStrategies
108
{
119
private static string RenameDefault(MemberInfo member) => member.Name;
1210

13-
public static readonly MemberNameStrategy Default = RenameDefault;
14-
15-
#if NET8_0_OR_GREATER
16-
1711
private const string SwitchName = "Fluid.UseLegacyMemberNameStrategies";
1812

13+
public static readonly MemberNameStrategy Default = RenameDefault;
1914
public static readonly MemberNameStrategy CamelCase;
2015
public static readonly MemberNameStrategy SnakeCase;
2116

@@ -37,6 +32,8 @@ static MemberNameStrategies()
3732
}
3833
}
3934

35+
#if NET6_0_OR_GREATER
36+
4037
public static string RenameCamelCase(MemberInfo member)
4138
{
4239
return String.Create(member.Name.Length, member.Name, (data, name) =>
@@ -83,10 +80,6 @@ public static string RenameSnakeCase(MemberInfo member)
8380
});
8481
}
8582
#else
86-
87-
public static readonly MemberNameStrategy CamelCase = RenameCamelCase;
88-
public static readonly MemberNameStrategy SnakeCase = RenameSnakeCase;
89-
9083
public static string RenameCamelCase(MemberInfo member)
9184
{
9285
var firstChar = member.Name[0];

‎Fluid/TemplateOptions.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Microsoft.Extensions.FileProviders;
44
using System.Globalization;
55
using System.Text.Encodings.Web;
6-
using System.Text.Json;
76

87
namespace Fluid
98
{

‎Versions.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<Project>
22
<!-- This file define constants that can be changed per TFM -->
33
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
4+
<SystemTextJsonPackageVersion>8.0.5</SystemTextJsonPackageVersion>
45
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
56
</PropertyGroup>
67

78
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
9+
<SystemTextJsonPackageVersion>8.0.5</SystemTextJsonPackageVersion>
810
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
911
</PropertyGroup>
1012

0 commit comments

Comments
 (0)