Backed out .net core 5 as needs all the build utils to be rebuilt first

credfeto · Nov 19, 2020 · 9e664fa · 9e664fa
1 parent d30052b
commit 9e664fa
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/src/Credfeto.ChangeLog.Cmd/Credfeto.ChangeLog.Cmd.csproj b/src/Credfeto.ChangeLog.Cmd/Credfeto.ChangeLog.Cmd.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RuntimeIdentifiers>win10-x64;win81-x64;osx.10.12-x64</RuntimeIdentifiers>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <WarningsAsErrors/>

diff --git a/src/Credfeto.ChangeLog.Tests/Credfeto.ChangeLog.Tests.csproj b/src/Credfeto.ChangeLog.Tests/Credfeto.ChangeLog.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <WarningsAsErrors/>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>

diff --git a/src/Credfeto.ChangeLog/ChangeLogChecker.cs b/src/Credfeto.ChangeLog/ChangeLogChecker.cs
@@ -10,8 +10,8 @@ namespace Credfeto.ChangeLog.Management
     public static class ChangeLogChecker
     {
         private static readonly Regex HunkPositionRegex =
-            new(pattern: @"^@@\s*\-(?<OriginalFileStart>\d*)(,(?<OriginalFileEnd>\d*))?\s*\+(?<CurrentFileStart>\d*)(,(?<CurrentFileChangeLength>\d*))?\s*@@",
-                RegexOptions.Compiled | RegexOptions.Multiline);
+            new Regex(pattern: @"^@@\s*\-(?<OriginalFileStart>\d*)(,(?<OriginalFileEnd>\d*))?\s*\+(?<CurrentFileStart>\d*)(,(?<CurrentFileChangeLength>\d*))?\s*@@",
+                      RegexOptions.Compiled | RegexOptions.Multiline);
 
         public static async Task<bool> ChangeLogModifiedInReleaseSectionAsync(string changeLogFileName, string originBranchName)
         {
@@ -58,8 +58,13 @@ public static async Task<bool> ChangeLogModifiedInReleaseSectionAsync(string cha
 
                         MatchCollection matches = HunkPositionRegex.Matches(patchDetails);
 
-                        foreach (Match match in matches)
+                        foreach (Match? match in matches)
                         {
+                            if (match == null)
+                            {
+                                continue;
+                            }
+
                             int changeStart = Convert.ToInt32(match.Groups["CurrentFileStart"]
                                                                    .Value);
 

diff --git a/src/Credfeto.ChangeLog/ChangeLogReader.cs b/src/Credfeto.ChangeLog/ChangeLogReader.cs
@@ -9,8 +9,8 @@ namespace Credfeto.ChangeLog.Management
 {
     public static class ChangeLogReader
     {
-        private static readonly Regex RemoveComments = new(pattern: "<!--[\\s\\S]*?-->", RegexOptions.Compiled | RegexOptions.Multiline);
-        private static readonly Regex VersionHeaderMatch = new(pattern: @"^##\s\[(\d+)", options: RegexOptions.Compiled);
+        private static readonly Regex RemoveComments = new Regex(pattern: "<!--[\\s\\S]*?-->", RegexOptions.Compiled | RegexOptions.Multiline);
+        private static readonly Regex VersionHeaderMatch = new Regex(pattern: @"^##\s\[(\d+)", options: RegexOptions.Compiled);
 
         public static async Task<string> ExtractReleaseNodesFromFileAsync(string changeLogFileName, string version)
         {
@@ -41,7 +41,7 @@ public static string ExtractReleaseNotes(string changeLog, string version)
 
             string previousLine = string.Empty;
 
-            StringBuilder releaseNotes = new();
+            StringBuilder releaseNotes = new StringBuilder();
 
             for (int i = foundStart; i < foundEnd; i++)
             {

diff --git a/src/Credfeto.ChangeLog/Credfeto.ChangeLog.csproj b/src/Credfeto.ChangeLog/Credfeto.ChangeLog.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <WarningsAsErrors/>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>

diff --git a/src/global.json b/src/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.100",
+    "version": "3.1.403",
     "allowPrerelease": false,
     "rollForward": "disable"
   }