From 71e7525cb027003aa87738531575e1ac07dba6ed Mon Sep 17 00:00:00 2001
From: John Korsnes <johnkors@gmail.com>
Date: Mon, 21 Aug 2023 15:39:29 +0200
Subject: [PATCH] Removes support for netcoreapp3.1

---
 .github/workflows/ci.yml                      | 10 ++-----
 .github/workflows/prerelease.yml              | 15 ++--------
 .github/workflows/release.yml                 | 16 +++-------
 Dockerfile                                    |  2 +-
 source/dotnet-pr.tests/dotnet-pr.tests.csproj |  2 +-
 source/dotnet-pr/dotnet-pr.csproj             | 29 ++++++++-----------
 source/source.sln                             |  7 +++++
 7 files changed, 31 insertions(+), 50 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d1cd7c8..db84460 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,14 +7,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "3.1.x"
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "6.0.x"
-          include-prerelease: true
+          dotnet-version: "7.0.x"
       - name: Test
         run: dotnet test source/dotnet-pr.tests --logger "GitHubActions;report-warnings=false"
       - name: Run tool in docker
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 6de2a8b..20e68c8 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -11,24 +11,15 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Setup .NET 3.1
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET 7
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 3.1.x
-      - name: Setup .NET 5
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 5.0.x
+          dotnet-version: 7.0.x
       - run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV
       - name: Install GitVersion
         uses: gittools/actions/gitversion/setup@v0.9.7
         with:
           versionSpec: "5.x"
-      - name: Setup .NET 6
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "6.0.100-rc.2.21458.9"
-          include-prerelease: true
       - name: Determine Version
         id: gitversion
         uses: gittools/actions/gitversion/execute@v0.9.7
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0a4cb6a..19f27d9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,26 +8,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Setup .NET 3.1
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET 7
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 3.1.x
-      - name: Setup .NET 5
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 5.0.x
+          dotnet-version: 7.0.x
       - run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV
       - name: Install GitVersion
         uses: gittools/actions/gitversion/setup@v0.9.7
         with:
           versionSpec: "5.x"
-      - name: Setup .NET 6
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "6.0.100-rc.2.21458.9"
       - name: Determine Version
         id: gitversion
         uses: gittools/actions/gitversion/execute@v0.9.7
diff --git a/Dockerfile b/Dockerfile
index 69991a8..44c9344 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
 
 WORKDIR /
 COPY ./ ./therepo
diff --git a/source/dotnet-pr.tests/dotnet-pr.tests.csproj b/source/dotnet-pr.tests/dotnet-pr.tests.csproj
index 9703b8b..22220b7 100644
--- a/source/dotnet-pr.tests/dotnet-pr.tests.csproj
+++ b/source/dotnet-pr.tests/dotnet-pr.tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
         <RootNamespace>dotnet_pr.tests</RootNamespace>
 
         <IsPackable>false</IsPackable>
diff --git a/source/dotnet-pr/dotnet-pr.csproj b/source/dotnet-pr/dotnet-pr.csproj
index 5f80e50..add1d56 100644
--- a/source/dotnet-pr/dotnet-pr.csproj
+++ b/source/dotnet-pr/dotnet-pr.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <PackageId>dotnet-pr</PackageId>
     <ToolCommandName>pr</ToolCommandName>
     <Authors>John Korsnes</Authors>
@@ -17,26 +17,21 @@
     <RepositoryType>git</RepositoryType>
     </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework.Contains(netcoreapp3.1))' == 'true'">
-    <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
+  <ItemGroup>
+    <PackageReference Include="LibGit2Sharp" Version="0.27.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework.Contains(net6.0))' == 'true'">
-    <PackageReference Include="LibGit2Sharp" Version="0.27.0-*" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0-*" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0-*" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0-*" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
   </ItemGroup>
 
-    <!-- Workaround for this bug (replace the analyzer name with the one you need to exclude (filename only, no extension) -->
-    <Target Name="RemoveLoggingAnalyzer" BeforeTargets="CoreCompile">
-      <ItemGroup>
-        <Analyzer Remove="@(Analyzer)" Condition="%(FileName) == 'Microsoft.Extensions.Logging.Generators'" />
-      </ItemGroup>
-    </Target>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
+  </ItemGroup>
 
     <ItemGroup>
       <None Include="../../images/nuget/dotnet-pr/icon.512x512.png" Pack="true" PackagePath="" />
diff --git a/source/source.sln b/source/source.sln
index 628971a..a0c35df 100644
--- a/source/source.sln
+++ b/source/source.sln
@@ -7,6 +7,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-pr", "dotnet-pr\dotn
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-pr.tests", "dotnet-pr.tests\dotnet-pr.tests.csproj", "{C77D5223-41F1-4B4A-BD8D-6F58877D3C4D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{10CBAF56-F382-480E-B8BE-CBF270617AD8}"
+ProjectSection(SolutionItems) = preProject
+	..\CI.yml = ..\.github\workflows\CI.yml
+	..\Release.yml = ..\.github\workflows\Release.yml
+	..\PreRelease.yml = ..\.github\workflows\PreRelease.yml
+EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU