Feature: Upgrade .NET from Core 3.1 to 8.0 (and Native AOT!)

.github/workflows/ci.yml

@@ -32,8 +32,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 3.1.101
       - name: Setup NuGet
         uses: nuget/setup-nuget@v2
 
@@ -48,8 +46,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 3.1.101
       - name: Setup NuGet
         uses: nuget/setup-nuget@v2
 
@@ -77,16 +73,12 @@ jobs:
       - name: Setup .NET & GitHub Packages
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 3.1.101
           source-url: https://nuget.pkg.github.com/octokit/index.json
         env:
           NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build the solution
-        run: 'dotnet build ${{ env.OG_SOLUTION_PATH }} -c "${{ env.CONFIGURATION }}"'
-
       - name: Create the new package
-        run: 'dotnet pack ${{ env.OG_PACK_PROJ_PATH }} -o "${{ env.ARTIFACTS_STAGING_DIR_PATH }}"'
+        run: 'dotnet pack ${{ env.OG_PACK_PROJ_PATH }} -c "${{ env.CONFIGURATION }}" -o "${{ env.ARTIFACTS_STAGING_DIR_PATH }}"'
 
       - name: Publish to GitHub Actions
         uses: actions/upload-artifact@v4

Octokit.GraphQL.nuspec

@@ -18,9 +18,9 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="src\Octokit.GraphQL\bin\Release\netstandard2.0\Octokit.GraphQL.dll" target="lib\netstandard2.0"/>
-    <file src="src\Octokit.GraphQL\bin\Release\netstandard2.0\Octokit.GraphQL.xml" target="lib\netstandard2.0"/>
-    <file src="src\Octokit.GraphQL\bin\Release\netstandard2.0\Octokit.GraphQL.Core.dll" target="lib\netstandard2.0"/>
-    <file src="src\Octokit.GraphQL\bin\Release\netstandard2.0\Octokit.GraphQL.Core.xml" target="lib\netstandard2.0"/>
+    <file src="src\Octokit.GraphQL\bin\Release\net8.0\Octokit.GraphQL.dll" target="lib\net8.0"/>
+    <file src="src\Octokit.GraphQL\bin\Release\net8.0\Octokit.GraphQL.xml" target="lib\net8.0"/>
+    <file src="src\Octokit.GraphQL\bin\Release\net8.0\Octokit.GraphQL.Core.dll" target="lib\net8.0"/>
+    <file src="src\Octokit.GraphQL\bin\Release\net8.0\Octokit.GraphQL.Core.xml" target="lib\net8.0"/>
   </files>
 </package>

nuget.config

@@ -2,7 +2,7 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
-    <add key="Custom Packages for Octokit.GraphQL" value="lib" />
+    <add key="Local Packages for Octokit.GraphQL.Core.UnitTests" value="src/Octokit.GraphQL.Core.UnitTests/Assets" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />

readme.md

@@ -34,7 +34,7 @@ Install-Package Octokit.GraphQL -IncludePrerelease
 using Octokit.GraphQL;
 using static Octokit.GraphQL.Variable;
 
-// Authenticate with a PAT with a scope 'read:user'
+// Authenticate with a PAT with a scope 'read:repo'
 var connection = new Connection(new("Octokit.GraphQL.Net.SampleApp", "1.0"), "LOGGED_IN_GITHUB_USER_TOKEN");
 
 var query = new Query()
@@ -93,10 +93,8 @@ var result = await connection.Run(query);
 
 // Check if sponsoring 'warrenbuckley'
 var activeSponsor = result.SingleOrDefault(x => x.User.Login.ToLowerInvariant() == "warrenbuckley");
-if(activeSponsor != null)
-{
+if (activeSponsor != null)
     Console.WriteLine("Thanks for sponsoring Warren");
-}
 ```
 
 ## Contributing & Feedback
@@ -130,15 +128,14 @@ There are multiple ways to participate in the community:
 
 ```
 .
-├──Scripts                                    // Code quality scripts
-│  └──configure-integration-tests.ps1         // Integration tests configuration script
-├──Tools                                      // Code quality tools
-│  └──Generate                                // GraphQL .NET entity generator
-├──Octokit.GraphQL                            // Main API data contracts library
-├──Octokit.GraphQL.Core                       // Octokit core code
-├──Octokit.GraphQL.Core.Generation            // Core entity generator tools
-├──Octokit.GraphQL.Core.Generation.UnitTests  // Core entity generator unit tests
-├──Octokit.GraphQL.Core.UnitTests             // Octokit core unit tests
-├──Octokit.GraphQL.IntegrationTests           // Octokit integration tests
-└──Octokit.GraphQL.UnitTests                  // Octokit unit tests
+├──src
+│  ├──Octokit.GraphQL                            // Main API data contracts library
+│  ├──Octokit.GraphQL.Core                       // Octokit core code
+│  ├──Octokit.GraphQL.Core.Generation            // Core entity generator tools
+│  ├──Octokit.GraphQL.Core.Generation.UnitTests  // Core entity generator unit tests
+│  ├──Octokit.GraphQL.Core.UnitTests             // Octokit core unit tests
+│  ├──Octokit.GraphQL.IntegrationTests           // Octokit integration tests
+│  └──Octokit.GraphQL.UnitTests                  // Octokit unit tests
+└──tools                                         // Code quality tools
+   └──Generate                                   // GraphQL .NET entity generator
 ```

src/Octokit.GraphQL.Core.Generation.UnitTests/Octokit.GraphQL.Core.Generation.UnitTests.csproj

@@ -1,24 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.2</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.8.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+    <PackageReference Include="coverlet.msbuild" Version="2.8.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Octokit.GraphQL.Core.Generation\Octokit.GraphQL.Core.Generation.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
+
 </Project>

src/Octokit.GraphQL.Core.Generation/Octokit.GraphQL.Core.Generation.csproj

@@ -1,12 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>7.2</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
+    <PublishAot>true</PublishAot>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Octokit.GraphQL.Core\Octokit.GraphQL.Core.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+
 </Project>

src/Octokit.GraphQL.Core.UnitTests/ConnectionTests.cs

@@ -70,7 +70,7 @@ public static async Task Run_Specifies_Cancellation_Token()
 
             var connection = new Connection(ProductInformation, CredentialStore, httpClient);
 
-            await connection.Run(query, cancellationToken);
+            await Assert.ThrowsAsync<TaskCanceledException>(() => connection.Run(query, cancellationToken));
         }
 
         [Theory]

src/Octokit.GraphQL.Core.UnitTests/ExpressionRewiterTests.cs

@@ -9,9 +9,9 @@
 
 namespace Octokit.GraphQL.Core.UnitTests
 {
-    public class ExpressionRewiterTests
+    public class ExpressionRewriterTests
     {
-        public ExpressionRewiterTests()
+        public ExpressionRewriterTests()
         {
             ExpressionCompiler.IsUnitTesting = true;
         }
@@ -250,16 +250,16 @@ public void Can_Use_Conditional_To_Compare_To_Null()
             //         data["data"]["repository"],
             //         x => x["name"].Type != JTokenType.Null ? x["name"].ToObject<string>() : null);
 
-            var readableString = 
+            var readableString =
                 "data => Rewritten.Value.Select(data[\"data\"][\"repository\"],x => (x[\"name\"].Type != JTokenType.Null) ? x[\"name\"].ToObject<string>() : null)";
-            
+
             // Expression put through ReadableExpression outputs the following, so I'm using a hard coded string instead
             //   data => Rewritten.Value.Select(data["data"]["repository"], x => (((int)x["name"].Type) != 10) ? x["name"].ToObject<string>() : null)
 
             ExpressionRewriterAssertions.AssertExpressionQueryEqual(readableString, query);
         }
 
-        
+
         [Fact]
         public void Union_IssueOrPullRequest()
         {

src/Octokit.GraphQL.Core.UnitTests/Octokit.GraphQL.Core.UnitTests.csproj

@@ -1,25 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.2</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="AgileObjects.ReadableExpressions" Version="1.12.1" />
-    <PackageReference Include="coverlet.msbuild" Version="2.8.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+    <PackageReference Include="coverlet.msbuild" Version="2.8.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Octokit.GraphQL.Core\Octokit.GraphQL.Core.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
+
 </Project>

src/Octokit.GraphQL.Core/Octokit.GraphQL.Core.csproj

@@ -1,18 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Octokit.GraphQL</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\key.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <DocumentationFile>bin\$(Configuration)\netstandard1.1\Octokit.GraphQL.Core.xml</DocumentationFile>
-    <LangVersion>7.2</LangVersion>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Octokit.GraphQL.Core.xml</DocumentationFile>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
+    <PublishAot>true</PublishAot>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+
 </Project>

src/Octokit.GraphQL.IntegrationTests/Octokit.GraphQL.IntegrationTests.csproj

@@ -1,26 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyName>Octokit.GraphQL.IntegrationTests</AssemblyName>
-    <LangVersion>7.2</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.1" />
     <PackageReference Include="Octokit" Version="0.29.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Octokit.GraphQL.Core\Octokit.GraphQL.Core.csproj" />
     <ProjectReference Include="..\Octokit.GraphQL\Octokit.GraphQL.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
+
 </Project>

src/Octokit.GraphQL.Pack/Octokit.GraphQL.Pack.csproj

@@ -1,9 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <NoBuild>true</NoBuild>
+    <TargetFramework>net8.0</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <NuspecFile>../../Octokit.GraphQL.nuspec</NuspecFile>
     <NuspecBasePath>../..</NuspecBasePath>
   </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Octokit.GraphQL\Octokit.GraphQL.csproj" />
+  </ItemGroup>
+
 </Project>