Skip to content

Commit 9b670cb

Browse files
authored
Merge pull request #51 from MakingSense/add_net452_target_framework_support
Add net452 target framework support
2 parents ff5c41c + e6a8091 commit 9b670cb

File tree

5 files changed

+34
-23
lines changed

5 files changed

+34
-23
lines changed

src/MakingSense.AspNetCore.Abstractions/MakingSense.AspNetCore.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>MakingSense.AspNetCore.Abstractions Class Library</Description>
55
<Authors>MakingSense</Authors>
6-
<TargetFramework>netstandard2.0</TargetFramework>
6+
<TargetFrameworks>netstandard1.2;netstandard2.0</TargetFrameworks>
77
<AssemblyName>MakingSense.AspNetCore.Abstractions</AssemblyName>
88
<PackageId>MakingSense.AspNetCore.Abstractions</PackageId>
99
<PackageTags>ASP.NET 5;vnext;ASP.NET Core</PackageTags>

src/MakingSense.AspNetCore.HypermediaApi/ExceptionHandling/ApiErrorHandlerMiddleware.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
using MakingSense.AspNetCore.HypermediaApi.Metadata;
1313
using MakingSense.AspNetCore.HypermediaApi.Linking;
1414
using Microsoft.AspNetCore.Mvc.Infrastructure;
15+
#if NETFRAMEWORK
16+
using Microsoft.AspNetCore.Mvc.Internal;
17+
#endif
1518

1619
namespace MakingSense.AspNetCore.HypermediaApi.ExceptionHandling
1720
{

src/MakingSense.AspNetCore.HypermediaApi/Formatters/HypermediaApiJsonInputFormatter.cs

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using System;
2-
using System.Buffers;
3-
using Microsoft.AspNetCore.Mvc;
1+
using Microsoft.AspNetCore.Mvc;
42
using Microsoft.AspNetCore.Mvc.Formatters;
53
using Microsoft.Extensions.Logging;
64
using Microsoft.Extensions.ObjectPool;
75
using Newtonsoft.Json;
6+
using System;
7+
using System.Buffers;
88

99
#if NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0
1010
using MvcJsonOptions = Microsoft.AspNetCore.Mvc.MvcNewtonsoftJsonOptions;
@@ -27,7 +27,11 @@ public HypermediaApiJsonInputFormatter(ILogger logger, JsonSerializerSettings se
2727
}
2828

2929
public HypermediaApiJsonInputFormatter(ILogger logger, JsonSerializerSettings serializerSettings, ArrayPool<char> charPool, ObjectPoolProvider objectPoolProvider, MvcOptions options, MvcJsonOptions jsonOptions)
30-
: base(logger, serializerSettings, charPool, objectPoolProvider, options, jsonOptions)
30+
#if NETFRAMEWORK
31+
: base(logger, serializerSettings, charPool, objectPoolProvider)
32+
#else
33+
: base(logger, serializerSettings, charPool, objectPoolProvider, options, jsonOptions)
34+
#endif
3135
{
3236
//TODO: add a setting to strict case sensitive de-serialization for properties
3337

@@ -41,21 +45,21 @@ public HypermediaApiJsonInputFormatter(ILogger logger, JsonSerializerSettings se
4145
SupportedMediaTypes.Add("text/x-json");
4246
}
4347

44-
public override bool CanRead(InputFormatterContext context)
45-
{
46-
var requestContentType = context.HttpContext.Request.ContentType;
47-
if (string.IsNullOrEmpty(requestContentType))
48-
{
49-
return AcceptEmptyContentType;
50-
}
51-
if (AcceptAnyContentType)
52-
{
53-
return true;
54-
}
55-
else
56-
{
57-
return base.CanRead(context);
58-
}
59-
}
48+
public override bool CanRead(InputFormatterContext context)
49+
{
50+
var requestContentType = context.HttpContext.Request.ContentType;
51+
if (string.IsNullOrEmpty(requestContentType))
52+
{
53+
return AcceptEmptyContentType;
54+
}
55+
if (AcceptAnyContentType)
56+
{
57+
return true;
58+
}
59+
else
60+
{
61+
return base.CanRead(context);
62+
}
63+
}
6064
}
6165
}

src/MakingSense.AspNetCore.HypermediaApi/Formatters/Internal/HypermediaApiMvcOptionsSetup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static void ConfigureMvc(
4848
var jsonOutputFormatter =
4949
#if NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0
5050
new NewtonsoftJsonOutputFormatter(serializerSettings, charPool, options);
51-
#elif NETSTANDARD2_0
51+
#elif NETSTANDARD2_0 || NETFRAMEWORK
5252
new JsonOutputFormatter(serializerSettings, charPool);
5353
#else
5454
#error unknown target framework

src/MakingSense.AspNetCore.HypermediaApi/MakingSense.AspNetCore.HypermediaApi.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>MakingSense.AspNetCore.HypermediaApi Class Library</Description>
55
<Authors>MakingSense</Authors>
6-
<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp3.0;netstandard2.0</TargetFrameworks>
6+
<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp3.0;netstandard2.0;net452</TargetFrameworks>
77
<AssemblyName>MakingSense.AspNetCore.HypermediaApi</AssemblyName>
88
<PackageId>MakingSense.AspNetCore.HypermediaApi</PackageId>
99
<PackageTags>ASP.NET 5;vnext;Hypermedia;API;REST;ASP.NET Core</PackageTags>
@@ -45,6 +45,10 @@
4545
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
4646
</ItemGroup>
4747

48+
<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
49+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
50+
</ItemGroup>
51+
4852
<ItemGroup>
4953
<PackageReference Include="System.Linq" Version="4.3.0" />
5054
<PackageReference Include="System.Linq.Queryable" Version="4.3.0" />

0 commit comments

Comments
 (0)