Implement changes from review

axunonb · axunonb · commit 469c767a00d6 · 2024-10-22T15:12:12.000+02:00
* Removed redundant check in `Attachment.cs` `CopyFrom` method.
* Updated `Period.cs` and `Trigger.cs` to use `Copy&lt;IDateTime&gt;()` method.
* Modified `Alarm` class to implement `IComparable&lt;Alarm&gt;` with `CompareTo` method.
diff --git a/Ical.Net.Benchmarks/Ical.Net.Benchmarks.csproj b/Ical.Net.Benchmarks/Ical.Net.Benchmarks.csproj
@@ -1,17 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0;netcoreapp3.1;net48</TargetFrameworks>
-    <OutputType>Exe</OutputType>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Ical.Net\Ical.Net.csproj" />
-  </ItemGroup>
-
+    <PropertyGroup>
+        <TargetFrameworks>net8.0;net6.0;netcoreapp3.1;net48</TargetFrameworks>
+        <OutputType>Exe</OutputType>
+        <LangVersion>latest</LangVersion>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Ical.Net\Ical.Net.csproj" />
+    </ItemGroup>
 </Project>
diff --git a/Ical.Net.Tests/Ical.Net.Tests.csproj b/Ical.Net.Tests/Ical.Net.Tests.csproj
@@ -3,6 +3,7 @@
         <TargetFrameworks>net8.0;net6.0;net48</TargetFrameworks>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>..\IcalNetStrongnameKey.snk</AssemblyOriginatorKeyFile>
+        <LangVersion>latest</LangVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
diff --git a/Ical.Net/CalendarComponents/Alarm.cs b/Ical.Net/CalendarComponents/Alarm.cs
@@ -10,7 +10,6 @@ namespace Ical.Net.CalendarComponents
     /// </summary>
     public class Alarm : CalendarComponent
     {
-        //ToDo: Implement IEquatable
         public virtual string Action
         {
             get => Properties.Get<string>(AlarmAction.Key);
@@ -177,4 +176,4 @@ protected virtual void AddRepeatedItems()
             }
         }
     }
-}
+}
diff --git a/Ical.Net/DataTypes/Attachment.cs b/Ical.Net/DataTypes/Attachment.cs
@@ -78,7 +78,7 @@ public override void CopyFrom(ICopyable obj)
             base.CopyFrom(obj);
 
             Uri = att.Uri != null ? new Uri(att.Uri.ToString()) : null;
-            if (att.Data != null && att.Data.Length != 0)
+            if (att.Data != null)
             {
                 Data = new byte[att.Data.Length];
                 Array.Copy(att.Data, Data, att.Data.Length);
diff --git a/Ical.Net/DataTypes/Period.cs b/Ical.Net/DataTypes/Period.cs
@@ -51,8 +51,8 @@ public override void CopyFrom(ICopyable obj)
 
             if (obj is not Period p) return;
 
-            StartTime = p.StartTime;
-            EndTime = p.EndTime;
+            StartTime = p.StartTime?.Copy<IDateTime>();
+            EndTime = p.EndTime?.Copy<IDateTime>();
             Duration = p.Duration;
         }
 
diff --git a/Ical.Net/DataTypes/Trigger.cs b/Ical.Net/DataTypes/Trigger.cs
@@ -82,7 +82,7 @@ public override void CopyFrom(ICopyable obj)
                 return;
             }
             
-            DateTime = t.DateTime;
+            DateTime = t.DateTime?.Copy<IDateTime>();
             Duration = t.Duration;
             Related = t.Related;
         }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ namespace Ical.Net.CalendarComponents`
`10`	`10`	`/// </summary>`
`11`	`11`	`public class Alarm : CalendarComponent`
`12`	`12`	`{`
`13`		`- //ToDo: Implement IEquatable`
`14`	`13`	`public virtual string Action`
`15`	`14`	`{`
`16`	`15`	`get => Properties.Get<string>(AlarmAction.Key);`
`@@ -177,4 +176,4 @@ protected virtual void AddRepeatedItems()`
`177`	`176`	`}`
`178`	`177`	`}`
`179`	`178`	`}`
`180`		`-}`
	`179`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public override void CopyFrom(ICopyable obj)`
`78`	`78`	`base.CopyFrom(obj);`
`79`	`79`
`80`	`80`	`Uri = att.Uri != null ? new Uri(att.Uri.ToString()) : null;`
`81`		`- if (att.Data != null && att.Data.Length != 0)`
	`81`	`+ if (att.Data != null)`
`82`	`82`	`{`
`83`	`83`	`Data = new byte[att.Data.Length];`
`84`	`84`	`Array.Copy(att.Data, Data, att.Data.Length);`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ public override void CopyFrom(ICopyable obj)`
`51`	`51`
`52`	`52`	`if (obj is not Period p) return;`
`53`	`53`
`54`		`- StartTime = p.StartTime;`
`55`		`- EndTime = p.EndTime;`
	`54`	`+ StartTime = p.StartTime?.Copy<IDateTime>();`
	`55`	`+ EndTime = p.EndTime?.Copy<IDateTime>();`
`56`	`56`	`Duration = p.Duration;`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public override void CopyFrom(ICopyable obj)`
`82`	`82`	`return;`
`83`	`83`	`}`
`84`	`84`
`85`		`- DateTime = t.DateTime;`
	`85`	`+ DateTime = t.DateTime?.Copy<IDateTime>();`
`86`	`86`	`Duration = t.Duration;`
`87`	`87`	`Related = t.Related;`
`88`	`88`	`}`