upgrade project tooling to .NET Core 3.1 (#2089)

octokit · Feb 9, 2020 · 8cf4d58 · 8cf4d58
1 parent 911dd4a
commit 8cf4d58
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 18 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "sourcelink": {
+      "version": "3.1.1",
+      "commands": [
+        "sourcelink"
+      ]
+    }
+  }
+}
diff --git a/.github/workflows/netcore.yml b/.github/workflows/netcore.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 2.1.803
+        dotnet-version: 3.1.101
     - name: Build with dotnet
       run: ./build.sh --linksources=true --verbosity=verbose
       shell: bash
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,9 @@
+<Project>
+  <PropertyGroup>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
+  </ItemGroup>
+</Project>
diff --git a/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj b/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj
@@ -4,7 +4,7 @@
     <Description>Convention-based tests for Octokit</Description>
     <AssemblyTitle>Octokit.Tests.Conventions</AssemblyTitle>
     <Authors>GitHub</Authors>
-    <TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
     <NoWarn>$(NoWarn);CS4014;CS1998</NoWarn>
     <AssemblyName>Octokit.Tests.Conventions</AssemblyName>
     <PackageId>Octokit.Tests.Conventions</PackageId>

diff --git a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
@@ -4,7 +4,7 @@
     <Description>Integration tests for Octokit</Description>
     <AssemblyTitle>Octokit.Tests.Integration</AssemblyTitle>
     <Authors>GitHub</Authors>
-    <TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
     <NoWarn>$(NoWarn);CS4014;CS1998</NoWarn>
     <AssemblyName>Octokit.Tests.Integration</AssemblyName>
     <PackageId>Octokit.Tests.Integration</PackageId>
@@ -19,7 +19,7 @@
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <DefineConstants>$(DefineConstants);GITHUBJWT_HELPER_AVAILABLE</DefineConstants>
   </PropertyGroup>
 
@@ -45,7 +45,7 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <PackageReference Include="GitHubJwt" Version="0.0.4" />
   </ItemGroup>
 

diff --git a/Octokit.Tests/Octokit.Tests.csproj b/Octokit.Tests/Octokit.Tests.csproj
@@ -4,7 +4,7 @@
     <Description>Tests for Octokit</Description>
     <AssemblyTitle>Octokit.Tests</AssemblyTitle>
     <Authors>GitHub</Authors>
-    <TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
     <NoWarn>$(NoWarn);CS4014;CS1998</NoWarn>
     <AssemblyName>Octokit.Tests</AssemblyName>
     <PackageId>Octokit.Tests</PackageId>
@@ -32,7 +32,7 @@
     <PackageReference Include="NSubstitute" Version="4.2.1" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <DefineConstants>$(DefineConstants);NO_SERIALIZABLE;HAS_TYPEINFO</DefineConstants>
   </PropertyGroup>
 

diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj
@@ -53,8 +53,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-    <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.8.3" />
-    <DotNetCliToolReference Include="dotnet-sourcelink" Version="2.8.3" />
   </ItemGroup>
 
 </Project>
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 branches:
   only:
@@ -16,4 +16,4 @@ test: off
 
 artifacts:
 - path: 'packaging\octokit*.nupkg'
-  name: OctokitPackages
+  name: OctokitPackages
diff --git a/build.ps1 b/build.ps1
@@ -103,6 +103,13 @@ $Arguments = @{
     dryrun=$WhatIf;
 }.GetEnumerator() | %{"--{0}=`"{1}`"" -f $_.key, $_.value };
 
+Write-Host "Restoring global tools..."
+Invoke-Expression "dotnet tool restore"
+if($LASTEXITCODE -ne 0) {
+    Pop-Location;
+    exit $LASTEXITCODE;
+}
+
 # Start Cake
 Push-Location
 Set-Location build

diff --git a/build.sh b/build.sh
@@ -6,10 +6,13 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   echo "new limit: `ulimit -n`"
 fi
 
+echo "Restoring global tools"
+dotnet tool restore
+
 cd build
 echo "Preparing Cake.Frosting build runner..."
 dotnet restore
 
 echo "Executing Cake.Frosting build runner..."
 echo  "dotnet run -- $@"
-dotnet run -- "$@"
+dotnet run -- "$@"
diff --git a/build/.vscode/launch.json b/build/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/bin/Debug/netcoreapp2.0/Build.dll",
+            "program": "${workspaceFolder}/bin/Debug/netcoreapp3.1/Build.dll",
             "args": [],
             "cwd": "${workspaceFolder}",
             // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
@@ -25,4 +25,4 @@
             "processId": "${command:pickProcess}"
         }
     ,]
-}
+}
diff --git a/build/Build.csproj b/build/Build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/build/Context.cs b/build/Context.cs
@@ -41,7 +41,7 @@ public DotNetCoreTestSettings GetTestSettings()
 
         if (!this.IsRunningOnWindows())
         {
-            var testFramework = "netcoreapp2.1";
+            var testFramework = "netcoreapp3.1";
 
             this.Information($"Running tests against {testFramework} only as we're not on Windows.");
             settings.Framework = testFramework;

diff --git a/build/Tasks/CodeCoverage.cs b/build/Tasks/CodeCoverage.cs
@@ -21,13 +21,13 @@ public override void Run(Context context)
                 context.Information("Executing Code Coverage for Project {0}...", project.Name);
 
                 var dotNetCoreCoverage = context.CodeCoverage
-                    .CombineWithFilePath(project.Name + "-netcoreapp2.1.xml");
+                    .CombineWithFilePath(project.Name + "-netcoreapp3.1.xml");
                 coverageFiles.Add(dotNetCoreCoverage);
 
                 context.Coverlet(project, new CoverletToolSettings()
                 {
                     Configuration = context.Configuration,
-                    Framework = "netcoreapp2.1",
+                    Framework = "netcoreapp3.1",
                     Output = dotNetCoreCoverage.FullPath
                 });
 

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "3.1.101"
+  }
+}