Merge pull request #127 from ProfessionalCSharp/main

updates from main

Author: christiannagel

.github/workflows/codeql-analysis.yml

@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     permissions:
       actions: read
       contents: read
@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript' ]
+        language: [ 'javascript', 'csharp' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

1_CS/Arrays/SortingSample/Person.cs

@@ -4,7 +4,7 @@ public record Person(string FirstName, string LastName) : IComparable<Person>
 {
     public int CompareTo(Person? other)
     {
-        if (other == null) throw new ArgumentNullException("other");
+        ArgumentNullException.ThrowIfNull(other);
 
         int result = LastName.CompareTo(other.LastName);
         if (result == 0)

1_CS/Collections/DictionarySample/Employee.cs

@@ -1,4 +1,6 @@
-public record Employee
+namespace DictionarySample;
+
+public record Employee
 {
     private readonly string _name;
     private readonly decimal _salary;

1_CS/Collections/DictionarySample/EmployeeId.cs

@@ -1,4 +1,6 @@
-public class EmployeeIdException : Exception
+namespace DictionarySample;
+
+public class EmployeeIdException : Exception
 {
     public EmployeeIdException(string message) : base(message) { }
 }
@@ -10,7 +12,7 @@ public struct EmployeeId : IEquatable<EmployeeId>
 
     public EmployeeId(string id)
     {
-        if (id == null) throw new ArgumentNullException(nameof(id));
+        ArgumentNullException.ThrowIfNull(id);
 
         _prefix = (id.ToUpper())[0];
         int last = id.Length > 7 ? 7 : id.Length;

1_CS/Collections/DictionarySample/Program.cs

@@ -1,14 +1,16 @@
-EmployeeId idKyle = new("J18");
-Employee kyle = new Employee(idKyle, "Kyle Bush", 138_000.00m );
+using DictionarySample;
+
+EmployeeId idKyle = new("J18");
+Employee kyle = new(idKyle, "Kyle Bush", 138_000.00m );
 
 EmployeeId idMartin = new("J19");
 Employee martin = new(idMartin, "Martin Truex Jr", 73_000.00m);
 
 EmployeeId idKevin = new("S4");
 Employee kevin = new(idKevin, "Kevin Harvick", 116_000.00m);
 
-EmployeeId idDenny = new EmployeeId("J11");
-Employee denny = new Employee(idDenny, "Denny Hamlin", 127_000.00m);
+EmployeeId idDenny = new("J11");
+Employee denny = new(idDenny, "Denny Hamlin", 127_000.00m);
 
 EmployeeId idJoey = new("T22");
 Employee joey = new(idJoey, "Joey Logano", 96_000.00m);

1_CS/Collections/ImmutableCollectionSample/GlobalUsings.cs

@@ -1,4 +1,6 @@
-SimpleArrayDemo();
+using System.Collections.Immutable;
+
+SimpleArrayDemo();
 ImmutableList<Account> accounts = CreateImmutableList();
 UsingABuilder(accounts);
 LinqDemo();

1_CS/Collections/ImmutableCollectionSample/Program.cs

@@ -46,6 +46,9 @@
     Console.WriteLine("object not found in collection");
 }
 
-List<Racer> racers2 = new(new Racer[] {
-               new(12, "Jochen", "Rindt", "Austria", 6),
-               new(22, "Ayrton", "Senna", "Brazil", 41) });
+List<Racer> racers2 = new(
+    new Racer[] 
+    {
+        new(12, "Jochen", "Rindt", "Austria", 6),
+        new(22, "Ayrton", "Senna", "Brazil", 41) 
+    });

1_CS/Collections/ListSamples/Program.cs

@@ -20,6 +20,8 @@ Please check my blog [csharp.christiannagel.com](https://csharp.christiannagel.c
 
 Thank you!
 
-## Updates with C# 10
+## Updates with C# 10 .NET 6
 
-See [Updates with C# 10](../../Dotnet6Updates.md)
+.NET 6 contains a new PriorityQueue class which returns items based on a priority. See the new sample code [PriorityQueueSample](../../5_More/Collections/PriorityQueueSample/).
+
+Also see [Updates with C# 10](../../Dotnet6Updates.md)

1_CS/Collections/Readme.md

@@ -19,28 +19,28 @@ public static class Formula1
         new("Graham", "Hill", "UK", 176, 14, new int[] { 1962, 1968 }, new string[] { "BRM", "Lotus" }),
         new("Jochen", "Rindt", "Austria", 60, 6, new int[] { 1970 }, new string[] { "Lotus" }),
         new("Jackie", "Stewart", "UK", 99, 27, new int[] { 1969, 1971, 1973 }, new string[] { "Matra", "Tyrrell" }),
-        new("Emerson", "Fittipaldi", "Brazil", 143, 14, new int[] { 1972, 1974 }, new string[] { "Lotus", "McLaren" }),
-        new("James", "Hunt", "UK", 91, 10, new int[] { 1976 }, new string[] { "McLaren" }),
+        new("Emerson", "Fittipaldi", "Brazil", 144, 14, new int[] { 1972, 1974 }, new string[] { "Lotus", "McLaren" }),
+        new("James", "Hunt", "UK", 92, 10, new int[] { 1976 }, new string[] { "McLaren" }),
         new("Mario", "Andretti", "USA", 128, 12, new int[] { 1978 }, new string[] { "Lotus" }),
         new("Jody", "Scheckter", "South Africa", 112, 10, new int[] { 1979 }, new string[] { "Ferrari" }),
-        new("Alan", "Jones", "Australia", 115, 12, new int[] { 1980 }, new string[] { "Williams" }),
+        new("Alan", "Jones", "Australia", 116, 12, new int[] { 1980 }, new string[] { "Williams" }),
         new("Keke", "Rosberg", "Finland", 114, 5, new int[] { 1982 }, new string[] { "Williams" }),
-        new("Niki", "Lauda", "Austria", 173, 25, new int[] { 1975, 1977, 1984 }, new string[] { "Ferrari", "McLaren" }),
+        new("Niki", "Lauda", "Austria", 171, 25, new int[] { 1975, 1977, 1984 }, new string[] { "Ferrari", "McLaren" }),
         new("Nelson", "Piquet", "Brazil", 204, 23, new int[] { 1981, 1983, 1987 }, new string[] { "Brabham", "Williams" }),
         new("Ayrton", "Senna", "Brazil", 161, 41, new int[] { 1988, 1990, 1991 }, new string[] { "McLaren" }),
         new("Nigel", "Mansell", "UK", 187, 31, new int[] { 1992 }, new string[] { "Williams" }),
-        new("Alain", "Prost", "France", 197, 51, new int[] { 1985, 1986, 1989, 1993 }, new string[] { "McLaren", "Williams" }),
-        new("Damon", "Hill", "UK", 114, 22, new int[] { 1996 }, new string[] { "Williams" }),
-        new("Jacques", "Villeneuve", "Canada", 165, 11, new int[] { 1997 }, new string[] { "Williams" }),
-        new("Mika", "Hakkinen", "Finland", 160, 20, new int[] { 1998, 1999 }, new string[] { "McLaren" }),
-        new("Michael", "Schumacher", "Germany", 287, 91, new int[] { 1994, 1995, 2000, 2001, 2002, 2003, 2004 }, new string[] { "Benetton", "Ferrari" }),
-        new("Fernando", "Alonso", "Spain", 336, 32, new int[] { 2005, 2006 }, new string[] { "Renault" }),
-        new("Kimi", "Räikkönen", "Finland", 352, 21, new int[] { 2007 }, new string[] { "Ferrari" }),
+        new("Alain", "Prost", "France", 199, 51, new int[] { 1985, 1986, 1989, 1993 }, new string[] { "McLaren", "Williams" }),
+        new("Damon", "Hill", "UK", 115, 22, new int[] { 1996 }, new string[] { "Williams" }),
+        new("Jacques", "Villeneuve", "Canada", 163, 11, new int[] { 1997 }, new string[] { "Williams" }),
+        new("Mika", "Hakkinen", "Finland", 161, 20, new int[] { 1998, 1999 }, new string[] { "McLaren" }),
+        new("Michael", "Schumacher", "Germany", 306, 91, new int[] { 1994, 1995, 2000, 2001, 2002, 2003, 2004 }, new string[] { "Benetton", "Ferrari" }),
+        new("Fernando", "Alonso", "Spain", 347, 32, new int[] { 2005, 2006 }, new string[] { "Renault" }),
+        new("Kimi", "Räikkönen", "Finland", 349, 21, new int[] { 2007 }, new string[] { "Ferrari" }),
         new("Jenson", "Button", "UK", 306, 16, new int[] { 2009 }, new string[] { "Brawn GP" }),
-        new("Sebastian", "Vettel", "Germany", 280, 53, new int[] { 2010, 2011, 2012, 2013 }, new string[] { "Red Bull Racing" }),
-        new("Nico", "Rosberg", "Germany", 207, 24, new int[] { 2016 }, new string[] { "Mercedes" }),
-        new("Lewis", "Hamilton", "UK", 288, 103, new int[] { 2008, 2014, 2015, 2017, 2018, 2019, 2020 }, new string[] { "McLaren", "Mercedes" }),
-        new("Max", "Verstappen", "Netherlands", 141, 20, new int[] { 2021 }, new string[] { "Red Bull Racing" })
+        new("Sebastian", "Vettel", "Germany", 291, 53, new int[] { 2010, 2011, 2012, 2013 }, new string[] { "Red Bull Racing" }),
+        new("Nico", "Rosberg", "Germany", 206, 24, new int[] { 2016 }, new string[] { "Mercedes" }),
+        new("Lewis", "Hamilton", "UK", 302, 103, new int[] { 2008, 2014, 2015, 2017, 2018, 2019, 2020 }, new string[] { "McLaren", "Mercedes" }),
+        new("Max", "Verstappen", "Netherlands", 155, 29, new int[] { 2021 }, new string[] { "Red Bull Racing" })
     };
 
     private static List<Team>? s_teams;
@@ -169,12 +169,12 @@ public static class Formula1
         new Racer("Riccardo", "Patrese", "Italy", Starts: 256, Wins: 6),
         new Racer("David", "Coulthard", "UK", Starts: 246, Wins: 13),
         new Racer("Heinz-Harald", "Frentzen", "Germany", Starts: 156, Wins: 3),
-        new Racer("Eddie", "Irvine", "UK", Starts: 147, Wins: 4),
+        new Racer("Eddie", "Irvine", "UK", Starts: 145, Wins: 4),
         new Racer("Rubens", "Barrichello", "Brazil", Starts: 322, Wins: 11),
         new Racer("Juan Pablo", "Montoya", "Columbia", Starts: 94, Wins: 7),
         new Racer("Felipe", "Massa", "Brazil", Starts: 269, Wins: 11),
         new Racer("Mark", "Webber", "Australia", Starts: 215, Wins: 9),
-        new Racer("Daniel", "Ricciardo", "Australia", Starts: 210, Wins: 8),
-        new Racer("Valtteri", "Bottas", "Finland", Starts: 178, Wins: 10)
+        new Racer("Daniel", "Ricciardo", "Australia", Starts: 224, Wins: 8),
+        new Racer("Valtteri", "Bottas", "Finland", Starts: 192, Wins: 10)
     };
 }