Upgrade to C# 10, closes #270

* Restructure
* Enable C# 10 features for library projects
* Switch to file-scoped namespaces.
* Enable implicit usings.
* Add JetBrains.Annotations.
* Reformat code.
* Update Samples
* Upgrade dependencies
* Skip GitVersion for PR builds
* Skip code coverage for .NET 7
* Include build Id in PR build version number
* Disable .NET preview warning

Author: cd21h

.editorconfig

@@ -22,7 +22,7 @@ end_of_line = lf
 [*.{cmd, bat}]
 end_of_line = crlf
 
-[{**/tests/**,**/Tests/**,**/*.Tests/**}.cs]
+[{**/tests/**,**/Tests/**,**/*.Tests/**,**/Samples/**}.cs]
 resharper_async_converter_async_await_may_be_elided_highlighting=do_not_show
 resharper_class_never_instantiated_global_highlighting = do_not_show
 resharper_class_with_virtual_members_never_inherited_global_highlighting = do_not_show

Directory.Build.props

@@ -6,20 +6,30 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0</TargetFrameworks>
     <Culture></Culture>
     <SignAssembly>false</SignAssembly>
+
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
 
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+
     <IsTestProject>false</IsTestProject>
 
+    <DefineConstants>$(DefineConstants);JETBRAINS_ANNOTATIONS</DefineConstants>
     <NoWarn>$(NoWarn);0105</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Using Include="JetBrains.Annotations" />
+  </ItemGroup>
+
   <PropertyGroup Label="Custom targets">
     <!-- target frameworks for unit-tests and applications -->
     <AppTargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</AppTargetFrameworks>
@@ -34,7 +44,7 @@
   </PropertyGroup>
 
   <!-- nullable checks -->
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0'">
+  <PropertyGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
     <DefineConstants>$(DefineConstants);NULLABLE_REFERENCE_TYPES</DefineConstants>
   </PropertyGroup>
 

Samples/Samples.sln

@@ -21,25 +21,25 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Suteki.TardisBank.Tasks", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Suteki.TardisBank.Tests", "TardisBank\Src\Suteki.TardisBank.Tests\Suteki.TardisBank.Tests.csproj", "{6AB4ABA4-DBB1-4A05-BE4C-894EF9836A29}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Domain", "..\Src\SharpArch.Domain\SharpArch.Domain.csproj", "{FA611294-98F7-4718-8EBE-F6DACF510040}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Domain", "..\Src\Lib\SharpArch.Domain\SharpArch.Domain.csproj", "{FA611294-98F7-4718-8EBE-F6DACF510040}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Infrastructure", "..\Src\SharpArch.Infrastructure\SharpArch.Infrastructure.csproj", "{C0C2A307-73F6-437D-9341-1A014000C023}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Infrastructure", "..\Src\Lib\SharpArch.Infrastructure\SharpArch.Infrastructure.csproj", "{C0C2A307-73F6-437D-9341-1A014000C023}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.NHibernate", "..\Src\SharpArch.NHibernate\SharpArch.NHibernate.csproj", "{E94D2E74-4900-44DD-B114-7C37502F88FA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.NHibernate", "..\Src\Lib\SharpArch.NHibernate\SharpArch.NHibernate.csproj", "{E94D2E74-4900-44DD-B114-7C37502F88FA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.NHibernate.Extensions.DependencyInjection", "..\Src\SharpArch.NHibernate.DependencyInjection\SharpArch.NHibernate.Extensions.DependencyInjection.csproj", "{F7BED6C6-ACD4-41C4-8F2C-7FAEFFF53A8A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.NHibernate.Extensions.DependencyInjection", "..\Src\Lib\SharpArch.NHibernate.DependencyInjection\SharpArch.NHibernate.Extensions.DependencyInjection.csproj", "{F7BED6C6-ACD4-41C4-8F2C-7FAEFFF53A8A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.RavenDb", "..\Src\SharpArch.RavenDb\SharpArch.RavenDb.csproj", "{CFFD11B3-E73D-4712-9A74-6B4EEE842BD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.RavenDb", "..\Src\Lib\SharpArch.RavenDb\SharpArch.RavenDb.csproj", "{CFFD11B3-E73D-4712-9A74-6B4EEE842BD4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Testing", "..\Src\SharpArch.Testing\SharpArch.Testing.csproj", "{172063A6-E0DD-4F71-8904-FEBEB1B285DC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Testing", "..\Src\Lib\SharpArch.Testing\SharpArch.Testing.csproj", "{172063A6-E0DD-4F71-8904-FEBEB1B285DC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Testing.NUnit", "..\Src\SharpArch.Testing.NUnit\SharpArch.Testing.NUnit.csproj", "{7D11D48A-38DA-4933-9670-0D7214DFA843}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Testing.NUnit", "..\Src\Lib\SharpArch.Testing.NUnit\SharpArch.Testing.NUnit.csproj", "{7D11D48A-38DA-4933-9670-0D7214DFA843}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Testing.Xunit", "..\Src\SharpArch.Testing.Xunit\SharpArch.Testing.Xunit.csproj", "{A615DFB3-F550-4B40-B90F-D10ED619359F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Testing.Xunit", "..\Src\Lib\SharpArch.Testing.Xunit\SharpArch.Testing.Xunit.csproj", "{A615DFB3-F550-4B40-B90F-D10ED619359F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Testing.Xunit.NHibernate", "..\Src\SharpArch.Testing.Xunit.NHibernate\SharpArch.Testing.Xunit.NHibernate.csproj", "{0DDF2078-BC4B-4890-9AFC-0407C1D24A0E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Testing.Xunit.NHibernate", "..\Src\Lib\SharpArch.Testing.Xunit.NHibernate\SharpArch.Testing.Xunit.NHibernate.csproj", "{0DDF2078-BC4B-4890-9AFC-0407C1D24A0E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Web.AspNetCore", "..\Src\SharpArch.Web.AspNetCore\SharpArch.Web.AspNetCore.csproj", "{BC957B66-7B0C-44F6-8C03-518B384EB57D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpArch.Web.AspNetCore", "..\Src\Lib\SharpArch.Web.AspNetCore\SharpArch.Web.AspNetCore.csproj", "{BC957B66-7B0C-44F6-8C03-518B384EB57D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharpArch", "SharpArch", "{F2D26BF7-7343-4A9D-B73F-95506346EC33}"
 EndProject

Samples/TardisBank/Src/Suteki.TardisBank.Api/Announcements/AnnouncementModel.cs

@@ -1,35 +1,33 @@
-namespace Suteki.TardisBank.Api.Announcements
-{
-    using System;
-    using System.ComponentModel.DataAnnotations;
-    using Newtonsoft.Json;
+namespace Suteki.TardisBank.Api.Announcements;
 
+using System.ComponentModel.DataAnnotations;
+using Newtonsoft.Json;
 
-    /// <summary>
-    ///     Announcement summary model.
-    /// </summary>
-    public class AnnouncementSummary
-    {
-        [JsonProperty("id")]
-        public int Id { get; set; }
 
-        [JsonProperty("date")]
-        [DataType(DataType.Date)]
-        public DateTime Date { get; set; }
+/// <summary>
+///     Announcement summary model.
+/// </summary>
+public class AnnouncementSummary
+{
+    [JsonProperty("id")]
+    public int Id { get; set; }
 
-        [Required]
-        [JsonProperty("title")]
-        public string Title { get; set; } = null!;
-    }
+    [JsonProperty("date")]
+    [DataType(DataType.Date)]
+    public DateTime Date { get; set; }
 
+    [Required]
+    [JsonProperty("title")]
+    public string Title { get; set; } = null!;
+}
 
-    /// <summary>
-    ///     Full announcement details.
-    /// </summary>
-    public class AnnouncementModel : AnnouncementSummary
-    {
-        [JsonProperty("content")]
-        [Required]
-        public string Content { get; set; } = null!;
-    }
+
+/// <summary>
+///     Full announcement details.
+/// </summary>
+public class AnnouncementModel : AnnouncementSummary
+{
+    [JsonProperty("content")]
+    [Required]
+    public string Content { get; set; } = null!;
 }

Samples/TardisBank/Src/Suteki.TardisBank.Api/Announcements/NewAnnouncement.cs

@@ -1,22 +1,20 @@
-namespace Suteki.TardisBank.Api.Announcements
-{
-    using System;
-    using System.ComponentModel.DataAnnotations;
-    using Newtonsoft.Json;
+namespace Suteki.TardisBank.Api.Announcements;
+
+using System.ComponentModel.DataAnnotations;
+using Newtonsoft.Json;
 
 
-    public class NewAnnouncement
-    {
-        [JsonProperty("date")]
-        [DataType(DataType.Date)]
-        public DateTime Date { get; set; }
+public class NewAnnouncement
+{
+    [JsonProperty("date")]
+    [DataType(DataType.Date)]
+    public DateTime Date { get; set; }
 
-        [Required]
-        [JsonProperty("title")]
-        public string Title { get; set; } = null!;
+    [Required]
+    [JsonProperty("title")]
+    public string Title { get; set; } = null!;
 
-        [JsonProperty("content")]
-        [Required]
-        public string Content { get; set; } = null!;
-    }
+    [JsonProperty("content")]
+    [Required]
+    public string Content { get; set; } = null!;
 }

Samples/TardisBank/Src/Suteki.TardisBank.Domain/.editorconfig

@@ -0,0 +1,6 @@
+root=true
+
+[*.cs]
+# NHibernate requires all class members to be virtual
+resharper_virtual_member_call_in_constructor_highlighting=do_not_show
+resharper_class_with_virtual_members_never_inherited_global_highlighting=do_not_show

Samples/TardisBank/Src/Suteki.TardisBank.Domain/Account.cs

@@ -1,69 +1,66 @@
-namespace Suteki.TardisBank.Domain
-{
-    using System;
-    using System.Linq;
-    using System.Collections.Generic;
+// ReSharper disable MissingXmlDoc
+namespace Suteki.TardisBank.Domain;
 
-    using SharpArch.Domain.DomainModel;
+using SharpArch.Domain.DomainModel;
 
-    public class Account : Entity<int>
-    {
-        public const int MaxTransactions = 100;
-        public virtual decimal OldTransactionsBalance { get; protected set; }
 
-        public Account()
-        {
-            this.Transactions = new List<Transaction>();
-            this.PaymentSchedules = new List<PaymentSchedule>();
-            this.OldTransactionsBalance = 0M;
-        }
+public class Account : Entity<int>
+{
+    public const int MaxTransactions = 100;
+    public virtual decimal OldTransactionsBalance { get; protected set; }
 
-        public virtual IList<Transaction> Transactions { get; protected set; }
+    public virtual IList<Transaction> Transactions { get; protected set; }
 
-        public virtual decimal Balance
-        {
-            get { return this.OldTransactionsBalance + this.Transactions.Sum(x => x.Amount); }
-        }
+    public virtual decimal Balance
+    {
+        get { return OldTransactionsBalance + Transactions.Sum(x => x.Amount); }
+    }
 
-        public virtual IList<PaymentSchedule> PaymentSchedules { get; protected set; }
+    public virtual IList<PaymentSchedule> PaymentSchedules { get; protected set; }
 
-        public virtual void AddTransaction(string? description, decimal amount)
-        {
-            this.Transactions.Add(new Transaction(description, amount, this));
+    public Account()
+    {
+        Transactions = new List<Transaction>();
+        PaymentSchedules = new List<PaymentSchedule>();
+        OldTransactionsBalance = 0M;
+    }
 
-            this.RemoveOldTransactions();
-        }
+    public virtual void AddTransaction(string? description, decimal amount)
+    {
+        Transactions.Add(new Transaction(description, amount, this));
 
-        void RemoveOldTransactions()
-        {
-            if (this.Transactions.Count <= MaxTransactions) return;
+        RemoveOldTransactions();
+    }
 
-            var oldestTransaction = this.Transactions.First();
-            this.Transactions.Remove(oldestTransaction);
-            this.OldTransactionsBalance += oldestTransaction.Amount;
-        }
+    void RemoveOldTransactions()
+    {
+        if (Transactions.Count <= MaxTransactions) return;
 
-        public virtual void AddPaymentSchedule(DateTime startDate, Interval interval, decimal amount, string description)
-        {
-            this.PaymentSchedules.Add(new PaymentSchedule(startDate, interval, amount, description, this));
-        }
+        var oldestTransaction = Transactions.First();
+        Transactions.Remove(oldestTransaction);
+        OldTransactionsBalance += oldestTransaction.Amount;
+    }
+
+    public virtual void AddPaymentSchedule(DateTime startDate, Interval interval, decimal amount, string description)
+    {
+        PaymentSchedules.Add(new PaymentSchedule(startDate, interval, amount, description, this));
+    }
 
-        public virtual void TriggerScheduledPayments(DateTime now)
+    public virtual void TriggerScheduledPayments(DateTime now)
+    {
+        var overdueSchedules = PaymentSchedules.Where(x => x.NextRun <= now);
+        foreach (var overdueSchedule in overdueSchedules)
         {
-            var overdueSchedules = this.PaymentSchedules.Where(x => x.NextRun <= now);
-            foreach (var overdueSchedule in overdueSchedules)
-            {
-                this.AddTransaction(overdueSchedule.Description, overdueSchedule.Amount);
-                overdueSchedule.CalculateNextRunDate();
-            }
+            AddTransaction(overdueSchedule.Description, overdueSchedule.Amount);
+            overdueSchedule.CalculateNextRunDate();
         }
+    }
 
-        public virtual void RemovePaymentSchedule(int paymentScheduleId)
-        {
-            var scheduleToRemove = this.PaymentSchedules.SingleOrDefault(x => x.Id == paymentScheduleId);
-            if (scheduleToRemove == null) return;
+    public virtual void RemovePaymentSchedule(int paymentScheduleId)
+    {
+        var scheduleToRemove = PaymentSchedules.SingleOrDefault(x => x.Id == paymentScheduleId);
+        if (scheduleToRemove == null) return;
 
-            this.PaymentSchedules.Remove(scheduleToRemove);
-        }
+        PaymentSchedules.Remove(scheduleToRemove);
     }
 }

Samples/TardisBank/Src/Suteki.TardisBank.Domain/Announcement.cs

@@ -1,23 +1,21 @@
-namespace Suteki.TardisBank.Domain
-{
-    using System;
-    using System.ComponentModel.DataAnnotations;
-    using System.Diagnostics;
-    using SharpArch.Domain.DomainModel;
+// ReSharper disable MissingXmlDoc
+namespace Suteki.TardisBank.Domain;
 
-    [DebuggerDisplay("{Id}: {Title}")]
-    public class Announcement: Entity<int>
-    {
-        public virtual DateTime Date { get; set; }
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics;
+using SharpArch.Domain.DomainModel;
 
-        [MaxLength(120)]
-        public virtual string Title { get; set; } = null!;
 
-        [MaxLength(2000)]
-        public virtual string? Content { get; set; }
+[DebuggerDisplay("{Id}: {Title}")]
+public class Announcement : Entity<int>
+{
+    public virtual DateTime Date { get; set; }
 
-        public virtual DateTime LastModifiedUtc { get; set; }
+    [MaxLength(120)]
+    public virtual string Title { get; set; } = null!;
 
+    [MaxLength(2000)]
+    public virtual string? Content { get; set; }
 
-    }
+    public virtual DateTime LastModifiedUtc { get; set; }
 }