Merge pull request #103 from CodebreakerApp/102-analyzer-dotnet8

christiannagel · web-flow · commit 8d7fef3350f8 · 2023-12-09T16:51:08.000+01:00
update analyzer package to .net 8
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Analyzers/ColorGame6x4AnalyzerTests.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Analyzers/ColorGame6x4AnalyzerTests.cs
@@ -11,8 +11,8 @@ public void SetMoveShouldReturnThreeWhite()
     {
         ColorResult expectedKeyPegs = new(0, 3);
         ColorResult? resultKeyPegs = TestSkeleton(
-            new[] { Green, Yellow, Green, Black },
-            new[] { Yellow, Green, Black, Blue }
+            [Green, Yellow, Green, Black],
+            [Yellow, Green, Black, Blue]
         );
 
         Assert.Equal(expectedKeyPegs, resultKeyPegs);
@@ -23,7 +23,7 @@ public void SetMoveShouldReturnThreeWhite()
     [Theory]
     public void SetMoveUsingVariousData(int expectedBlack, int expectedWhite, params string[] guessValues)
     {
-        string[] code = new[] { Red, Green, Blue, Red };
+        string[] code = [Red, Green, Blue, Red];
         ColorResult expectedKeyPegs = new (expectedBlack, expectedWhite);
         ColorResult resultKeyPegs = TestSkeleton(code, guessValues);
         Assert.Equal(expectedKeyPegs, resultKeyPegs);
@@ -42,8 +42,8 @@ public void ShouldThrowOnInvalidGuessCount()
     {
         Assert.Throws<ArgumentException>(() => 
             TestSkeleton(
-                new[] { "Black", "Black", "Black", "Black" },
-                new[] { "Black" }
+                ["Black", "Black", "Black", "Black"],
+                ["Black"]
             ));
     }
 
@@ -52,8 +52,8 @@ public void ShouldThrowOnInvalidGuessValues()
     {
         Assert.Throws<ArgumentException>(() => 
             TestSkeleton(
-                new[] { "Black", "Black", "Black", "Black" },
-                new[] { "Black", "Der", "Blue", "Yellow" }      // "Der" is the wrong value
+                ["Black", "Black", "Black", "Black"],
+                ["Black", "Der", "Blue", "Yellow"]      // "Der" is the wrong value
             ));
     }
 
@@ -62,8 +62,8 @@ public void ShouldThrowOnInvalidMoveNumber()
     {
         Assert.Throws<ArgumentException>(() => 
             TestSkeleton(
-                new[] { Green, Yellow, Green, Black },
-                new[] { Yellow, Green, Black, Blue }, moveNumber: 2));
+                [Green, Yellow, Green, Black],
+                [Yellow, Green, Black, Blue], moveNumber: 2));
     }
 
     private static ColorResult TestSkeleton(string[] codes, string[] guesses, int moveNumber = 1)
@@ -88,7 +88,7 @@ private static ColorResult TestSkeleton(string[] codes, string[] guesses, int mo
 
 public class TestData6x4 : IEnumerable<object[]>
 {
-    public static readonly string[] Colors6 = { Red, Green, Blue, Yellow, Black, White };
+    public static readonly string[] Colors6 = [Red, Green, Blue, Yellow, Black, White];
 
     public IEnumerator<object[]> GetEnumerator()
     {
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Analyzers/ColorGame8x5AnalyzerTests.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Analyzers/ColorGame8x5AnalyzerTests.cs
@@ -13,8 +13,8 @@ public void SetMoveShouldReturnThreeWhite()
     {
         ColorResult expectedKeyPegs = new(0, 3);
         ColorResult? resultKeyPegs = TestSkeleton(
-            new[] { Green, Yellow, Green, Black, Orange },
-            new[] { Yellow, Green, Black, Blue, Blue }
+            [Green, Yellow, Green, Black, Orange],
+            [Yellow, Green, Black, Blue, Blue]
         );
 
         Assert.Equal(expectedKeyPegs, resultKeyPegs);
@@ -25,7 +25,7 @@ public void SetMoveShouldReturnThreeWhite()
     [Theory]
     public void SetMoveUsingVariousData(int expectedBlack, int expectedWhite, params string[] guessValues)
     {
-        string[] code = new[] { Red, Green, Blue, Red, Brown };
+        string[] code = [Red, Green, Blue, Red, Brown];
         ColorResult expectedKeyPegs = new (expectedBlack, expectedWhite);
         ColorResult resultKeyPegs = TestSkeleton(code, guessValues);
         Assert.Equal(expectedKeyPegs, resultKeyPegs);
@@ -44,8 +44,8 @@ public void ShouldThrowOnInvalidGuessCount()
     {
         Assert.Throws<ArgumentException>(() => 
             TestSkeleton(
-                new[] { "Black", "Black", "Black", "Black", "Black" },
-                new[] { "Black" }
+                ["Black", "Black", "Black", "Black", "Black"],
+                ["Black"]
             ));
     }
 
@@ -54,8 +54,8 @@ public void ShouldThrowOnInvalidGuessValues()
     {
         Assert.Throws<ArgumentException>(() => 
             TestSkeleton(
-                new[] { "Black", "Black", "Black", "Black", "Black" },
-                new[] { "Black", "Der", "Blue", "Yellow", "Black" }      // "Der" is the wrong value
+                ["Black", "Black", "Black", "Black", "Black"],
+                ["Black", "Der", "Blue", "Yellow", "Black"]      // "Der" is the wrong value
             ));
     }
 
@@ -81,7 +81,7 @@ private static ColorResult TestSkeleton(string[] codes, string[] guesses)
 
 public class TestData8x5 : IEnumerable<object[]>
 {
-    public static readonly string[] Colors8 = new string[] { Red, Blue, Green, Yellow, Black, White, Purple, Orange };
+    public static readonly string[] Colors8 = [Red, Blue, Green, Yellow, Black, White, Purple, Orange];
 
     public IEnumerator<object[]> GetEnumerator()
     {
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Analyzers/ShapeGame5x5x4AnalyzerTests.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Analyzers/ShapeGame5x5x4AnalyzerTests.cs
@@ -15,8 +15,8 @@ public void SetMoveShouldReturnThreeBlue()
     {
         ShapeAndColorResult expectedKeyPegs = new(0, 3, 0);
         ShapeAndColorResult? resultKeyPegs = TestSkeleton(
-            new string[] { "Rectangle;Green", "Circle;Yellow", "Rectangle;Green", "Star;Blue"},
-            new string[] {"Circle;Yellow", "Rectangle;Green", "Star;Blue", "Square;Purple"}
+            ["Rectangle;Green", "Circle;Yellow", "Rectangle;Green", "Star;Blue"],
+            ["Circle;Yellow", "Rectangle;Green", "Star;Blue", "Square;Purple"]
         );
 
         Assert.Equal(expectedKeyPegs, resultKeyPegs);
@@ -88,8 +88,8 @@ private static ShapeAndColorResult TestSkeleton(string[] codes, string[] guesses
 
 public class TestData5x5x4 : IEnumerable<object[]>
 {
-    public static readonly string[] Colors5 = { Red, Green, Blue, Yellow, Purple };
-    public static readonly string[] Shapes5 = { Circle, Square, Triangle, Star, Rectangle };
+    public static readonly string[] Colors5 = [Red, Green, Blue, Yellow, Purple];
+    public static readonly string[] Shapes5 = [Circle, Square, Triangle, Star, Rectangle];
 
     public IEnumerator<object[]> GetEnumerator()
     {
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Codebreaker.GameAPIs.Analyzers.Tests.csproj b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Codebreaker.GameAPIs.Analyzers.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
     <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="xunit" Version="2.5.1" />
+    <PackageReference Include="xunit" Version="2.6.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -28,8 +28,4 @@
     <ProjectReference Include="..\Codebreaker.GameAPIs.Analyzers\Codebreaker.Analyzers.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Fields\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Results/SimpleColorResultTests.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Results/SimpleColorResultTests.cs
@@ -5,7 +5,7 @@ public class SimpleColorResultTests
     [Fact]
     public void ToStringShouldReturnFormat()
     {
-        ResultValue[] values = { ResultValue.CorrectColor, ResultValue.CorrectPositionAndColor, ResultValue.Incorrect, ResultValue.Incorrect };
+        ResultValue[] values = [ResultValue.CorrectColor, ResultValue.CorrectPositionAndColor, ResultValue.Incorrect, ResultValue.Incorrect];
         SimpleColorResult result = new(values);
         string actual = result.ToString();
         Assert.Equal("1:2:0:0", actual);
@@ -14,7 +14,7 @@ public void ToStringShouldReturnFormat()
     [Fact]
     public void ParseShouldReturnColorResult()
     {
-        ResultValue[] values = { ResultValue.CorrectColor, ResultValue.CorrectPositionAndColor, ResultValue.Incorrect, ResultValue.Incorrect };
+        ResultValue[] values = [ResultValue.CorrectColor, ResultValue.CorrectPositionAndColor, ResultValue.Incorrect, ResultValue.Incorrect];
         SimpleColorResult expected = new(values);
         var actual = SimpleColorResult.Parse("1:2:0:0");
         Assert.Equal(expected, actual);
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers/Codebreaker.Analyzers.csproj b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers/Codebreaker.Analyzers.csproj
@@ -5,7 +5,7 @@
     <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <LangVersion>preview</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <PackageTags>
       Codebreaker;CNinnovation;GameAnalyzers;
     </PackageTags>

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ public void SetMoveShouldReturnThreeWhite()`
`11`	`11`	`{`
`12`	`12`	`ColorResult expectedKeyPegs = new(0, 3);`
`13`	`13`	`ColorResult? resultKeyPegs = TestSkeleton(`
`14`		`- new[] { Green, Yellow, Green, Black },`
`15`		`- new[] { Yellow, Green, Black, Blue }`
	`14`	`+ [Green, Yellow, Green, Black],`
	`15`	`+ [Yellow, Green, Black, Blue]`
`16`	`16`	`);`
`17`	`17`
`18`	`18`	`Assert.Equal(expectedKeyPegs, resultKeyPegs);`
`@@ -23,7 +23,7 @@ public void SetMoveShouldReturnThreeWhite()`
`23`	`23`	`[Theory]`
`24`	`24`	`public void SetMoveUsingVariousData(int expectedBlack, int expectedWhite, params string[] guessValues)`
`25`	`25`	`{`
`26`		`- string[] code = new[] { Red, Green, Blue, Red };`
	`26`	`+ string[] code = [Red, Green, Blue, Red];`
`27`	`27`	`ColorResult expectedKeyPegs = new (expectedBlack, expectedWhite);`
`28`	`28`	`ColorResult resultKeyPegs = TestSkeleton(code, guessValues);`
`29`	`29`	`Assert.Equal(expectedKeyPegs, resultKeyPegs);`
`@@ -42,8 +42,8 @@ public void ShouldThrowOnInvalidGuessCount()`
`42`	`42`	`{`
`43`	`43`	`Assert.Throws<ArgumentException>(() =>`
`44`	`44`	`TestSkeleton(`
`45`		`- new[] { "Black", "Black", "Black", "Black" },`
`46`		`- new[] { "Black" }`
	`45`	`+ ["Black", "Black", "Black", "Black"],`
	`46`	`+ ["Black"]`
`47`	`47`	`));`
`48`	`48`	`}`
`49`	`49`
`@@ -52,8 +52,8 @@ public void ShouldThrowOnInvalidGuessValues()`
`52`	`52`	`{`
`53`	`53`	`Assert.Throws<ArgumentException>(() =>`
`54`	`54`	`TestSkeleton(`
`55`		`- new[] { "Black", "Black", "Black", "Black" },`
`56`		`- new[] { "Black", "Der", "Blue", "Yellow" } // "Der" is the wrong value`
	`55`	`+ ["Black", "Black", "Black", "Black"],`
	`56`	`+ ["Black", "Der", "Blue", "Yellow"] // "Der" is the wrong value`
`57`	`57`	`));`
`58`	`58`	`}`
`59`	`59`
`@@ -62,8 +62,8 @@ public void ShouldThrowOnInvalidMoveNumber()`
`62`	`62`	`{`
`63`	`63`	`Assert.Throws<ArgumentException>(() =>`
`64`	`64`	`TestSkeleton(`
`65`		`- new[] { Green, Yellow, Green, Black },`
`66`		`- new[] { Yellow, Green, Black, Blue }, moveNumber: 2));`
	`65`	`+ [Green, Yellow, Green, Black],`
	`66`	`+ [Yellow, Green, Black, Blue], moveNumber: 2));`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`private static ColorResult TestSkeleton(string[] codes, string[] guesses, int moveNumber = 1)`
`@@ -88,7 +88,7 @@ private static ColorResult TestSkeleton(string[] codes, string[] guesses, int mo`
`88`	`88`
`89`	`89`	`public class TestData6x4 : IEnumerable<object[]>`
`90`	`90`	`{`
`91`		`- public static readonly string[] Colors6 = { Red, Green, Blue, Yellow, Black, White };`
	`91`	`+ public static readonly string[] Colors6 = [Red, Green, Blue, Yellow, Black, White];`
`92`	`92`
`93`	`93`	`public IEnumerator<object[]> GetEnumerator()`
`94`	`94`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ public void SetMoveShouldReturnThreeWhite()`
`13`	`13`	`{`
`14`	`14`	`ColorResult expectedKeyPegs = new(0, 3);`
`15`	`15`	`ColorResult? resultKeyPegs = TestSkeleton(`
`16`		`- new[] { Green, Yellow, Green, Black, Orange },`
`17`		`- new[] { Yellow, Green, Black, Blue, Blue }`
	`16`	`+ [Green, Yellow, Green, Black, Orange],`
	`17`	`+ [Yellow, Green, Black, Blue, Blue]`
`18`	`18`	`);`
`19`	`19`
`20`	`20`	`Assert.Equal(expectedKeyPegs, resultKeyPegs);`
`@@ -25,7 +25,7 @@ public void SetMoveShouldReturnThreeWhite()`
`25`	`25`	`[Theory]`
`26`	`26`	`public void SetMoveUsingVariousData(int expectedBlack, int expectedWhite, params string[] guessValues)`
`27`	`27`	`{`
`28`		`- string[] code = new[] { Red, Green, Blue, Red, Brown };`
	`28`	`+ string[] code = [Red, Green, Blue, Red, Brown];`
`29`	`29`	`ColorResult expectedKeyPegs = new (expectedBlack, expectedWhite);`
`30`	`30`	`ColorResult resultKeyPegs = TestSkeleton(code, guessValues);`
`31`	`31`	`Assert.Equal(expectedKeyPegs, resultKeyPegs);`
`@@ -44,8 +44,8 @@ public void ShouldThrowOnInvalidGuessCount()`
`44`	`44`	`{`
`45`	`45`	`Assert.Throws<ArgumentException>(() =>`
`46`	`46`	`TestSkeleton(`
`47`		`- new[] { "Black", "Black", "Black", "Black", "Black" },`
`48`		`- new[] { "Black" }`
	`47`	`+ ["Black", "Black", "Black", "Black", "Black"],`
	`48`	`+ ["Black"]`
`49`	`49`	`));`
`50`	`50`	`}`
`51`	`51`
`@@ -54,8 +54,8 @@ public void ShouldThrowOnInvalidGuessValues()`
`54`	`54`	`{`
`55`	`55`	`Assert.Throws<ArgumentException>(() =>`
`56`	`56`	`TestSkeleton(`
`57`		`- new[] { "Black", "Black", "Black", "Black", "Black" },`
`58`		`- new[] { "Black", "Der", "Blue", "Yellow", "Black" } // "Der" is the wrong value`
	`57`	`+ ["Black", "Black", "Black", "Black", "Black"],`
	`58`	`+ ["Black", "Der", "Blue", "Yellow", "Black"] // "Der" is the wrong value`
`59`	`59`	`));`
`60`	`60`	`}`
`61`	`61`
`@@ -81,7 +81,7 @@ private static ColorResult TestSkeleton(string[] codes, string[] guesses)`
`81`	`81`
`82`	`82`	`public class TestData8x5 : IEnumerable<object[]>`
`83`	`83`	`{`
`84`		`- public static readonly string[] Colors8 = new string[] { Red, Blue, Green, Yellow, Black, White, Purple, Orange };`
	`84`	`+ public static readonly string[] Colors8 = [Red, Blue, Green, Yellow, Black, White, Purple, Orange];`
`85`	`85`
`86`	`86`	`public IEnumerator<object[]> GetEnumerator()`
`87`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ public void SetMoveShouldReturnThreeBlue()`
`15`	`15`	`{`
`16`	`16`	`ShapeAndColorResult expectedKeyPegs = new(0, 3, 0);`
`17`	`17`	`ShapeAndColorResult? resultKeyPegs = TestSkeleton(`
`18`		`- new string[] { "Rectangle;Green", "Circle;Yellow", "Rectangle;Green", "Star;Blue"},`
`19`		`- new string[] {"Circle;Yellow", "Rectangle;Green", "Star;Blue", "Square;Purple"}`
	`18`	`+ ["Rectangle;Green", "Circle;Yellow", "Rectangle;Green", "Star;Blue"],`
	`19`	`+ ["Circle;Yellow", "Rectangle;Green", "Star;Blue", "Square;Purple"]`
`20`	`20`	`);`
`21`	`21`
`22`	`22`	`Assert.Equal(expectedKeyPegs, resultKeyPegs);`
`@@ -88,8 +88,8 @@ private static ShapeAndColorResult TestSkeleton(string[] codes, string[] guesses`
`88`	`88`
`89`	`89`	`public class TestData5x5x4 : IEnumerable<object[]>`
`90`	`90`	`{`
`91`		`- public static readonly string[] Colors5 = { Red, Green, Blue, Yellow, Purple };`
`92`		`- public static readonly string[] Shapes5 = { Circle, Square, Triangle, Star, Rectangle };`
	`91`	`+ public static readonly string[] Colors5 = [Red, Green, Blue, Yellow, Purple];`
	`92`	`+ public static readonly string[] Shapes5 = [Circle, Square, Triangle, Star, Rectangle];`
`93`	`93`
`94`	`94`	`public IEnumerator<object[]> GetEnumerator()`
`95`	`95`	`{`