Merge pull request #247 from sharparchitecture/releases/7.0.0

v 7.0.0

Author: cd21h

Directory.Build.props

@@ -3,20 +3,21 @@
     <Product>Sharp Architecture</Product>
     <Authors>Sharp Architecture Dev Team</Authors>
 
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net5</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
     <SignAssembly>false</SignAssembly>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
 
     <LangVersion>9.0</LangVersion>
+    <Nullable>enable</Nullable>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
-  <PropertyGroup Label="Custom targeTs">
+  <PropertyGroup Label="Custom targets">
     <!-- target frameworks for unit-tests and applications -->
-    <AppTargetFrameworks>netcoreapp2.1;netcoreapp2.2;netcoreapp3.1;net5</AppTargetFrameworks>
+    <AppTargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</AppTargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -27,16 +28,18 @@
     <Optimize>True</Optimize>
   </PropertyGroup>
 
+  <!-- nullable checks -->
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net5.0' ">
+    <DefineConstants>$(DefineConstants);NULLABLE_REFERENCE_TYPES</DefineConstants>
+  </PropertyGroup>
+
   <PropertyGroup Label="Package" Condition="'$(MSBuildProjectName.Contains(Tests))' == false">
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     <IsPackable>True</IsPackable>
     <PackageIconUrl>https://github.com/sharparchitecture/Sharp-Architecture/raw/master/Artefacts/Documentation/icon.png</PackageIconUrl>
     <PackageProjectUrl>http://sharparchitecture.github.io/</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>https://github.com/sharparchitecture/Sharp-Architecture/releases/tag/6.1.1</PackageReleaseNotes>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <IncludeSymbols>True</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PackageReleaseNotes>https://github.com/sharparchitecture/Sharp-Architecture/releases/tag/7.0.0</PackageReleaseNotes>
     <PackageTags>sharp-architecture;sharp-arch</PackageTags>
   </PropertyGroup>
 

Docker/start-mssql.ps1

@@ -1 +1 @@
-docker.exe run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=Password12!' -p 2433:1433 -d -v./mssql-data:/var/opt/mssql/data mcr.microsoft.com/mssql/server:2017-latest-ubuntu
+docker.exe run --name sharparch-sql -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=Password12!' -p 2433:1433 -d -v./mssql-data:/var/opt/mssql/data mcr.microsoft.com/mssql/server:2017-latest-ubuntu

GitReleaseManager.yaml

@@ -35,6 +35,7 @@ issue-labels-exclude:
   - question
   - ready
   - wontfix
+  - pull-request
 
 issue-labels-alias:
   - name: breaking-change

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

@@ -19,7 +19,7 @@ public class AnnouncementSummary
 
         [Required]
         [JsonProperty("title")]
-        public string Title { get; set; }
+        public string Title { get; set; } = null!;
     }
 
 
@@ -30,6 +30,6 @@ public class AnnouncementModel : AnnouncementSummary
     {
         [JsonProperty("content")]
         [Required]
-        public string Content { get; set; }
+        public string Content { get; set; } = null!;
     }
 }

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

@@ -13,10 +13,10 @@ public class NewAnnouncement
 
         [Required]
         [JsonProperty("title")]
-        public string Title { get; set; }
+        public string Title { get; set; } = null!;
 
         [JsonProperty("content")]
         [Required]
-        public string Content { get; set; }
+        public string Content { get; set; } = null!;
     }
 }

Samples/TardisBank/Src/Suteki.TardisBank.Api/Suteki.TardisBank.Api.csproj

@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.3.0" PrivateAssets="All" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.1.0" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
 </Project>

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

@@ -6,7 +6,7 @@ namespace Suteki.TardisBank.Domain
 
     using SharpArch.Domain.DomainModel;
 
-    public class Account : Entity
+    public class Account : Entity<int>
     {
         public const int MaxTransactions = 100;
         public virtual decimal OldTransactionsBalance { get; protected set; }
@@ -27,7 +27,7 @@ public virtual decimal Balance
 
         public virtual IList<PaymentSchedule> PaymentSchedules { get; protected set; }
 
-        public virtual void AddTransaction(string description, decimal amount)
+        public virtual void AddTransaction(string? description, decimal amount)
         {
             this.Transactions.Add(new Transaction(description, amount, this));
 
@@ -66,4 +66,4 @@ public virtual void RemovePaymentSchedule(int paymentScheduleId)
             this.PaymentSchedules.Remove(scheduleToRemove);
         }
     }
-}
+}

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

@@ -6,15 +6,15 @@
     using SharpArch.Domain.DomainModel;
 
     [DebuggerDisplay("{Id}: {Title}")]
-    public class Announcement: Entity
+    public class Announcement: Entity<int>
     {
         public virtual DateTime Date { get; set; }
 
         [MaxLength(120)]
-        public virtual string Title { get; set; }
+        public virtual string Title { get; set; } = null!;
 
         [MaxLength(2000)]
-        public virtual string Content { get; set; }
+        public virtual string? Content { get; set; }
 
         public virtual DateTime LastModifiedUtc { get; set; }
 

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

@@ -17,7 +17,7 @@ protected Child()
         }
 
         public virtual int ParentId { get; set; }
-        public virtual Account Account { get; set; }
+        public virtual Account Account { get; set; } = null!;
 
         public virtual void ReceivePayment(decimal amount, string description)
         {
@@ -75,4 +75,4 @@ public override string[] GetRoles()
             return new[] { UserRoles.Child };
         }
     }
-}
+}

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

@@ -4,7 +4,7 @@ namespace Suteki.TardisBank.Domain
 
     using SharpArch.Domain.DomainModel;
 
-    public class Message : Entity
+    public class Message : Entity<int>
     {
         public Message(DateTime date, string text, User user)
         {
@@ -24,10 +24,10 @@ public virtual void Read()
         }
 
         public virtual DateTime Date { get; protected set; }
-        public virtual string Text { get; protected set; }
+        public virtual string? Text { get; protected set; }
 
-        public virtual User User { get; set; }
+        public virtual User User { get; set; } = null!;
 
         public virtual bool HasBeenRead { get; protected set; }
     }
-}
+}