.net 8 - object-orientation #203

christiannagel · christiannagel · commit 8c2c56a51489 · 2025-02-09T10:35:49.000+01:00
diff --git a/1_CS/ObjectOrientation/AbstractClasses/AbstractClasses.csproj b/1_CS/ObjectOrientation/AbstractClasses/AbstractClasses.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/1_CS/ObjectOrientation/AbstractClasses/Shape.cs b/1_CS/ObjectOrientation/AbstractClasses/Shape.cs
@@ -35,4 +35,3 @@ public virtual void Move(Position newPosition)
 
     public abstract Shape Clone();
 }
-
diff --git a/1_CS/ObjectOrientation/DefaultInterfaceMethods/DefaultInterfaceMethods.csproj b/1_CS/ObjectOrientation/DefaultInterfaceMethods/DefaultInterfaceMethods.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/1_CS/ObjectOrientation/DefaultInterfaceMethods/Program.cs b/1_CS/ObjectOrientation/DefaultInterfaceMethods/Program.cs
@@ -4,7 +4,7 @@
 
 IEnumerableEx<string> names = new MyCollection<string> { "James", "Jack", "Jochen", "Sebastian", "Lewis", "Juan" };
 
-var jNames = names.Where(n => n.StartsWith("J"));
+var jNames = names.Where(n => n.StartsWith('J'));
 foreach (var name in jNames)
 {
     Console.WriteLine(name);
diff --git a/1_CS/ObjectOrientation/GenericTypes/GenericTypes.csproj b/1_CS/ObjectOrientation/GenericTypes/GenericTypes.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/1_CS/ObjectOrientation/GenericTypes/LinkedList.cs b/1_CS/ObjectOrientation/GenericTypes/LinkedList.cs
@@ -15,7 +15,6 @@ public LinkedListNode<T> AddLast(T node)
         else
         {
             newNode.Prev = Last;
-            LinkedListNode<T> previous = Last;
             Last.Next = newNode;
             Last = newNode;
         }
diff --git a/1_CS/ObjectOrientation/GenericTypes/Program.cs b/1_CS/ObjectOrientation/GenericTypes/Program.cs
@@ -1,4 +1,4 @@
-﻿LinkedList<int> list1 = new();
+﻿LinkedList<int> list1 = [];
 list1.AddLast(1);
 list1.AddLast(3);
 list1.AddLast(2);
@@ -9,15 +9,15 @@
 }
 Console.WriteLine();
 
-LinkedList<string> list2 = new();
+LinkedList<string> list2 = [];
 list2.AddLast("two");
 list2.AddLast("four");
 list2.AddLast("six");
 
 // show the last
 Console.WriteLine(list2.Last);
 
-LinkedList<(int, int)> list3 = new();
+LinkedList<(int, int)> list3 = [];
 list3.AddLast((1, 2));
 list3.AddLast((3, 4));
 foreach (var item in list3)
@@ -26,12 +26,12 @@
 }
 Console.WriteLine();
 
-LinkedList<Person> list4 = new();
+LinkedList<Person> list4 = [];
 list4.AddLast(new Person("Stephanie", "Nagel"));
 list4.AddLast(new Person("Matthias", "Nagel"));
 list4.AddLast(new Person("Katharina", "Nagel"));
 
 // show the first
 Console.WriteLine(list4.First);
 
-public record Person(string FirstName, string LastName);
+public record class Person(string FirstName, string LastName);
diff --git a/1_CS/ObjectOrientation/GenericTypesWithConstraints/GenericTypesWithConstraints.csproj b/1_CS/ObjectOrientation/GenericTypesWithConstraints/GenericTypesWithConstraints.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/1_CS/ObjectOrientation/GenericTypesWithConstraints/Program.cs b/1_CS/ObjectOrientation/GenericTypesWithConstraints/Program.cs
@@ -1,9 +1,9 @@
-﻿LinkedList<Person> list4 = new();
+﻿LinkedList<Person> list4 = [];
 list4.AddLast(new Person("Stephanie", "Nagel", "Mrs"));
 list4.AddLast(new Person("Matthias", "Nagel", "Mr"));
 list4.AddLast(new Person("Katharina", "Nagel", "Mrs"));
 
 // show the first
 Console.WriteLine(list4.First);
 
-public record Person(string FirstName, string LastName, string Title) : ITitle { }
+public record class Person(string FirstName, string LastName, string Title) : ITitle { }
diff --git a/1_CS/ObjectOrientation/InheritanceWithConstructors/ConcreteShapes.cs b/1_CS/ObjectOrientation/InheritanceWithConstructors/ConcreteShapes.cs
@@ -1,8 +1,5 @@
-﻿public class Rectangle : Shape
+﻿public class Rectangle(int x, int y, int width, int height) : Shape(x, y, width, height)
 {
-    public Rectangle(int x, int y, int width, int height)
-        : base(x, y, width, height) { }
-
     protected override void DisplayShape()
     {
         Console.WriteLine($"Rectangle at position {Position} with size {Size}");
@@ -11,11 +8,8 @@ protected override void DisplayShape()
     public override Rectangle Clone() => new(Position.X, Position.Y, Size.Width, Size.Height);
 }
 
-public class Ellipse : Shape
+public class Ellipse(int x, int y, int width, int height) : Shape(x, y, width, height)
 {
-    public Ellipse(int x, int y, int width, int height)
-    : base(x, y, width, height) { }
-
     protected override void DisplayShape()
     {
         Console.WriteLine($"Ellipse at position {Position} with size {Size}");
diff --git a/1_CS/ObjectOrientation/InheritanceWithConstructors/InheritanceWithConstructors.csproj b/1_CS/ObjectOrientation/InheritanceWithConstructors/InheritanceWithConstructors.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/1_CS/ObjectOrientation/InheritanceWithConstructors/Shape.cs b/1_CS/ObjectOrientation/InheritanceWithConstructors/Shape.cs
@@ -35,16 +35,10 @@ public class Size
     public override string ToString() => $"Width: {Width}, Height: {Height}";
 }
 
-public abstract class Shape
+public abstract class Shape(int x, int y, int width, int height)
 {
-    public Shape(int x, int y, int width, int height)
-    {
-        Position = new Position(x, y);
-        Size = new Size(width, height);
-    }
-
-    public Position Position { get; }
-    public virtual Size Size { get; }
+    public Position Position { get; } = new Position(x, y);
+    public virtual Size Size { get; } = new Size(width, height);
 
     public void Draw() => DisplayShape();
 
diff --git a/1_CS/ObjectOrientation/RecordsInheritance/RecordsInheritance.csproj b/1_CS/ObjectOrientation/RecordsInheritance/RecordsInheritance.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/1_CS/ObjectOrientation/UsingInterfaces/ConcreteShapes.cs b/1_CS/ObjectOrientation/UsingInterfaces/ConcreteShapes.cs
@@ -1,17 +1,13 @@
-﻿public class Rectangle : Shape
+﻿public class Rectangle(ILogger logger) : Shape(logger)
 {
-    public Rectangle(ILogger logger) : base(logger) {  }
-
     protected override void DisplayShape()
     {
         Logger.Log($"Rectangle at position {Position} with size {Size}");
     }
 }
 
-public class Ellipse : Shape
+public class Ellipse(ILogger logger) : Shape(logger)
 {
-    public Ellipse(ILogger logger) : base(logger) { }
-
     protected override void DisplayShape()
     {
         Logger.Log($"Ellipse at position {Position} with size {Size}");
diff --git a/1_CS/ObjectOrientation/UsingInterfaces/Program.cs b/1_CS/ObjectOrientation/UsingInterfaces/Program.cs
@@ -7,7 +7,7 @@ void SortWithIComparable()
     Person p2 = new("Graham", "Hill");
     Person p3 = new("Damon", "Hill");
 
-    Person[] people = { p1, p2, p3 };
+    Person[] people = [p1, p2, p3];
     Array.Sort(people);
     foreach (var p in people)
     {
diff --git a/1_CS/ObjectOrientation/UsingInterfaces/Shape.cs b/1_CS/ObjectOrientation/UsingInterfaces/Shape.cs
@@ -2,14 +2,9 @@
 
 public record Size(int Width, int Height);
 
-public abstract class Shape
+public abstract class Shape(ILogger logger)
 {
-    public Shape(ILogger logger)
-    {
-        Logger = logger;
-    }
-
-    protected ILogger Logger { get; }
+    protected ILogger Logger { get; } = logger;
     public Position? Position { get; init; }
     public Size? Size { get; init; }
 
diff --git a/1_CS/ObjectOrientation/UsingInterfaces/UsingInterfaces.csproj b/1_CS/ObjectOrientation/UsingInterfaces/UsingInterfaces.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <Nullable>enable</Nullable>
+    <TargetFramework>net8.0</TargetFramework>
+		<Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
diff --git a/1_CS/ObjectOrientation/VirtualMethods/VirtualMethods.csproj b/1_CS/ObjectOrientation/VirtualMethods/VirtualMethods.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,3 @@ public virtual void Move(Position newPosition)`
`35`	`35`
`36`	`36`	`public abstract Shape Clone();`
`37`	`37`	`}`
`38`		`-`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`IEnumerableEx<string> names = new MyCollection<string> { "James", "Jack", "Jochen", "Sebastian", "Lewis", "Juan" };`
`6`	`6`
`7`		`-var jNames = names.Where(n => n.StartsWith("J"));`
	`7`	`+var jNames = names.Where(n => n.StartsWith('J'));`
`8`	`8`	`foreach (var name in jNames)`
`9`	`9`	`{`
`10`	`10`	`Console.WriteLine(name);`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ public LinkedListNode<T> AddLast(T node)`
`15`	`15`	`else`
`16`	`16`	`{`
`17`	`17`	`newNode.Prev = Last;`
`18`		`- LinkedListNode<T> previous = Last;`
`19`	`18`	`Last.Next = newNode;`
`20`	`19`	`Last = newNode;`
`21`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`		`-public class Rectangle : Shape`
	`1`	`+public class Rectangle(int x, int y, int width, int height) : Shape(x, y, width, height)`
`2`	`2`	`{`
`3`		`- public Rectangle(int x, int y, int width, int height)`
`4`		`- : base(x, y, width, height) { }`
`5`		`-`
`6`	`3`	`protected override void DisplayShape()`
`7`	`4`	`{`
`8`	`5`	`Console.WriteLine($"Rectangle at position {Position} with size {Size}");`
`@@ -11,11 +8,8 @@ protected override void DisplayShape()`
`11`	`8`	`public override Rectangle Clone() => new(Position.X, Position.Y, Size.Width, Size.Height);`
`12`	`9`	`}`
`13`	`10`
`14`		`-public class Ellipse : Shape`
	`11`	`+public class Ellipse(int x, int y, int width, int height) : Shape(x, y, width, height)`
`15`	`12`	`{`
`16`		`- public Ellipse(int x, int y, int width, int height)`
`17`		`- : base(x, y, width, height) { }`
`18`		`-`
`19`	`13`	`protected override void DisplayShape()`
`20`	`14`	`{`
`21`	`15`	`Console.WriteLine($"Ellipse at position {Position} with size {Size}");`