Skip to content

Commit c0f50f3

Browse files
mythzmythz
committed
Convert .NET Core test projects to VS 2017 new msbuild format
1 parent 20ebfac commit c0f50f3

15 files changed

Lines changed: 292 additions & 454 deletions

‎src/ServiceStack.Core.SelfHost/ServiceStack.Core.SelfHost.csproj‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp1.1</TargetFramework>
5+
<AssemblyName>ServiceStack.Core.SelfHost</AssemblyName>
6+
<OutputType>Exe</OutputType>
7+
<PackageId>ServiceStack.Core.SelfHost</PackageId>
8+
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
9+
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
10+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
11+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
12+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<!--<Reference Include="..\..\lib\netstandard1.1\ServiceStack.Interfaces.dll" />
17+
<Reference Include="..\..\lib\netstandard1.3\ServiceStack.Text.dll" />
18+
<ProjectReference Include="..\ServiceStack\ServiceStack.csproj" />
19+
<ProjectReference Include="..\ServiceStack.Client\ServiceStack.Client.csproj" />
20+
<ProjectReference Include="..\ServiceStack.Common\ServiceStack.Common.csproj" />
21+
<ProjectReference Include="..\ServiceStack.Api.Swagger\ServiceStack.Api.Swagger.csproj" />-->
22+
23+
<PackageReference Include="ServiceStack.Text.Core" Version="1.*" />
24+
<PackageReference Include="ServiceStack.Core" Version="1.*" />
25+
<PackageReference Include="ServiceStack.Interfaces.Core" Version="1.*" />
26+
<PackageReference Include="ServiceStack.Client.Core" Version="1.*" />
27+
<PackageReference Include="ServiceStack.Common.Core" Version="1.*" />
28+
<PackageReference Include="ServiceStack.Api.Swagger.Core" Version="1.*" />
29+
</ItemGroup>
30+
31+
<ItemGroup>
32+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.1" />
33+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
34+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
35+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
36+
</ItemGroup>
37+
38+
</Project>

‎src/ServiceStack.Core.SelfHost/ServiceStack.Core.SelfHost.xproj‎

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

‎src/ServiceStack.Core.SelfHost/Startup.cs‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
using Microsoft.AspNetCore.Http.Internal;
2222
using Microsoft.Extensions.Primitives;
2323
using ServiceStack.Api.Swagger;
24+
using ServiceStack.Metadata;
25+
using ServiceStack.Web;
2426

2527
namespace ServiceStack.Core.SelfHost
2628
{
@@ -71,15 +73,40 @@ public class Error404
7173
public string Path { get; set; }
7274
}
7375

76+
[Route("/test")]
77+
public class Test : IReturn<string> { }
78+
7479
public class MyServices : Service
7580
{
7681
public object Any(Hello request) =>
7782
new HelloResponse { Result = $"Hello, {request.Name ?? "World"}!" };
78-
83+
7984
//Uncomment to process Unhandled requests
8085
//public object Any(Error404 request) => request;
86+
87+
public TestResponse Any(TestRequest request)
88+
{
89+
return new TestResponse();
90+
}
91+
92+
public object Any(Test request)
93+
{
94+
var r = new JsonMetadataHandler();
95+
96+
var response = r.CreateResponse(typeof(Stream));
97+
98+
return response;
99+
}
81100
}
82101

102+
[Route("/uploadStream", "POST", Summary = "Upload stream")]
103+
public class TestRequest : IReturn<TestResponse>, IRequiresRequestStream
104+
{
105+
public Stream RequestStream { get; set; }
106+
}
107+
108+
public class TestResponse { }
109+
83110
public class AppHost : AppHostBase
84111
{
85112
public AppHost()

‎src/ServiceStack.Core.SelfHost/project.json‎

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

0 commit comments

Comments
 (0)