Skip to content

Commit b4c49ed

Browse files
cajuncodingcajuncoding
committed
WIP fixing Builds with targeting for net461...
1 parent 48344e2 commit b4c49ed

File tree

6 files changed

+32
-26
lines changed

6 files changed

+32
-26
lines changed

‎FlurlGraphQL.Newtonsoft/FlurlGraphQL.Newtonsoft.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- NOTE: Just as with the base Flurl.Http.Newtonsoft library and Microsofts recommendation we now target net6.0 for all new projects, and netstandard2.0 + net461 (because it had big issues using netstandard prior to .NET Framework 4.7) -->
5-
<TargetFrameworks>net6.0;netstandard2.0;net461</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;</TargetFrameworks>
66
<ImplicitUsings>disable</ImplicitUsings>
77
<Version>2.0.0</Version>
88
<AssemblyVersion>2.0.0</AssemblyVersion>

‎FlurlGraphQL.Tests/FlurlGraphQL.Tests.csproj‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net461;</TargetFrameworks>
4+
<!--<TargetFrameworks>net461</TargetFrameworks>-->
5+
<TargetFrameworks>net461;net48;net6.0;</TargetFrameworks>
56
<LangVersion>8.0</LangVersion>
67
<ImplicitUsings>disable</ImplicitUsings>
78
<Nullable>disable</Nullable>
89
<IsPackable>false</IsPackable>
10+
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
911
</PropertyGroup>
1012

1113
<ItemGroup>
1214
<PackageReference Include="Bogus" Version="35.5.0" />
15+
<PackageReference Include="coverlet.msbuild" Version="3.1.2">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
1319
<PackageReference Include="Flurl.Http.Newtonsoft" Version="0.9.1" />
1420
<PackageReference Include="InternalsVisibleTo.MSBuild" Version="1.1.0">
1521
<PrivateAssets>all</PrivateAssets>
1622
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1723
</PackageReference>
1824
<PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
1925
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
20-
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
21-
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
22-
<PackageReference Include="coverlet.collector" Version="6.0.2">
23-
<PrivateAssets>all</PrivateAssets>
24-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25-
</PackageReference>
26+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
27+
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
2628
</ItemGroup>
2729

2830
<ItemGroup>

‎FlurlGraphQL.Tests/FlurlGraphQLFactoryTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void TestFlurlGraphQLJsonSerializerFactoryPerformance()
2828
timer.Stop();
2929

3030
Assert.IsNotNull(graphqlSerializer);
31-
Assert.IsInstanceOfType<FlurlGraphQLSystemTextJsonSerializer>(graphqlSerializer);
31+
Assert.IsInstanceOfType(graphqlSerializer, typeof(FlurlGraphQLSystemTextJsonSerializer));
3232

3333
if(i == 0) TestContext.WriteLine($"[SystemTextJson Test] First Execution Time was [{timer.Elapsed.TotalMilliseconds}] ms / [{timer.Elapsed.Ticks}] ticks...");
3434
timeEntries.Add(timer.ElapsedTicks);
@@ -47,7 +47,7 @@ public void TestFlurlGraphQLJsonSerializerFactoryPerformance()
4747
timer.Stop();
4848

4949
Assert.IsNotNull(graphqlSerializer);
50-
Assert.IsInstanceOfType<FlurlGraphQLNewtonsoftJsonSerializer>(graphqlSerializer);
50+
Assert.IsInstanceOfType(graphqlSerializer, typeof(FlurlGraphQLNewtonsoftJsonSerializer));
5151

5252
if (i == 0) TestContext.WriteLine($"[NewtonsoftJson Test] First Execution Time was [{timer.Elapsed.TotalMilliseconds}] ms / [{timer.Elapsed.Ticks}] ticks...");
5353
timeEntries.Add(timer.ElapsedTicks);

‎FlurlGraphQL.Tests/FlurlGraphQLParsingTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public FlurlGraphQLParsingTests() : base()
2929
public void TestDefaultSystemTextJsonProcessorIsCorrect()
3030
{
3131
var newtonsoftJsonGraphQLProcessor = CreateDefaultSystemTextJsonGraphQLResponseProcessor(this.NestedPaginatedStarWarsJsonText);
32-
Assert.IsInstanceOfType<FlurlGraphQLSystemTextJsonResponseTransformProcessor>(newtonsoftJsonGraphQLProcessor);
32+
Assert.IsInstanceOfType(newtonsoftJsonGraphQLProcessor, typeof(FlurlGraphQLSystemTextJsonResponseTransformProcessor));
3333
}
3434

3535
[TestMethod]
@@ -125,7 +125,7 @@ public void TestSystemTextJsonParsingOfNestedPaginatedGraphQLResultsWithJsonProp
125125
public void TestDefaultNewtonsoftJsonProcessorIsCorrect()
126126
{
127127
var newtonsoftJsonGraphQLProcessor = CreateDefaultNewtonsoftJsonGraphQLResponseProcessor(this.NestedPaginatedStarWarsJsonText);
128-
Assert.IsInstanceOfType<FlurlGraphQLNewtonsoftJsonResponseTransformProcessor>(newtonsoftJsonGraphQLProcessor);
128+
Assert.IsInstanceOfType(newtonsoftJsonGraphQLProcessor, typeof(FlurlGraphQLNewtonsoftJsonResponseTransformProcessor));
129129
}
130130

131131

‎FlurlGraphQL/FlurlGraphQL.csproj‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
<PropertyGroup>
44
<!--NOTE: WE provide net6 for the latest projects, but also netstandard2.1 which has proper Async streaming support, in addition to netstandard2.0 + net461 for legacy support (because it had big issues using netstandard prior to .NET Framework 4.7 -->
5-
<TargetFrameworks>net6.0;netstandard2.0;netstandard2.1;net461</TargetFrameworks>
5+
<!--<TargetFrameworks>net461</TargetFrameworks>-->
6+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;</TargetFrameworks>
67
<Version>1.3.2</Version>
78
<AssemblyVersion>1.3.2</AssemblyVersion>
89
<FileVersion>1.3.2</FileVersion>
@@ -42,6 +43,19 @@
4243
<PackageTags>graphql, graph-ql, graphql client, graphql query, flurl, rest, http, http client, json, hotchocolate, paging, cursor</PackageTags>
4344
</PropertyGroup>
4445

46+
<ItemGroup>
47+
<PackageReference Include="Flurl.Http" Version="4.0.2" />
48+
<PackageReference Include="InternalsVisibleTo.MSBuild" Version="1.1.0">
49+
<PrivateAssets>all</PrivateAssets>
50+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
51+
</PackageReference>
52+
<PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
53+
</ItemGroup>
54+
55+
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' Or '$(TargetFramework)'=='net461'">
56+
<PackageReference Include="System.Text.Json" Version="6.0.4" />
57+
</ItemGroup>
58+
4559
<ItemGroup>
4660
<!-- NOTE: See Directory.Builds.targets for dynamic MSBuild Xml script as provied by the great Blog article at: https://www.meziantou.net/declaring-internalsvisibleto-in-the-csproj.htm-->
4761
<!-- Dynamically Adds: [assembly: InternalsVisibleTo("FlurlGraphQL.Newtonsoft")] -->
@@ -51,17 +65,8 @@
5165
</ItemGroup>
5266

5367
<ItemGroup>
54-
<None Include="..\Directory.Build.targets" Link="Directory.Build.targets" />
55-
<None Include="..\README.md" Link="README.md" />
56-
</ItemGroup>
57-
58-
<ItemGroup>
59-
<PackageReference Include="Flurl.Http" Version="4.0.2" />
60-
<PackageReference Include="InternalsVisibleTo.MSBuild" Version="1.1.0">
61-
<PrivateAssets>all</PrivateAssets>
62-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
63-
</PackageReference>
64-
<PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
68+
<!--<None Include="..\Directory.Build.targets" Link="Directory.Build.targets" />-->
69+
<None Include="..\README.md" Link="README.md" />
6570
</ItemGroup>
6671

6772
</Project>

‎FlurlGraphQL/FlurlGraphQL/FlurlGraphQLResponseExtensions.SystemTextJson.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Text.Json.Nodes;
33
using System.Threading.Tasks;
4-
using System.Xml.Linq;
54

65
namespace FlurlGraphQL
76
{

0 commit comments

Comments
 (0)