Skip to content

Commit a4df3e0

Browse files
committed
Use .Trim ROM ext methods in SS.Extensions to avoid conflicts w/ .NET Core 3
1 parent e1c8126 commit a4df3e0

11 files changed

Lines changed: 13 additions & 5 deletions

File tree

src/ServiceStack.Common/Command.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using ServiceStack.Extensions;
34
using ServiceStack.Text;
45

56
namespace ServiceStack

src/ServiceStack.Common/Script/JsToken.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Runtime.CompilerServices;
44
using System.Threading.Tasks;
5+
using ServiceStack.Extensions;
56
using ServiceStack.Text;
67
using ServiceStack.Text.Json;
78

src/ServiceStack.Common/Script/ScriptLanguage.Code.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Runtime.CompilerServices;
55
using System.Threading;
66
using System.Threading.Tasks;
7+
using ServiceStack.Extensions;
78
using ServiceStack.Text;
89

910
namespace ServiceStack.Script

src/ServiceStack.Common/Script/ScriptLanguage.Template.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Runtime.CompilerServices;
99
using System.Threading;
1010
using System.Threading.Tasks;
11+
using ServiceStack.Extensions;
1112
using ServiceStack.Text;
1213

1314
namespace ServiceStack.Script

src/ServiceStack.Common/Script/SharpPage.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Threading.Tasks;
5+
using ServiceStack.Extensions;
56
using ServiceStack.IO;
67
using ServiceStack.Text;
78

src/ServiceStack.Common/StringUtils.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Globalization;
77
using System.Text;
88
using System.Text.RegularExpressions;
9+
using ServiceStack.Extensions;
910
using ServiceStack.Script;
1011
using ServiceStack.Text;
1112

src/ServiceStack.Server/AutoQueryFeature.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using ServiceStack.MiniProfiler;
1313
using ServiceStack.Web;
1414
using ServiceStack.Data;
15+
using ServiceStack.Extensions;
1516
using ServiceStack.OrmLite;
1617
using ServiceStack.Text;
1718

src/ServiceStack/AutoQueryDataFeature.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Funq;
1313
using ServiceStack.Caching;
1414
using ServiceStack.DataAnnotations;
15+
using ServiceStack.Extensions;
1516
using ServiceStack.MiniProfiler;
1617
using ServiceStack.Reflection;
1718
using ServiceStack.Web;

tests/ServiceStack.Extensions.Tests/GrpcAutoQueryTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ public override void Configure(Container container)
992992
foreach (var cmd in ctx.Commands)
993993
{
994994
if (!supportedFns.TryGetValue(cmd.Name, out var fn)) continue;
995-
var label = !cmd.Suffix.IsNullOrWhiteSpace() ? cmd.Suffix.ToString().Trim() : cmd.ToString();
995+
var label = !cmd.Suffix.IsNullOrWhiteSpace() ? cmd.Suffix.Trim().ToString() : cmd.ToString();
996996
ctx.Response.Meta[label] = fn(cmd.Args[0].ParseInt32(), cmd.Args[1].ParseInt32()).ToString();
997997
executedCmds.Add(cmd);
998998
}

tests/ServiceStack.WebHost.Endpoints.Tests/AutoQueryDataTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Runtime.Serialization;
55
using Funq;
66
using NUnit.Framework;
7+
using ServiceStack.Extensions;
78
using ServiceStack.Text;
89

910
namespace ServiceStack.WebHost.Endpoints.Tests
@@ -39,8 +40,7 @@ public override void Configure(Container container)
3940
};
4041
foreach (var cmd in ctx.Commands)
4142
{
42-
Func<int, int, int> fn;
43-
if (!supportedFns.TryGetValue(cmd.Name.ToString(), out fn)) continue;
43+
if (!supportedFns.TryGetValue(cmd.Name, out var fn)) continue;
4444
var label = !cmd.Suffix.IsNullOrWhiteSpace() ? cmd.Suffix.Trim().ToString() : cmd.ToString();
4545
ctx.Response.Meta[label] = fn(cmd.Args[0].ParseInt32(), cmd.Args[1].ParseInt32()).ToString();
4646
executedCmds.Add(cmd);

0 commit comments

Comments
 (0)