Skip to content

Commit cf3622f

Browse files
mikebridgemikebridge
authored
Merge pull request #71 from mikebridge/to_netstandard
To netstandard
2 parents e208c5b + b1dd128 commit cf3622f

File tree

10 files changed

+121
-120
lines changed

10 files changed

+121
-120
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ packages/
2222
node_modules
2323
npm-debug.log
2424
.idea
25-
*.xml
25+
*.xml
26+
.vs

‎Liquid.NET.Grammar/Liquid.NET.Grammar.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp1.1;net462</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎Liquid.NET.Tests/Constants/LiquidCollectionTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void It_Should_Clear_An_Array()
6767
{
6868
var liquidCollection = new LiquidCollection{LiquidString.Create("test")};
6969
liquidCollection.Clear();
70-
Assert.Equal(0, liquidCollection.Count);
70+
Assert.Empty(liquidCollection);
7171
}
7272

7373

@@ -76,15 +76,15 @@ public void It_Should_Remove_An_Element_From_An_Array()
7676
{
7777
var liquidCollection = new LiquidCollection { LiquidString.Create("test") };
7878
liquidCollection.Remove(LiquidString.Create("test"));
79-
Assert.Equal(0, liquidCollection.Count);
79+
Assert.Empty(liquidCollection);
8080
}
8181

8282
[Fact]
8383
public void It_Should_Remove_An_Element_At_An_Index_In_An_Array()
8484
{
8585
var liquidCollection = new LiquidCollection { LiquidString.Create("test") };
8686
liquidCollection.RemoveAt(0);
87-
Assert.Equal(0, liquidCollection.Count);
87+
Assert.Empty(liquidCollection);
8888
}
8989
[Fact]
9090
public void It_Should_Find_An_Element_By_Value()
@@ -105,7 +105,7 @@ public void It_Should_Insert_An_Element()
105105
public void It_Should_Cast_A_Null_Element_To_None()
106106
{
107107
var liquidCollection = new LiquidCollection { null };
108-
Assert.Equal(1, liquidCollection.Count);
108+
Assert.Single(liquidCollection);
109109
}
110110

111111
[Fact]

‎Liquid.NET.Tests/Constants/LiquidHashTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@ public void It_Should_Clear_Values()
142142
{
143143
var dict = new LiquidHash {{"key", LiquidString.Create("test")}};
144144
dict.Clear();
145-
Assert.Equal(0, dict.Count);
145+
Assert.Empty(dict);
146146
}
147147

148148
[Fact]
149149
public void It_Should_Remove_A_Value()
150150
{
151151
var dict = new LiquidHash { { "key", LiquidString.Create("test") } };
152152
dict.Remove("key");
153-
Assert.Equal(0, dict.Count);
153+
Assert.Empty(dict);
154154
}
155155

156156
[Fact]
@@ -159,7 +159,7 @@ public void It_Should_Copy_Values()
159159
var dict = new LiquidHash { { "key", LiquidString.Create("test") } };
160160
var x = new KeyValuePair<string, Option<ILiquidValue>>[1];
161161
dict.CopyTo(x, 0);
162-
Assert.Equal(1, x.Length);
162+
Assert.Single(x);
163163
}
164164

165165
[Fact]
@@ -169,7 +169,7 @@ public void It_Should_Know_If_A_Value_Is_Contained()
169169
var kvp = new KeyValuePair<String, Option<ILiquidValue>>("key", val);
170170
var dict = new LiquidHash { kvp };
171171

172-
Assert.True(dict.Contains(kvp));
172+
Assert.Contains(kvp, dict);
173173
}
174174

175175
[Fact]

‎Liquid.NET.Tests/Constants/ValueCasterTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public void It_Should_Cast_A_String_To_An_Array_Of_One_String()
259259

260260
// Assert
261261
var arrValue = arrayResult.SuccessValue<LiquidCollection>();
262-
Assert.Equal(1, arrValue.Count);
262+
Assert.Single(arrValue);
263263
Assert.Equal("Hello", arrValue[0].Value.ToString());
264264

265265
}

‎Liquid.NET.Tests/Liquid.NET.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp1.1;net462</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
55
<!-- SEE: https://github.com/OpenCover/opencover/issues/601 -->
66
<DebugType>Full</DebugType>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170810-02" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.2" />
1010
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
1111
<PackageReference Include="OpenCover" Version="4.6.519" />
1212
<PackageReference Include="ReportGenerator" Version="2.5.10" />
13-
<PackageReference Include="xunit" Version="2.3.0-beta3-build3705" />
14-
<PackageReference Include="xunit.runner.console" Version="2.3.0-beta3-build3705" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-build3705" />
13+
<PackageReference Include="xunit" Version="2.3.1" />
14+
<PackageReference Include="xunit.runner.console" Version="2.3.1" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎Liquid.NET.Tests/LiquidASTGeneratorTests.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void It_Should_Parse_An_Object_Expression()
2424
var liquidExpressions = FindNodesWithType(ast, typeof (LiquidExpressionTree));
2525
Logger.Log("There are " + ast.RootNode.Children.Count+" Nodes");
2626
Logger.Log("It is " + ast.RootNode.Children[0].Data);
27-
Assert.Equal(1, liquidExpressions.Count());
27+
Assert.Single(liquidExpressions);
2828
}
2929

3030
private static LiquidAST CreateAST(string template)
@@ -46,7 +46,7 @@ public void It_Should_Parse_An_Object_Expression_With_A_Variable()
4646

4747
var liquidExpressions = FindNodesWithType(ast, typeof(LiquidExpressionTree));
4848
Logger.Log("There are " + ast.RootNode.Children.Count + " Nodes");
49-
Assert.Equal(1, liquidExpressions.Count());
49+
Assert.Single(liquidExpressions);
5050

5151
}
5252

@@ -61,7 +61,7 @@ public void It_Should_Parse_An_Object_Expression_With_An_Propertied_Variable()
6161

6262
var liquidExpressions = FindNodesWithType(ast, typeof(LiquidExpressionTree));
6363
Logger.Log("There are " + ast.RootNode.Children.Count + " Nodes");
64-
Assert.Equal(1, liquidExpressions.Count());
64+
Assert.Single(liquidExpressions);
6565

6666
}
6767

@@ -131,7 +131,7 @@ public void It_Should_Find_An_If_Tag()
131131

132132
// Assert
133133
var tagExpressions = FindNodesWithType(ast, typeof(IfThenElseBlockTag));
134-
Assert.Equal(1, tagExpressions.Count());
134+
Assert.Single(tagExpressions);
135135
//Assert.NotNull(liquidExpressions);
136136
//Assert.Equal(1, ((LiquidExpression)liquidExpressions.Data).FilterSymbols.Count());
137137

@@ -145,7 +145,7 @@ public void It_Should_Find_An_If_Tag_With_ElsIfs_And_Else()
145145

146146
// Assert
147147
var tagExpressions = FindNodesWithType(ast, typeof(IfThenElseBlockTag));
148-
Assert.Equal(1, tagExpressions.Count());
148+
Assert.Single(tagExpressions);
149149
//Assert.NotNull(liquidExpressions);
150150
//Assert.Equal(1, ((LiquidExpression)liquidExpressions.Data).FilterSymbols.Count());
151151

@@ -162,7 +162,7 @@ public void It_Should_Find_An_Object_Expression_Inside_A_Block_ElsIfs_And_Else()
162162
var liquidExpressions = FindWhere(ifThenElseTag.IfElseClauses[0].LiquidBlock.Children, typeof(LiquidExpressionTree));
163163

164164
// Assert
165-
Assert.Equal(1, liquidExpressions.Count());
165+
Assert.Single(liquidExpressions);
166166
}
167167

168168
[Fact]
@@ -178,7 +178,7 @@ public void It_Should_Nest_Expressions_Inside_Else()
178178
var liquidExpressions = FindWhere(blockTags, typeof(IfThenElseBlockTag));
179179

180180
// Assert
181-
Assert.Equal(1, liquidExpressions.Count());
181+
Assert.Single(liquidExpressions);
182182

183183
}
184184

@@ -202,7 +202,7 @@ public void It_Should_Group_Expressions_In_Parens()
202202
var tagExpressions = FindNodesWithType(ast, typeof(IfThenElseBlockTag)).ToList();
203203
var ifThenElseTag = (IfThenElseBlockTag) tagExpressions[0].Data;
204204

205-
Assert.Equal(1, tagExpressions.Count);
205+
Assert.Single(tagExpressions);
206206
//Assert.IsType<AndExpression>(ifThenElseTag.IfElseClauses[0].RootNode.Data);
207207
//Assert.IsType<AndExpression>(ifThenElseTag.IfElseClauses[0].RootNode[0].Data);
208208
var ifTagSymbol = ifThenElseTag.IfElseClauses[0];
@@ -212,7 +212,7 @@ public void It_Should_Group_Expressions_In_Parens()
212212
Assert.Equal(2, expressionSymbolTree.Children.Count);
213213
Assert.IsType<LiquidBoolean>(expressionSymbolTree[0].Data.Expression);
214214
Assert.IsType<GroupedExpression>(expressionSymbolTree[1].Data.Expression);
215-
Assert.Equal(1, expressionSymbolTree[1].Children.Count);
215+
Assert.Single(expressionSymbolTree[1].Children);
216216
Assert.IsType<OrExpression>(expressionSymbolTree[1][0].Data.Expression);
217217
Assert.IsType<LiquidBoolean>(expressionSymbolTree[1][0][0].Data.Expression);
218218
Assert.IsType<LiquidBoolean>(expressionSymbolTree[1][0][1].Data.Expression);
@@ -241,7 +241,7 @@ public void It_Should_Parse_An_Indexed_Object_Reference(String tmpl)
241241
//Logger.Log("There are " + ast.RootNode.Children.Count + " Nodes");
242242
//Logger.Log("It is " + ast.RootNode.Children[0].Data);
243243
//Assert.Equal(1, liquidExpressions.Count());
244-
Assert.Equal(1, liquidExpressions.Count());
244+
Assert.Single(liquidExpressions);
245245
//String result = VariableReferenceTreeBuilderTests.VariableReferenceTreePrinter.Print(liquidExpressions);
246246
}
247247

‎Liquid.NET.Tests/Utils/StrFTimeTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ public class StrFTimeTests
4343
[InlineData("%Y", "2012")]
4444
[InlineData("%_2Y", "2012")]
4545
[InlineData("%", "%")]
46-
public string The_Date_Should_Be_Formatted_With_StrFTime(string format, string expected)
46+
public void The_Date_Should_Be_Formatted_With_StrFTime(string format, string expected)
4747
{
4848
CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-GB");
49-
return new DateTime(2012, 1, 8, 14, 32, 14).ToStrFTime(format);
49+
Assert.Equal(expected, new DateTime(2012, 1, 8, 14, 32, 14).ToStrFTime(format));
5050
}
5151

5252
[Fact]

‎Liquid.NET/Liquid.NET.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp1.1;net462</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
55
<Copyright>Mike Bridge</Copyright>
66
<PackageProjectUrl>https://github.com/mikebridge/Liquid.NET</PackageProjectUrl>
77
<RepositoryUrl>http://mikebridge.github.io/Liquid.NET/</RepositoryUrl>
8-
<Version>0.9.7</Version>
8+
<Version>0.10.0</Version>
99
<!-- SEE: https://github.com/OpenCover/opencover/issues/601 -->
1010
<DebugType>full</DebugType>
1111
</PropertyGroup>

0 commit comments

Comments
 (0)