Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 3a1e328

Browse files
committed
Move extension methods to base 'ServiceStack' namespaces
1 parent 2805248 commit 3a1e328

19 files changed

+20
-14
lines changed

lib/tests/ServiceStack.Client.dll

4 KB
Binary file not shown.

lib/tests/ServiceStack.Client.pdb

14 KB
Binary file not shown.
1 KB
Binary file not shown.
6 KB
Binary file not shown.

lib/tests/ServiceStack.Common.dll

0 Bytes
Binary file not shown.

lib/tests/ServiceStack.Common.pdb

0 Bytes
Binary file not shown.

lib/tests/ServiceStack.Interfaces.dll

0 Bytes
Binary file not shown.

lib/tests/ServiceStack.Server.dll

0 Bytes
Binary file not shown.

lib/tests/ServiceStack.Text.dll

0 Bytes
Binary file not shown.

lib/tests/ServiceStack.dll

9.5 KB
Binary file not shown.

src/ServiceStack.Text/CollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using System.Collections.Generic;
66

7-
namespace ServiceStack.Text
7+
namespace ServiceStack
88
{
99
public static class CollectionExtensions
1010
{

src/ServiceStack.Text/ListExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Text;
88
using ServiceStack.Text.Common;
99

10-
namespace ServiceStack.Text
10+
namespace ServiceStack
1111
{
1212
public static class ListExtensions
1313
{

src/ServiceStack.Text/MapExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using System.Text;
1515
using ServiceStack.Text.Common;
1616

17-
namespace ServiceStack.Text
17+
namespace ServiceStack
1818
{
1919
public static class MapExtensions
2020
{

src/ServiceStack.Text/PathUtils.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Collections.Generic;
77
using System.IO;
88
using System.Text;
9-
using ServiceStack.Text;
109

1110
namespace ServiceStack
1211
{
@@ -21,8 +20,8 @@ public static string MapAbsolutePath(this string relativePath, string appendPart
2120

2221
// Escape the assembly bin directory to the hostname directory
2322
var hostDirectoryPath = appendPartialPathModifier != null
24-
? assemblyDirectoryPath + appendPartialPathModifier
25-
: assemblyDirectoryPath;
23+
? assemblyDirectoryPath + appendPartialPathModifier
24+
: assemblyDirectoryPath;
2625

2726
return Path.GetFullPath(relativePath.Replace("~", hostDirectoryPath));
2827
}
@@ -63,7 +62,7 @@ public static string MapAbsolutePath(this string relativePath)
6362
/// <remarks>Assumes static content is in the parent folder of the /bin/ directory</remarks>
6463
public static string MapHostAbsolutePath(this string relativePath)
6564
{
66-
var mapPath = MapAbsolutePath(relativePath, string.Format("{0}..", Text.StringExtensions.DirSeparatorChar));
65+
var mapPath = MapAbsolutePath(relativePath, string.Format("{0}..", StringExtensions.DirSeparatorChar));
6766
return mapPath;
6867
}
6968

src/ServiceStack.Text/QueryStringSerializer.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
using System.Collections.Generic;
1616
using System.Globalization;
1717
using System.IO;
18-
using System.Reflection;
1918
using System.Text;
2019
using System.Threading;
21-
using System.Linq;
20+
using ServiceStack.Text;
2221
using ServiceStack.Text.Common;
2322
using ServiceStack.Text.Jsv;
2423

25-
namespace ServiceStack.Text
24+
namespace ServiceStack
2625
{
2726
public static class QueryStringSerializer
2827
{

src/ServiceStack.Text/ReflectionExtensions.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,17 @@
1919
using System.Runtime.Serialization;
2020
using System.Threading;
2121
using ServiceStack.Text.Support;
22+
23+
using ServiceStack.Text;
24+
#if !SILVERLIGHT && !MONOTOUCH && !XBOX
25+
using FastMember = ServiceStack.Text.FastMember;
26+
#endif
27+
2228
#if WINDOWS_PHONE
2329
using System.Linq.Expressions;
2430
#endif
2531

26-
namespace ServiceStack.Text
32+
namespace ServiceStack
2733
{
2834
public delegate EmptyCtorDelegate EmptyCtorFactoryDelegate(Type type);
2935
public delegate object EmptyCtorDelegate();

src/ServiceStack.Text/StreamExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Collections.Generic;
66
using System.IO;
77

8-
namespace ServiceStack.Text
8+
namespace ServiceStack
99
{
1010
public static class StreamExtensions
1111
{

src/ServiceStack.Text/StringExtensions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using System.Runtime.CompilerServices;
1919
using System.Text;
2020
using System.Text.RegularExpressions;
21+
using ServiceStack.Text;
2122
using ServiceStack.Text.Common;
2223
using ServiceStack.Text.Support;
2324
#if NETFX_CORE
@@ -31,7 +32,7 @@
3132
#endif
3233
#endif
3334

34-
namespace ServiceStack.Text
35+
namespace ServiceStack
3536
{
3637
public static class StringExtensions
3738
{

src/ServiceStack.Text/TextExtensions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212

1313
using System;
1414
using System.Collections.Generic;
15+
using ServiceStack.Text;
1516
using ServiceStack.Text.Common;
1617

17-
namespace ServiceStack.Text
18+
namespace ServiceStack
1819
{
1920
public static class TextExtensions
2021
{

0 commit comments

Comments
 (0)