Skip to content

Commit e045807

Browse files
mythzmythz
committed
Link to instead of copying existing src files
1 parent 0cfacc2 commit e045807

11 files changed

Lines changed: 128 additions & 253 deletions

‎src/ServiceStack.Common.WinRT/ServiceStack.Common.WinRT.csproj‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,9 @@
408408
<Compile Include="..\servicestack.common\support\PropertyInvoker.cs">
409409
<Link>Support\PropertyInvoker.cs</Link>
410410
</Compile>
411+
<Compile Include="..\ServiceStack.Common\Support\Thread.WinRT.cs">
412+
<Link>Support\Thread.WinRT.cs</Link>
413+
</Compile>
411414
<Compile Include="..\ServiceStack.Common\TypeExtensions.cs">
412415
<Link>TypeExtensions.cs</Link>
413416
</Compile>
@@ -438,26 +441,49 @@
438441
<Compile Include="..\ServiceStack.Common\Utils\ResponseStatusUtils.cs">
439442
<Link>Utils\ResponseStatusUtils.cs</Link>
440443
</Compile>
441-
<Compile Include="..\servicestack.common\web\CompressedFileResult.cs">
444+
<Compile Include="..\ServiceStack.Common\Web\CompressedFileResult.cs">
442445
<Link>Web\CompressedFileResult.cs</Link>
443446
</Compile>
444-
<Compile Include="..\servicestack.common\web\CompressedResult.cs">
447+
<Compile Include="..\ServiceStack.Common\Web\CompressedResult.cs">
445448
<Link>Web\CompressedResult.cs</Link>
446449
</Compile>
447-
<Compile Include="..\servicestack.common\web\CompressionTypes.cs">
450+
<Compile Include="..\ServiceStack.Common\Web\CompressionTypes.cs">
448451
<Link>Web\CompressionTypes.cs</Link>
449452
</Compile>
450-
<Compile Include="..\servicestack.common\web\ContentType.cs">
453+
<Compile Include="..\ServiceStack.Common\Web\ContentType.cs">
451454
<Link>Web\ContentType.cs</Link>
452455
</Compile>
453-
<Compile Include="..\servicestack.common\web\EndPoint.cs">
456+
<Compile Include="..\ServiceStack.Common\Web\EndPoint.cs">
454457
<Link>Web\EndPoint.cs</Link>
455458
</Compile>
459+
<Compile Include="..\ServiceStack.Common\Web\HttpError.cs">
460+
<Link>Web\HttpError.cs</Link>
461+
</Compile>
462+
<Compile Include="..\ServiceStack.Common\Web\HttpHeaders.cs">
463+
<Link>Web\HttpHeaders.cs</Link>
464+
</Compile>
465+
<Compile Include="..\ServiceStack.Common\Web\HttpMethods.cs">
466+
<Link>Web\HttpMethods.cs</Link>
467+
</Compile>
468+
<Compile Include="..\ServiceStack.Common\Web\HttpResponseFilter.cs">
469+
<Link>Web\HttpResponseFilter.cs</Link>
470+
</Compile>
471+
<Compile Include="..\ServiceStack.Common\Web\HttpResponseStreamWrapper.cs">
472+
<Link>Web\HttpResponseStreamWrapper.cs</Link>
473+
</Compile>
474+
<Compile Include="..\ServiceStack.Common\Web\HttpResult.cs">
475+
<Link>Web\HttpResult.cs</Link>
476+
</Compile>
477+
<Compile Include="..\ServiceStack.Common\Web\HttpResultExtensions.cs">
478+
<Link>Web\HttpResultExtensions.cs</Link>
479+
</Compile>
480+
<Compile Include="..\ServiceStack.Common\Web\MimeTypes.cs">
481+
<Link>Web\MimeTypes.cs</Link>
482+
</Compile>
483+
<Compile Include="..\ServiceStack.Common\Web\SerializationContext.cs">
484+
<Link>Web\SerializationContext.cs</Link>
485+
</Compile>
456486
<Compile Include="Properties\AssemblyInfo.cs" />
457-
<Compile Include="Support\Thread.cs" />
458-
<Compile Include="Web\HttpHeaders.cs" />
459-
<Compile Include="Web\HttpMethods.cs" />
460-
<Compile Include="Web\MimeTypes.cs" />
461487
</ItemGroup>
462488
<ItemGroup>
463489
<ProjectReference Include="..\..\..\ServiceStack.Text\src\ServiceStack.Text.WinRT\ServiceStack.Text.WinRT.csproj">

‎src/ServiceStack.Common.WinRT/Web/HttpHeaders.cs‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/ServiceStack.Common.WinRT/Web/HttpMethods.cs‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎src/ServiceStack.Common.WinRT/Web/MimeTypes.cs‎

Lines changed: 0 additions & 117 deletions
This file was deleted.

‎src/ServiceStack.Common/ServiceStack.Common.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@
394394
<Compile Include="Support\PropertyInvoker.cs">
395395
<SubType>Code</SubType>
396396
</Compile>
397+
<Compile Include="Support\Thread.WinRT.cs" />
397398
<Compile Include="TypeExtensions.cs">
398399
<SubType>Code</SubType>
399400
</Compile>

‎src/ServiceStack.Common/ServiceStack.Common.csproj.user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<ErrorReportUrlHistory />
1010
<FallbackCulture>en-US</FallbackCulture>
1111
<VerifyUploadedFiles>false</VerifyUploadedFiles>
12-
<ProjectView>ProjectFiles</ProjectView>
12+
<ProjectView>ShowAllFiles</ProjectView>
1313
</PropertyGroup>
1414
</Project>

‎src/ServiceStack.Common/StreamExtensions.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if !SILVERLIGHT && !XBOX
21
using System;
32
using System.IO;
43
using System.Text;
@@ -11,7 +10,7 @@ namespace ServiceStack.Common
1110
{
1211
public static class StreamExtensions
1312
{
14-
#if !MONOTOUCH
13+
#if !SILVERLIGHT && !XBOX && !MONOTOUCH
1514
/// <summary>
1615
/// Compresses the specified text using the default compression method: Deflate
1716
/// </summary>
@@ -94,7 +93,14 @@ public static void Write(this Stream stream, string text)
9493
stream.Write(bytes, 0, bytes.Length);
9594
}
9695

96+
public static void Close(this Stream stream)
97+
{
98+
#if NETFX_CORE
99+
stream.Dispose();
100+
#else
101+
stream.Close(); //For documentation purposes. In reality it won't call this Ext method.
102+
#endif
103+
}
97104
}
98105

99106
}
100-
#endif

src/ServiceStack.Common.WinRT/Support/Thread.cs renamed to src/ServiceStack.Common/Support/Thread.WinRT.cs

File renamed without changes.

‎src/ServiceStack.Common/Web/HttpResponseStreamWrapper.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.IO;
33
using System.Text;
44
using ServiceStack.ServiceHost;
5+
using ServiceStack.Common;
56

67
namespace ServiceStack.Common.Web
78
{
@@ -56,6 +57,7 @@ public void Close()
5657
public void ForceClose()
5758
{
5859
if (IsClosed) return;
60+
5961
OutputStream.Close();
6062
IsClosed = true;
6163
}

‎src/ServiceStack.Common/Web/HttpResultExtensions.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using ServiceStack.Text;
23
using ServiceStack.Common.Utils;
34
using ServiceStack.ServiceHost;
45
using ServiceStack.ServiceInterface.ServiceModel;
@@ -76,7 +77,7 @@ public static ResponseStatus ToResponseStatus(this object response)
7677
if (hasResponseStatus != null)
7778
return hasResponseStatus.ResponseStatus;
7879

79-
var propertyInfo = response.GetType().GetProperty("ResponseStatus");
80+
var propertyInfo = response.GetType().GetPropertyInfo("ResponseStatus");
8081
if (propertyInfo == null)
8182
return null;
8283

0 commit comments

Comments
 (0)