Add netcoreapp3.0 target for ServiceStack.Mvc

mythz · mythz · commit edc8f6b70757 · 2019-10-02T08:22:30.000-04:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Version>5.7.1</Version>
     <Authors>ServiceStack</Authors>
     <Company>ServiceStack, Inc.</Company>
-    <Copyright>&#169; 2008-2018 ServiceStack, Inc</Copyright>
+    <Copyright>&#169; 2008-2019 ServiceStack, Inc</Copyright>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageProjectUrl>https://github.com/ServiceStack/ServiceStack</PackageProjectUrl>
     <PackageLicenseUrl>https://servicestack.net/terms</PackageLicenseUrl>
@@ -32,7 +32,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+    <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ServiceStack.Mvc/ExecuteServiceStackFiltersAttribute.cs b/src/ServiceStack.Mvc/ExecuteServiceStackFiltersAttribute.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
     using System.Web.Mvc;
 #else
     using Microsoft.AspNetCore.Mvc;
@@ -54,7 +54,7 @@ private static List<T> GetActionAndControllerAttributes<T>(ActionExecutingContex
         {
             var attrs = new List<T>();
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
             var attr = filterContext.ActionDescriptor
                 .GetCustomAttributes(typeof(T), true)
                 .FirstOrDefault() as T;
diff --git a/src/ServiceStack.Mvc/FluentValidation/CustomizeValidatorAttribute.cs b/src/ServiceStack.Mvc/FluentValidation/CustomizeValidatorAttribute.cs
@@ -1,4 +1,4 @@
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
 #region License
 // Copyright (c) Jeremy Skinner (http://www.jeremyskinner.co.uk)
 // 
diff --git a/src/ServiceStack.Mvc/FluentValidation/FluentValidationModelValidator.cs b/src/ServiceStack.Mvc/FluentValidation/FluentValidationModelValidator.cs
@@ -1,4 +1,4 @@
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
 	using System;
 	using System.Collections.Generic;
diff --git a/src/ServiceStack.Mvc/FluentValidation/FluentValidationModelValidatorProvider.cs b/src/ServiceStack.Mvc/FluentValidation/FluentValidationModelValidatorProvider.cs
@@ -1,4 +1,4 @@
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
 #region License
 // Copyright (c) Jeremy Skinner (http://www.jeremyskinner.co.uk)
 // 
diff --git a/src/ServiceStack.Mvc/FluentValidation/IValidatorInterceptor.cs b/src/ServiceStack.Mvc/FluentValidation/IValidatorInterceptor.cs
@@ -1,4 +1,4 @@
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
 	using System.Web.Mvc;
 	using Results;
diff --git a/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/AbstractComparisonFluentValidationPropertyValidator.cs b/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/AbstractComparisonFluentValidationPropertyValidator.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
     using System;
     using System.Collections.Generic;
diff --git a/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/CreditCardFluentValidationPropertyValidator.cs b/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/CreditCardFluentValidationPropertyValidator.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
 	using System.Collections.Generic;
 	using System.Web.Mvc;
diff --git a/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/EmailFluentValidationPropertyValidator.cs b/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/EmailFluentValidationPropertyValidator.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
 	using System.Collections.Generic;
 	using System.Web.Mvc;
diff --git a/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/EqualToFluentValidationPropertyValidator.cs b/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/EqualToFluentValidationPropertyValidator.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
 	using System.Collections.Generic;
 	using System.Reflection;
diff --git a/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/FluentValidationPropertyValidator.cs b/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/FluentValidationPropertyValidator.cs
@@ -1,4 +1,4 @@
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
 	using System;
 	using System.Collections.Generic;
diff --git a/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/MaxFluentValidationPropertyValidator.cs b/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/MaxFluentValidationPropertyValidator.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
     using System.Web.Mvc;
     using Internal;
diff --git a/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/MinFluentValidationPropertyValidator.cs b/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/MinFluentValidationPropertyValidator.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
     using System.Web.Mvc;
     using Internal;
diff --git a/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/RangeFluentValidationPropertyValidator.cs b/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/RangeFluentValidationPropertyValidator.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
 	using System.Collections.Generic;
 	using System.Web.Mvc;
diff --git a/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/RegularExpressionFluentValidationPropertyValidator.cs b/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/RegularExpressionFluentValidationPropertyValidator.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
 	using System.Collections.Generic;
 	using System.Web.Mvc;
diff --git a/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/RequiredFluentValidationPropertyValidator.cs b/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/RequiredFluentValidationPropertyValidator.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
 	using System.Collections.Generic;
 	using System.Web.Mvc;
diff --git a/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/StringLengthFluentValidationPropertyValidator.cs b/src/ServiceStack.Mvc/FluentValidation/PropertyValidatorAdapters/StringLengthFluentValidationPropertyValidator.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
 	using System.Collections.Generic;
 	using System.Web.Mvc;
diff --git a/src/ServiceStack.Mvc/FluentValidation/RuleSetForClientSideMessagesAttribute.cs b/src/ServiceStack.Mvc/FluentValidation/RuleSetForClientSideMessagesAttribute.cs
@@ -1,4 +1,4 @@
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
 namespace ServiceStack.FluentValidation.Mvc {
 	using System.Web;
 	using System.Web.Mvc;
diff --git a/src/ServiceStack.Mvc/FluentValidation/ValidationResultExtension.cs b/src/ServiceStack.Mvc/FluentValidation/ValidationResultExtension.cs
@@ -1,4 +1,4 @@
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
 #region License
 // Copyright (c) Jeremy Skinner (http://www.jeremyskinner.co.uk)
 // 
diff --git a/src/ServiceStack.Mvc/FunqControllerFactory.cs b/src/ServiceStack.Mvc/FunqControllerFactory.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 using System;
 using System.Linq;
 using System.Reflection;
diff --git a/src/ServiceStack.Mvc/MiniProfiler/MvcMiniProfiler.cs b/src/ServiceStack.Mvc/MiniProfiler/MvcMiniProfiler.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 
 using System.Web;
 using System.Web.Routing;
diff --git a/src/ServiceStack.Mvc/MiniProfiler/ProfilingActionFilter.cs b/src/ServiceStack.Mvc/MiniProfiler/ProfilingActionFilter.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/ServiceStack.Mvc/MiniProfiler/ProfilingViewEngine.cs b/src/ServiceStack.Mvc/MiniProfiler/ProfilingViewEngine.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD2_0
+﻿#if !NETSTANDARD
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/ServiceStack.Mvc/MvcPageResult.cs b/src/ServiceStack.Mvc/MvcPageResult.cs
@@ -4,7 +4,7 @@
 
 namespace ServiceStack.Mvc
 {
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
     public class MvcPageResult : System.Web.Mvc.ActionResult
     {
         private readonly PageResult pageResult;
@@ -53,7 +53,7 @@ public override async Task ExecuteResultAsync(Microsoft.AspNetCore.Mvc.ActionCon
     
     public static class MvcPageResultExtensions
     {
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
         public static async Task<MvcPageResult> ToMvcResultAsync(this PageResult pageResult)
         {
             var ms = new MemoryStream();            
diff --git a/src/ServiceStack.Mvc/RazorFormat.cs b/src/ServiceStack.Mvc/RazorFormat.cs
@@ -1,4 +1,4 @@
-﻿#if NETSTANDARD2_0
+﻿#if NETSTANDARD
 
 using System;
 using System.Collections.Generic;
diff --git a/src/ServiceStack.Mvc/ServiceStack.Mvc.csproj b/src/ServiceStack.Mvc/ServiceStack.Mvc.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <PackageId>ServiceStack.Mvc</PackageId>
     <AssemblyName>ServiceStack.Mvc</AssemblyName>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0;netcoreapp3.0</TargetFrameworks>
     <Title>MVC Adapters for integrating with ServiceStack webservices</Title>
     <PackageDescription>
       Full details in MVC PowerPack: http://mono.servicestack.net/mvc-powerpack/
@@ -12,13 +12,15 @@
     </PackageDescription>
     <PackageTags>MVC;ServiceStack;MiniProfiler;FluentValidation;Controller</PackageTags>
   </PropertyGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.Interfaces\ServiceStack.Interfaces.csproj" />
     <ProjectReference Include="..\ServiceStack.Client\ServiceStack.Client.csproj" />
     <ProjectReference Include="..\ServiceStack.Common\ServiceStack.Common.csproj" />
     <ProjectReference Include="..\ServiceStack\ServiceStack.csproj" />
     <PackageReference Include="ServiceStack.Text" Version="$(Version)" />
   </ItemGroup>
+  
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <ProjectReference Include="..\ServiceStack.NetFramework\ServiceStack.NetFramework.csproj" />
     <Reference Include="System.Web" />
@@ -29,8 +31,18 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
   </ItemGroup>
+  
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.1.3" />
   </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+    <DefineConstants>$(DefineConstants);NETSTANDARD;NETCOREAPP_3</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core " Version="2.2.5" />
+  </ItemGroup>
 </Project>
diff --git a/src/ServiceStack.Mvc/ServiceStackController.cs b/src/ServiceStack.Mvc/ServiceStackController.cs
@@ -11,7 +11,7 @@
 using ServiceStack.Web;
 using System.Web;
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
     using ServiceStack.Host.AspNet;
     using System.Web.Mvc;
     using System.Web.Routing;
@@ -94,7 +94,7 @@ public virtual ActionResult ForbiddenErrorResult
                 action = "Unauthorized"
             }));
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
         public static Func<System.Web.Routing.RequestContext, ServiceStackController> CatchAllController;
 
         protected virtual ActionResult InvokeDefaultAction(HttpContextBase httpContext)
@@ -160,7 +160,7 @@ public override JsonResult Json(object data)
         private IServiceStackProvider serviceStackProvider;
         public virtual IServiceStackProvider ServiceStackProvider => 
             serviceStackProvider ?? (serviceStackProvider = 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
             new ServiceStackProvider(new AspNetRequest(base.HttpContext, GetType().Name)));
 #else
             new ServiceStackProvider(new NetCoreRequest(base.HttpContext, GetType().Name)));
@@ -226,7 +226,7 @@ public virtual void EndServiceStackRequest() =>
             HostContext.AppHost.OnEndRequest(ServiceStackRequest);
     }
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
     public class ServiceStackJsonResult : JsonResult
     {
         public override void ExecuteResult(ControllerContext context)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if !NETSTANDARD2_0`
	`1`	`+#if !NETSTANDARD`
`2`	`2`	`#region License`
`3`	`3`	`// Copyright (c) Jeremy Skinner (http://www.jeremyskinner.co.uk)`
`4`	`4`	`//`