Added ServiceStack.Kestrel.Core csproj (containing .Core deps) + update .Core pkg titles

mythz · mythz · commit 26de9c567e81 · 2019-02-19T15:08:48.000-05:00
diff --git a/build/build-core.proj b/build/build-core.proj
@@ -147,6 +147,11 @@
              Targets="Build;Pack"
              Properties="Configuration=$(Configuration)" />
 
+    <!-- ServiceStack.Kestrel.Core -->
+    <MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Kestrel/ServiceStack.Kestrel.Core.csproj" Targets="Restore" />
+    <MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Kestrel/ServiceStack.Kestrel.Core.csproj"
+             Targets="Build;Pack"
+             Properties="Configuration=$(Configuration)" />
 
     <!-- Copy all *.nupkg to /NuGet -->
     <ItemGroup>
diff --git a/src/ServiceStack.Api.OpenApi/ServiceStack.Api.OpenApi.Core.csproj b/src/ServiceStack.Api.OpenApi/ServiceStack.Api.OpenApi.Core.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>ServiceStack.Api.OpenApi</AssemblyName>
     <RootNamespace>ServiceStack.Api.OpenApi</RootNamespace>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <Title>ServiceStack support for Open API v2.0 and integrated Swagger UI</Title>
+    <Title>ServiceStack.Api.OpenApi .NET Standard 2.0</Title>
     <PackageDescription>
       Implements v2.0 of the Open API Specification (https://www.openapis.org).
       Open API is a specification and complete framework implementation for describing, producing, consuming, and visualizing RESTful web services.
diff --git a/src/ServiceStack.Client/ServiceStack.Client.Core.csproj b/src/ServiceStack.Client/ServiceStack.Client.Core.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>ServiceStack.Client</AssemblyName>
     <RootNamespace>ServiceStack.Client</RootNamespace>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <Title>.NET and .NET Core fast, end-to-end typed, code-gen free Service Clients</Title>
+    <Title>ServiceStack.Client .NET Standard 2.0</Title>
     <PackageDescription>
       JSON, XML, CSV, JSV, SOAP and MQ Generic Service Clients.
     </PackageDescription>
diff --git a/src/ServiceStack.Common/ServiceStack.Common.Core.csproj b/src/ServiceStack.Common/ServiceStack.Common.Core.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>ServiceStack.Common</RootNamespace>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <RootNamespace>ServiceStack</RootNamespace>
-    <Title>Common libraries for ServiceStack projects</Title>
+    <Title>ServiceStack.Common .NET Standard 2.0</Title>
     <PackageDescription>
       ServiceStack Templates, Virtual File System, SimpleContainer and Common library for ServiceStack projects.
     </PackageDescription>
diff --git a/src/ServiceStack.HttpClient/ServiceStack.HttpClient.Core.csproj b/src/ServiceStack.HttpClient/ServiceStack.HttpClient.Core.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>ServiceStack.HttpClient</AssemblyName>
     <RootNamespace>ServiceStack.HttpClient</RootNamespace>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <Title>Common libraries for ServiceStack projects</Title>
+    <Title>ServiceStack.HttpClient .NET Standard 2.0</Title>
     <PackageDescription>
       Typed .NET Core and .NET Framework ServiceClients based on .NET's HttpClient
     </PackageDescription>
diff --git a/src/ServiceStack.Interfaces/ServiceStack.Interfaces.Core.csproj b/src/ServiceStack.Interfaces/ServiceStack.Interfaces.Core.csproj
@@ -5,7 +5,7 @@
         <AssemblyName>ServiceStack.Interfaces</AssemblyName>
         <RootNamespace>ServiceStack.Interfaces</RootNamespace>
         <TargetFrameworks>netstandard2.0</TargetFrameworks>
-        <Title>Lightweight and implementation-free interfaces for ServiceStack</Title>
+        <Title>ServiceStack.Interfaces .NET Standard 2.0</Title>
         <PackageDescription>
             Lightweight and implementation-free interfaces for DTO's, providers and adapters.
         </PackageDescription>
diff --git a/src/ServiceStack.Kestrel/ServiceStack.Kestrel.Core.csproj b/src/ServiceStack.Kestrel/ServiceStack.Kestrel.Core.csproj
@@ -0,0 +1,33 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <PackageId>ServiceStack.Kestrel.Core</PackageId>
+    <AssemblyName>ServiceStack.Kestrel</AssemblyName>
+    <RootNamespace>ServiceStack.Kestrel</RootNamespace>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Title>ServiceStack.Kestrel .NET Standard 2.0</Title>
+    <PackageDescription>
+      Provides AppSelfHostBase implementation for .NET Core's Kestrel Self Host HTTP Server
+
+      To get started see: https://servicestack.net/getting-started
+    </PackageDescription>
+    <PackageTags>ServiceStack;SelfHost;Host;Kestrel;HTTP;Server</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ServiceStack.Interfaces\ServiceStack.Interfaces.Core.csproj"/>
+    <ProjectReference Include="..\ServiceStack.Common\ServiceStack.Common.Core.csproj" />
+    <ProjectReference Include="..\ServiceStack.Client\ServiceStack.Client.Core.csproj" />
+    <ProjectReference Include="..\ServiceStack\ServiceStack.Core.csproj" />
+    <PackageReference Include="ServiceStack.Text.Core" Version="$(Version)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
+    <PackageReference Include="System.Memory" Version="4.5.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/ServiceStack.Logging.Log4Net/ServiceStack.Logging.Log4Net.Core.csproj b/src/ServiceStack.Logging.Log4Net/ServiceStack.Logging.Log4Net.Core.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>ServiceStack.Logging.Log4Net</AssemblyName>
     <RootNamespace>ServiceStack.Logging.Log4Net</RootNamespace>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <Title>ServiceStack.Logging.Log4Net</Title>
+    <Title>ServiceStack.Logging.Log4Net .NET Standard 2.0</Title>
     <PackageDescription>
       Provides log4net logging integration for other ServiceStack projects
     </PackageDescription>
diff --git a/src/ServiceStack.Logging.NLog/ServiceStack.Logging.NLog.Core.csproj b/src/ServiceStack.Logging.NLog/ServiceStack.Logging.NLog.Core.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>ServiceStack.Logging.NLog</AssemblyName>
     <RootNamespace>ServiceStack.Logging.NLog</RootNamespace>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <Title>ServiceStack.Logging.NLog</Title>
+    <Title>ServiceStack.Logging.NLog .NET Standard 2.0</Title>
     <PackageDescription>
       Provides NLog logging integration for other ServiceStack projects
     </PackageDescription>
diff --git a/src/ServiceStack.MsgPack/ServiceStack.MsgPack.Core.csproj b/src/ServiceStack.MsgPack/ServiceStack.MsgPack.Core.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>ServiceStack.MsgPack</AssemblyName>
     <RootNamespace>ServiceStack.MsgPack</RootNamespace>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <Title>Message Pack support for ServiceStack. Includes typed MsgPack Client</Title>
+    <Title>ServiceStack.MsgPack .NET Standard 2.0</Title>
     <PackageDescription>
       Add the MsgPack binary format and endpoint to a ServiceStack web service host.
     </PackageDescription>
diff --git a/src/ServiceStack.Mvc/ServiceStack.Mvc.Core.csproj b/src/ServiceStack.Mvc/ServiceStack.Mvc.Core.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>ServiceStack.Mvc</AssemblyName>
     <RootNamespace>ServiceStack.Mvc</RootNamespace>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <Title>MVC Adapters for integrating with ServiceStack webservices</Title>
+    <Title>ServiceStack.Mvc .NET Standard 2.0</Title>
     <PackageDescription>
       Full details in MVC PowerPack: http://mono.servicestack.net/mvc-powerpack/
       MVC Adapter classes to provide tight integration and re-usable functionality between ServiceStack and MVC.
diff --git a/src/ServiceStack.ProtoBuf/ServiceStack.ProtoBuf.Core.csproj b/src/ServiceStack.ProtoBuf/ServiceStack.ProtoBuf.Core.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>ServiceStack.ProtoBuf</AssemblyName>
     <RootNamespace>ServiceStack.ProtoBuf</RootNamespace>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <Title>Protocol Buffers support for ServiceStack. Includes typed ProtoBuf Client</Title>
+    <Title>ServiceStack.ProtoBuf .NET Standard 2.0</Title>
     <PackageDescription>
       Add the ProtoBuf binary format and endpoint to a ServiceStack web service host.
     </PackageDescription>
diff --git a/src/ServiceStack.RabbitMq/ServiceStack.RabbitMq.Core.csproj b/src/ServiceStack.RabbitMq/ServiceStack.RabbitMq.Core.csproj
@@ -5,7 +5,7 @@
         <AssemblyName>ServiceStack.RabbitMq</AssemblyName>
         <RootNamespace>ServiceStack.RabbitMq</RootNamespace>
         <TargetFrameworks>netstandard2.0</TargetFrameworks>
-        <Title>ServiceStack.RabbitMq</Title>
+        <Title>ServiceStack.RabbitMq .NET Standard 2.0</Title>
         <PackageDescription>
             Rabbit MQ client and server adapters for the ServiceStack web services framework.
             This library enables consuming and publishing to ServiceStack services when hosted within a Rabbit MQ Server Host.
diff --git a/src/ServiceStack.Server/ServiceStack.Server.Core.csproj b/src/ServiceStack.Server/ServiceStack.Server.Core.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>ServiceStack.Server</AssemblyName>
     <RootNamespace>ServiceStack.Server</RootNamespace>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <Title>ServiceStack Server integration with Redis and OrmLite</Title>
+    <Title>ServiceStack.Server .NET Standard 2.0</Title>
     <PackageDescription>
       Integration libraries and adapters with other major ServiceStack server components.
       Includes high-level API's that use OrmLite and Redis including:
diff --git a/src/ServiceStack.sln b/src/ServiceStack.sln
@@ -29,6 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{EB65E771
 		ServiceStack.Mvc\ServiceStack.Mvc.Core.csproj = ServiceStack.Mvc\ServiceStack.Mvc.Core.csproj
 		..\build\build-common-core.proj = ..\build\build-common-core.proj
 		..\build\build-core.proj = ..\build\build-core.proj
+		ServiceStack.Kestrel\ServiceStack.Kestrel.Core.csproj = ServiceStack.Kestrel\ServiceStack.Kestrel.Core.csproj
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Formats", "Formats", "{CBDE0575-D09B-4B4D-8C62-5E03E54F6BE8}"
diff --git a/src/ServiceStack/ServiceStack.Core.csproj b/src/ServiceStack/ServiceStack.Core.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>ServiceStack</AssemblyName>
     <RootNamespace>ServiceStack</RootNamespace>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <Title>ServiceStack webservice framework: Faster, Cleaner, Modern WCF alternative</Title>
+    <Title>ServiceStack .NET Standard 2.0</Title>
     <PackageDescription>
       ServiceStack is a simple and fast alternative to WCF, MVC and Web API in one cohesive framework for all your services
       and web apps that's intuitive and Easy to use!
diff --git a/tests/CheckWebCore/ContactServices.cs b/tests/CheckWebCore/ContactServices.cs
@@ -268,18 +268,14 @@ public class ContactServiceFilters : TemplateFilter
                 {"#b2fab4","Green"},
                 {"#9be7ff","Blue"}
             };
-    
             public Dictionary<string, string> contactColors() => Colors;
-    
+
             private static List<KeyValuePair<string, string>> Titles => EnumUtils.GetValues<Title>()
                 .Where(x => x != Title.Unspecified)
                 .ToKeyValuePairs();
-    
             public List<KeyValuePair<string, string>> contactTitles() => Titles;
 
-            private static List<string> FilmGenres => EnumUtils.GetValues<FilmGenres>()
-                .Map(x => x.ToDescription());
-
+            private static List<string> FilmGenres => EnumUtils.GetValues<FilmGenres>().Map(x => x.ToDescription());
             public List<string> contactGenres() => FilmGenres;
         }
 
