Merge pull request #88 from ProfessionalCSharp/dotnet6

.NET 6 and C# 10 updates

Author: christiannagel

1_CS/Arrays/.vscode/launch.json

@@ -2,8 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <PropertyGroup>

1_CS/Arrays/.vscode/tasks.json

@@ -0,0 +1 @@
+global using System.Buffers;

1_CS/Arrays/ArrayPoolSample/ArrayPoolSample.csproj

@@ -1,7 +1,4 @@
-using System;
-using System.Buffers;
-
-for (int i = 0; i < 10; i++)
+for (int i = 0; i < 10; i++)
 {
     int arrayLength = (i + 1) << 10;
     int[] arr = ArrayPool<int>.Shared.Rent(arrayLength);

1_CS/Arrays/ArrayPoolSample/GlobalUsings.cs

@@ -1,7 +1,4 @@
-using System.Collections;
-using System.Text;
-
-public static class BitArrayExtensions
+public static class BitArrayExtensions
 {
     public static string FormatString(this BitArray bits)
     {

1_CS/Arrays/ArrayPoolSample/Program.cs

@@ -2,8 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
 </Project>

1_CS/Arrays/BitArraySample/BitArrayExtensions.cs

@@ -0,0 +1,2 @@
+global using System.Collections;
+global using System.Text;

1_CS/Arrays/BitArraySample/BitArraySample.csproj

@@ -1,7 +1,4 @@
-using System;
-using System.Collections;
-
-BitArray bits1 = new(9);
+BitArray bits1 = new(9);
 bits1.SetAll(true);
 bits1.Set(1, false);
 bits1[5] = false;

1_CS/Arrays/BitArraySample/GlobalUsings.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-
-public static class BinaryExtensions
+public static class BinaryExtensions
 {
     public static string AddSeparators(this string number) =>
         number.Length <= 4 ? number :

1_CS/Arrays/BitArraySample/Program.cs

@@ -2,8 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>

1_CS/Arrays/BitVectorSample/BinaryExtensions.cs

@@ -0,0 +1 @@
+global using System.Collections.Specialized;

1_CS/Arrays/BitVectorSample/BitVectorSample.csproj

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Specialized;
-
-// create a mask using the CreateMask method
+// create a mask using the CreateMask method
 BitVector32 bits1 = new();
 int bit1 = BitVector32.CreateMask();
 int bit2 = BitVector32.CreateMask(bit1);

1_CS/Arrays/BitVectorSample/GlobalUsings.cs

@@ -2,8 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
 </Project>

1_CS/Arrays/BitVectorSample/Program.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-
-public class MyCollection
+public class MyCollection
 {
     private int[] _array = Enumerable.Range(1, 100).ToArray();
 

1_CS/Arrays/IndicesAndRanges/IndicesAndRanges.csproj

@@ -1,6 +1,4 @@
-using System;
-
-int[] data = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+int[] data = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
 // indices and the hat operator
 
@@ -54,6 +52,3 @@ void ShowRange(string title, int[] data)
 int n = coll[^20];
 Console.WriteLine($"Item from the collection: {n}");
 ShowRange("Using custom collection", coll[45..^40]);
-
-
-

1_CS/Arrays/IndicesAndRanges/MyCollection.cs

@@ -16,4 +16,8 @@ For code comments and issues please check [Professional C#'s GitHub Repository](
 
 Please check my blog [csharp.christiannagel.com](https://csharp.christiannagel.com "csharp.christiannagel.com") for additional information for topics covered in the book.
 
-Thank you!
+Thank you!
+
+## Updates with C# 10
+
+See [Updates with C# 10](../../Dotnet6Updates.md)

1_CS/Arrays/IndicesAndRanges/Program.cs

@@ -1,6 +1,4 @@
-using System;
-
-SimpleArrays();
+SimpleArrays();
 TwoDim();
 ThreeDim();
 Jagged();
@@ -10,10 +8,11 @@
 
 void CopyArrays()
 {
-    Person[] beatles = {
-                     new ("John", "Lennon"),
-                     new ("Paul", "McCartney")
-                   };
+    Person[] beatles = 
+        {
+            new ("John", "Lennon"),
+            new ("Paul", "McCartney")
+        };
 
     Person[] beatlesClone = (Person[])beatles.Clone();
 }

1_CS/Arrays/Readme.md

@@ -2,8 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
 </Project>

1_CS/Arrays/SimpleArrays/Program.cs

@@ -1,22 +1,19 @@
-using System;
+namespace Wrox.ProCSharp.Arrays;
 
-namespace Wrox.ProCSharp.Arrays
+public record Person(string FirstName, string LastName) : IComparable<Person>
 {
-    public record Person(string FirstName, string LastName) : IComparable<Person>
+    public int CompareTo(Person? other)
     {
-        public int CompareTo(Person? other)
-        {
-            if (other == null) throw new ArgumentNullException("other");
-
-            int result = LastName.CompareTo(other.LastName);
-            if (result == 0)
-            {
-                result = FirstName.CompareTo(other.FirstName);
-            }
+        if (other == null) throw new ArgumentNullException("other");
 
-            return result;
+        int result = LastName.CompareTo(other.LastName);
+        if (result == 0)
+        {
+            result = FirstName.CompareTo(other.FirstName);
         }
 
-        public override string ToString() => $"{FirstName} {LastName}";
+        return result;
     }
+
+    public override string ToString() => $"{FirstName} {LastName}";
 }

1_CS/Arrays/SimpleArrays/SimpleArrays.csproj

@@ -1,36 +1,31 @@
-using System;
-using System.Collections.Generic;
+namespace Wrox.ProCSharp.Arrays;
+public enum PersonCompareType
+{
+    FirstName,
+    LastName
+}
 
-namespace Wrox.ProCSharp.Arrays
+public class PersonComparer : IComparer<Person>
 {
-    public enum PersonCompareType
-    {
-        FirstName,
-        LastName
-    }
+    private PersonCompareType _compareType;
 
-    public class PersonComparer : IComparer<Person>
-    {
-        private PersonCompareType _compareType;
+    public PersonComparer(PersonCompareType compareType) =>
+        _compareType = compareType;
 
-        public PersonComparer(PersonCompareType compareType) => 
-            _compareType = compareType;
+    #region IComparer<Person> Members
+    public int Compare(Person? x, Person? y)
+    {
+        if (x is null && y is null) return 0;
+        if (x is null) return 1;
+        if (y is null) return -1;
 
-        #region IComparer<Person> Members
-        public int Compare(Person? x, Person? y)
+        return _compareType switch
         {
-            if (x is null && y is null) return 0;
-            if (x is null) return 1;
-            if (y is null) return -1;
-
-            return _compareType switch
-            {
-                PersonCompareType.FirstName => x.FirstName.CompareTo(y.FirstName),
-                PersonCompareType.LastName => x.LastName.CompareTo(y.LastName),
-                _ => throw new ArgumentException("unexpected compare type")
-            };
-        }
-
-        #endregion
+            PersonCompareType.FirstName => x.FirstName.CompareTo(y.FirstName),
+            PersonCompareType.LastName => x.LastName.CompareTo(y.LastName),
+            _ => throw new ArgumentException("unexpected compare type")
+        };
     }
+
+    #endregion
 }