Hot Chocolate version 12 and .NET 6 (#123)

michaelstaib · web-flow · commit 2012c60e6fb9 · 2021-10-01T13:28:46.000+02:00
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "5.0.103"
+        "version": "6.0.100-preview.7.21379.14"
     }
 }
diff --git a/src/Clients/src/Directory.Build.props b/src/Clients/src/Directory.Build.props
@@ -2,6 +2,6 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0; netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0; net5.0; netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/Clients/src/HotChocolate/HotChocolate.csproj b/src/Clients/src/HotChocolate/HotChocolate.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="HotChocolate" Version="12.0.0" />
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="HotChocolate" Version="11.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Clients/src/HotChocolate/HotChocolateActivity.cs b/src/Clients/src/HotChocolate/HotChocolateActivity.cs
@@ -14,7 +14,7 @@ namespace Thor.Extensions.HotChocolate
     [Serializable]
     internal class HotChocolateActivity
         : IActivity
-        , IActivityScope
+        , IDisposable
     {
         private readonly Guid _relatedActivityId;
         private bool _disposed;
diff --git a/src/Clients/src/HotChocolate/HotChocolateDiagnosticsListener.cs b/src/Clients/src/HotChocolate/HotChocolateDiagnosticsListener.cs
@@ -7,7 +7,7 @@
 
 namespace Thor.Extensions.HotChocolate
 {
-    internal class HotChocolateDiagnosticsListener : DiagnosticEventListener
+    internal class HotChocolateDiagnosticsListener : ExecutionDiagnosticEventListener
     {
         private readonly IRequestFormatter _formatter;
 
@@ -16,7 +16,7 @@ public HotChocolateDiagnosticsListener(IRequestFormatter formatter)
             _formatter = formatter ?? throw new ArgumentNullException(nameof(formatter));
         }
 
-        public override IActivityScope ExecuteRequest(IRequestContext context)
+        public override IDisposable ExecuteRequest(IRequestContext context)
         {
             var activity = HotChocolateActivity.Create(_formatter.Serialize(context.Request));
             context.SetActivity(activity);
diff --git a/src/Clients/test/Hosting.Tests/Hosting.Tests.csproj b/src/Clients/test/Hosting.Tests/Hosting.Tests.csproj
@@ -12,7 +12,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="HotChocolate.AspNetCore" Version="11.0.0" />
+    <PackageReference Include="HotChocolate.AspNetCore" Version="12.0.0" />
     <PackageReference Include="Microsoft.CodeCoverage" Version="16.6.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
diff --git a/src/Clients/test/HotChocolate.Tests/HotChocolate.Tests.csproj b/src/Clients/test/HotChocolate.Tests/HotChocolate.Tests.csproj
@@ -19,7 +19,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="HotChocolate.AspNetCore" Version="11.0.0" />
+    <PackageReference Include="HotChocolate.AspNetCore" Version="12.0.0" />
     <PackageReference Include="Microsoft.CodeCoverage" Version="16.6.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="Moq" Version="4.14.5" />
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -38,7 +38,7 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/Test.props b/src/Test.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "5.0.103"`
	`3`	`+ "version": "6.0.100-preview.7.21379.14"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace Thor.Extensions.HotChocolate`
`14`	`14`	`[Serializable]`
`15`	`15`	`internal class HotChocolateActivity`
`16`	`16`	`: IActivity`
`17`		`- , IActivityScope`
	`17`	`+ , IDisposable`
`18`	`18`	`{`
`19`	`19`	`private readonly Guid _relatedActivityId;`
`20`	`20`	`private bool _disposed;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace Thor.Extensions.HotChocolate`
`9`	`9`	`{`
`10`		`- internal class HotChocolateDiagnosticsListener : DiagnosticEventListener`
	`10`	`+ internal class HotChocolateDiagnosticsListener : ExecutionDiagnosticEventListener`
`11`	`11`	`{`
`12`	`12`	`private readonly IRequestFormatter _formatter;`
`13`	`13`
`@@ -16,7 +16,7 @@ public HotChocolateDiagnosticsListener(IRequestFormatter formatter)`
`16`	`16`	`_formatter = formatter ?? throw new ArgumentNullException(nameof(formatter));`
`17`	`17`	`}`
`18`	`18`
`19`		`- public override IActivityScope ExecuteRequest(IRequestContext context)`
	`19`	`+ public override IDisposable ExecuteRequest(IRequestContext context)`
`20`	`20`	`{`
`21`	`21`	`var activity = HotChocolateActivity.Create(_formatter.Serialize(context.Request));`
`22`	`22`	`context.SetActivity(activity);`