Add support for .NET 6 (#81)

* Enable implicit usings * Add support for .NET 6 Fix nullable errors, which is on by default in .NET 6 * Setup .NET 5 in Windows for sonar tool * Add emoji to release commit.
eduherminio · Nov 19, 2021 · 5b380e8 · 5b380e8
1 parent 0f31b8d
commit 5b380e8
Show file tree

Hide file tree

Showing 21 changed files with 62 additions and 92 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 executors:
   fileparser-executor:
     docker:
-      - image: mcr.microsoft.com/dotnet/sdk:5.0
+      - image: mcr.microsoft.com/dotnet/sdk:6.0
     working_directory: ~/FileParser
 
 jobs:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,13 @@ jobs:
     - name: Inject slug/short variables
       uses: rlespinasse/[email protected]
 
-    - name: Setup .NET Core
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+
+    - name: Setup .NET 5 for sonar
+      if: matrix.os == 'windows-latest'
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.x

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Release
+name: Release
 
 on:
   workflow_dispatch:
@@ -51,7 +51,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
 
     - name: Set version to ${{ github.event.inputs.new_package_version }}
       shell: pwsh
@@ -118,7 +118,7 @@ jobs:
       run: |
         git switch ${{ env.GITHUB_REF_SLUG }}
         git status
-        git commit -am "Release v${{ github.event.inputs.new_package_version }}"
+        git commit -am "🚀 Release v${{ github.event.inputs.new_package_version }}"
         git push
 
     - name: Create git tag

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,17 +1,18 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Nullable>Enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-    <PropertyGroup Condition="'$(DeterministicBuild)' == 'true'">
+  <PropertyGroup Condition="'$(DeterministicBuild)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -9,7 +9,7 @@ schedules:
     - main
 
 variables:
-  SdkVersion: '5.0.x'
+  SdkVersion: '6.0.x'
 
 stages:
 - stage: CI

diff --git a/src/FileParser/Implementations/ParsedFile.cs b/src/FileParser/Implementations/ParsedFile.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
+using System.Text;
 using Print = System.Diagnostics.Debug;
 
 namespace FileParser
@@ -75,7 +71,7 @@ public IParsedLine LastLine()
 
         public List<T> ToList<T>(string? lineSeparatorToAdd = null)
         {
-            List<T> list = new List<T>();
+            List<T> list = new();
 
             if (!string.IsNullOrEmpty(lineSeparatorToAdd))
             {
@@ -95,7 +91,7 @@ public List<T> ToList<T>(string? lineSeparatorToAdd = null)
 
         public string ToSingleString(string wordSeparator = " ", string? lineSeparator = null)
         {
-            StringBuilder stringBuilder = new StringBuilder();
+            StringBuilder stringBuilder = new();
 
             while (!Empty)
             {
@@ -140,11 +136,11 @@ public static List<List<string>> ReadAllGroupsOfLines(string path)
         /// <returns></returns>
         public static Queue<IParsedLine> ParseFile(string path, string? existingSeparator = null)
         {
-            Queue<IParsedLine> parsedFile = new Queue<IParsedLine>();
+            Queue<IParsedLine> parsedFile = new();
 
             try
             {
-                using (StreamReader reader = new StreamReader(path))
+                using (StreamReader reader = new(path))
                 {
                     while (!reader.EndOfStream)
                     {

diff --git a/src/FileParser/Implementations/ParsedLine.cs b/src/FileParser/Implementations/ParsedLine.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Text;
 
 namespace FileParser
 {
@@ -64,7 +61,7 @@ public T LastElement<T>()
 
         public List<T> ToList<T>()
         {
-            List<T> list = new List<T>();
+            List<T> list = new();
 
             while (!Empty)
             {
@@ -76,7 +73,7 @@ public List<T> ToList<T>()
 
         public string ToSingleString(string wordSeparator = " ")
         {
-            StringBuilder stringBuilder = new StringBuilder();
+            StringBuilder stringBuilder = new();
 
             while (!Empty)
             {

diff --git a/src/FileParser/Interfaces/IParsedFile.cs b/src/FileParser/Interfaces/IParsedFile.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace FileParser
+namespace FileParser
 {
     public interface IParsedFile
     {

diff --git a/src/FileParser/Interfaces/IParsedLine.cs b/src/FileParser/Interfaces/IParsedLine.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace FileParser
+namespace FileParser
 {
     public interface IParsedLine
     {

diff --git a/src/FileParser/ParsingException.cs b/src/FileParser/ParsingException.cs
@@ -1,22 +1,21 @@
-using System;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 
 namespace FileParser
 {
     [Serializable]
     public class ParsingException : Exception
     {
-        private const string _genericMessage = "Exception triggered during parsing process";
+        private const string GenericMessage = "Exception triggered during parsing process";
 
-        public ParsingException() : base(_genericMessage)
+        public ParsingException() : base(GenericMessage)
         {
         }
 
-        public ParsingException(string message) : base(message ?? _genericMessage)
+        public ParsingException(string message) : base(message ?? GenericMessage)
         {
         }
 
-        public ParsingException(string message, Exception inner) : base(message ?? _genericMessage, inner)
+        public ParsingException(string message, Exception inner) : base(message ?? GenericMessage, inner)
         {
         }
 

diff --git a/src/FileParser/Utils/StringConverter.cs b/src/FileParser/Utils/StringConverter.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 
 namespace FileParser
 {

diff --git a/src/FileParser/Utils/TConverter.cs b/src/FileParser/Utils/TConverter.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Globalization;
-using System.Linq;
 
 namespace FileParser
 {
@@ -19,7 +16,7 @@ internal static T ChangeType<T>(object value, TypeConverter? typeConverter = nul
         {
             return typeConverter is null
                     ? (T)ChangeType(typeof(T), value)
-                    : (T)typeConverter.ConvertFrom(value);
+                    : (T)typeConverter.ConvertFrom(value)!;
         }
 
         private static object ChangeType(Type t, object value)
@@ -32,15 +29,15 @@ private static object ChangeType(Type t, object value)
             {
                 TypeConverter tc = TypeDescriptor.GetConverter(t);
 
-                return tc.ConvertFrom(value);
+                return tc.ConvertFrom(value)!;
             }
         }
 
         private static object ParseDouble(object value)
         {
             double result;
 
-            string doubleAsString = value.ToString() ?? throw new ParsingException($"Error parsing value as double");
+            string doubleAsString = value.ToString() ?? throw new ParsingException("Error parsing value as double");
             IEnumerable<char> doubleAsCharList = doubleAsString.ToList();
 
             if (doubleAsCharList.Count(ch => ch == '.' || ch == ',') <= 1)

diff --git a/tests/FileParser.Test/ExceptionTests.cs b/tests/FileParser.Test/ExceptionTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Xunit;
+using Xunit;
 
 namespace FileParser.Test
 {
@@ -40,10 +37,8 @@ public void IOException()
         {
             const string fileName = "Any.txt";
 
-            using (StreamWriter writer = new StreamWriter(fileName))
-            {
-                Assert.Throws<IOException>(() => new ParsedFile(fileName));
-            }
+            using StreamWriter writer = new(fileName);
+            Assert.Throws<IOException>(() => new ParsedFile(fileName));
         }
 
         [Fact]
@@ -74,8 +69,8 @@ public void ParsingException()
 
             Assert.Throws<ParsingException>(() => line.NextElement<object>());
 
-            Queue<string> testQueue = new Queue<string>(new string[] { string.Empty });
-            ParsedLine testLine = new ParsedLine(testQueue);
+            Queue<string> testQueue = new(new string[] { string.Empty });
+            ParsedLine testLine = new(testQueue);
             Assert.Throws<ParsingException>(() => testLine.NextElement<char>());
         }
     }

diff --git a/tests/FileParser.Test/ParsedFileTest/ExtractTests.cs b/tests/FileParser.Test/ParsedFileTest/ExtractTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
+using System.Text;
 using Xunit;
 
 namespace FileParser.Test.ParsedFileTest
@@ -14,10 +11,10 @@ public void CustomLineParse()
             const string fileName = "CustomLineParse.txt";
             const string sampleContent = "  3  1154 508 100    vegetable ";
 
-            List<long> expectedList = new List<long>() { 1154, 508, 100 };
+            List<long> expectedList = new() { 1154, 508, 100 };
             const string expectedString = "vegetable";
 
-            using (StreamWriter writer = new StreamWriter(fileName))
+            using (StreamWriter writer = new(fileName))
             {
                 writer.WriteLine(sampleContent);
             }
@@ -48,9 +45,9 @@ public void ExtractChar()
             const string line1 = "+-*/!?#$%&";
             const string line2 = "@()[]{}\"";
 
-            StringBuilder parsedFile = new StringBuilder(string.Empty);
+            StringBuilder parsedFile = new(string.Empty);
 
-            using (StreamWriter writer = new StreamWriter(fileName))
+            using (StreamWriter writer = new(fileName))
             {
                 writer.WriteLine(Math.PI.ToString());
                 writer.WriteLine(line1);

diff --git a/tests/FileParser.Test/ParsedFileTest/GeneralTests.cs b/tests/FileParser.Test/ParsedFileTest/GeneralTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Xunit;
+using Xunit;
 
 namespace FileParser.Test.ParsedFileTest
 {
@@ -17,8 +14,8 @@ public void BasicTest()
             // Following lines firstly indicate how many numeric elements are following.
             // After those numeric elements, they include an unknown number of items.
 
-            List<int> numberList = new List<int>();
-            List<string> stringList = new List<string>();
+            List<int> numberList = new();
+            List<string> stringList = new();
 
             IParsedFile file = new ParsedFile(_sampleFolderPath + "Sample_file.txt");
 
@@ -85,8 +82,8 @@ public void PeekTestEmptyingFile()
 
             while (!file.Empty)
             {
-                List<int> peekedNumberList = new List<int>();
-                List<string> peekedStringList = new List<string>();
+                List<int> peekedNumberList = new();
+                List<string> peekedStringList = new();
 
                 IParsedLine peekedLine = file.PeekNextLine();
                 int peekedCounter = peekedLine.PeekNextElement<int>();

diff --git a/tests/FileParser.Test/ParsedFileTest/ReadAllGroupsOfLinesTests.cs b/tests/FileParser.Test/ParsedFileTest/ReadAllGroupsOfLinesTests.cs
@@ -1,6 +1,4 @@
-using System.IO;
-using System.Linq;
-using Xunit;
+using Xunit;
 
 namespace FileParser.Test.ParsedFileTest
 {