Merge pull request #94 from gothinkster/updates

update to 5.0.7, enable non-nullable references

Author: adamhathcock

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-format": {
+      "version": "5.1.225507",
+      "commands": [
+        "dotnet-format"
+      ]
+    }
+  }
+}

.editorconfig

@@ -11,5 +11,5 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.301
     - run: dotnet run -p build/build.csproj

.github/workflows/dotnetcore.yml

@@ -1,12 +1,12 @@
 #build container
-FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim as build
+FROM mcr.microsoft.com/dotnet/sdk:5.0.301-focal as build
 
 WORKDIR /build
 COPY . .
 RUN dotnet run -p build/build.csproj
 
 #runtime container
-FROM mcr.microsoft.com/dotnet/core/aspnet:5.0.0-alpine3.12
+FROM mcr.microsoft.com/dotnet/core/aspnet:5.0.7-alpine3.12
 RUN apk add --no-cache tzdata
 
 COPY --from=build /build/publish /app

Dockerfile

@@ -1,69 +1,71 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
+using GlobExpressions;
 using static Bullseye.Targets;
 using static SimpleExec.Command;
-using GlobExpressions;
-using System.Threading.Tasks;
 
-public static class Program
-{
-    private const string Clean = "clean";
-    private const string Build = "build";
-    private const string Test = "test";
-    private const string Publish = "publish";
+const string Clean = "clean";
+const string Build = "build";
+const string Test = "test";
+const string Format = "format";
+const string Publish = "publish";
 
-    static async Task Main(string[] args)
+Target(Clean,
+    ForEach("publish", "**/bin", "**/obj"),
+    dir =>
     {
-        Target(Clean,
-            ForEach("publish", "**/bin", "**/obj"),
-            dir =>
+        IEnumerable<string> GetDirectories(string d)
+        {
+            return Glob.Directories(".", d);
+        }
+
+        void RemoveDirectory(string d)
+        {
+            if (Directory.Exists(d))
             {
-                IEnumerable<string> GetDirectories(string d)
-                {
-                    return Glob.Directories(".", d);
-                }
+                Console.WriteLine($"Cleaning {d}");
+                Directory.Delete(d, true);
+            }
+        }
 
-                void RemoveDirectory(string d)
-                {
-                    if (Directory.Exists(d))
-                    {
-                        Console.WriteLine($"Cleaning {d}");
-                        Directory.Delete(d, true);
-                    }
-                }
+        foreach (var d in GetDirectories(dir))
+        {
+            RemoveDirectory(d);
+        }
+    });
 
-                foreach (var d in GetDirectories(dir))
-                {
-                    RemoveDirectory(d);
-                }
-            });
 
-        Target(Build, () => Run("dotnet", "build . -c Release"));
+Target(Format, () =>
+{
+    Run("dotnet", "tool restore");
+    Run("dotnet", "format --check");
+});
 
-        Target(Test, DependsOn(Build),
-            () =>
-            {
-                IEnumerable<string> GetFiles(string d)
-                {
-                    return Glob.Files(".", d);
-                }
+Target(Build, DependsOn(Format), () => Run("dotnet", "build . -c Release"));
 
-                foreach (var file in GetFiles("tests/**/*.csproj"))
-                {
-                    Run("dotnet", $"test {file} -c Release --no-restore --no-build --verbosity=normal");
-                }
-            });
+Target(Test, DependsOn(Build),
+    () =>
+    {
+        IEnumerable<string> GetFiles(string d)
+        {
+            return Glob.Files(".", d);
+        }
 
-        Target(Publish, DependsOn(Test),
-            ForEach("src/Conduit"),
-            project =>
-            {
-                Run("dotnet",
-                    $"publish {project} -c Release -f net5.0 -o ./publish --no-restore --no-build --verbosity=normal");
-            });
+        foreach (var file in GetFiles("tests/**/*.csproj"))
+        {
+            Run("dotnet", $"test {file} -c Release --no-restore --no-build --verbosity=normal");
+        }
+    });
+
+Target(Publish, DependsOn(Test),
+    ForEach("src/Conduit"),
+    project =>
+    {
+        Run("dotnet",
+            $"publish {project} -c Release -f net5.0 -o ./publish --no-restore --no-build --verbosity=normal");
+    });
+
+Target("default", DependsOn(Publish), () => Console.WriteLine("Done!"));
+await RunTargetsAndExitAsync(args);
 
-        Target("default", DependsOn(Publish), () => Console.WriteLine("Done!"));
-        await RunTargetsAndExitAsync(args);
-    }
-}

build/Program.cs

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bullseye" Version="3.5.0" />
+    <PackageReference Include="Bullseye" Version="3.7.0" />
     <PackageReference Include="Glob" Version="1.1.8" />
-    <PackageReference Include="SimpleExec" Version="6.3.0" />
+    <PackageReference Include="SimpleExec" Version="7.0.0" />
   </ItemGroup>
 </Project>

build/build.csproj

@@ -1,5 +1,5 @@
 {
     "sdk": {
-      "version": "5.0.100"
+      "version": "5.0.301"
     }
   }

global.json

@@ -25,6 +25,8 @@ This is using ASP.NET Core with:
 - Built-in Swagger via [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore)
 - [Bullseye](https://github.com/adamralph/bullseye) for building!
 - JWT authentication using [ASP.NET Core JWT Bearer Authentication](https://github.com/aspnet/Security/tree/master/src/Microsoft.AspNetCore.Authentication.JwtBearer).
+- Use [dotnet-format](https://github.com/dotnet/format) for style checking
+- `.editorconfig` to enforce some usage patterns
 
 This basic architecture is based on this reference architecture: [https://github.com/jbogard/ContosoUniversityCore](https://github.com/jbogard/ContosoUniversityCore)
 

readme.md

@@ -2,23 +2,24 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="10.1.1" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.7" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.10" />
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="9.3.0" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="10.2.3" />
     <PackageReference Include="MediatR" Version="9.0.0" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
   </ItemGroup>
 
   <ItemGroup>

src/Conduit/Conduit.csproj

@@ -11,17 +11,17 @@ public class Article
         [JsonIgnore]
         public int ArticleId { get; set; }
 
-        public string Slug { get; set; }
+        public string? Slug { get; set; }
 
-        public string Title { get; set; }
+        public string? Title { get; set; }
 
-        public string Description { get; set; }
+        public string? Description { get; set; }
 
-        public string Body { get; set; }
+        public string? Body { get; set; }
 
-        public Person Author { get; set; }
+        public Person? Author { get; set; }
 
-        public List<Comment> Comments { get; set; }
+        public List<Comment> Comments { get; set; } = new();
 
         [NotMapped]
         public bool Favorited => ArticleFavorites?.Any() ?? false;
@@ -30,16 +30,16 @@ public class Article
         public int FavoritesCount => ArticleFavorites?.Count ?? 0;
 
         [NotMapped]
-        public List<string> TagList => (ArticleTags?.Select(x => x.TagId) ?? Enumerable.Empty<string>()).ToList();
+        public List<string> TagList => ArticleTags.Where(x => x.TagId is not null).Select(x => x.TagId!).ToList();
 
         [JsonIgnore]
-        public List<ArticleTag> ArticleTags { get; set; }
+        public List<ArticleTag> ArticleTags { get; set; } = new();
 
         [JsonIgnore]
-        public List<ArticleFavorite> ArticleFavorites { get; set; }
+        public List<ArticleFavorite> ArticleFavorites { get; set; } = new();
 
         public DateTime CreatedAt { get; set; }
 
         public DateTime UpdatedAt { get; set; }
     }
-}
+}