Updated to latest of all the things. (#176)

* things restore * Fixed up samples with source generation
RocketSurgeonsGuild · Dec 6, 2020 · 4869cb3 · 4869cb3
1 parent 83d1f56
commit 4869cb3
Show file tree

Hide file tree

Showing 64 changed files with 1,345 additions and 176 deletions.
diff --git a/.build/.build.csproj b/.build/.build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace></RootNamespace>
     <IsPackable>False</IsPackable>
@@ -11,10 +11,9 @@
 
   <ItemGroup>
     <PackageReference Include="Nuke.Common" />
-    <PackageReference Include="JetBrains.ReSharper.CommandLineTools" ExcludeAssets="All" />
     <PackageReference Include="GitVersion.Tool" ExcludeAssets="All" />
     <PackageReference Include="ReportGenerator" ExcludeAssets="All" />
-    <PackageReference Include="JetBrains.ReSharper.CommandLineTools" ExcludeAssets="All" />
+    <PackageReference Include="JetBrains.ReSharper.GlobalTools" ExcludeAssets="All" />
     <PackageReference Include="Rocket.Surgery.Nuke" />
   </ItemGroup>
 

diff --git a/.build/Solution.cs b/.build/Solution.cs
@@ -66,6 +66,9 @@ public static RocketSurgeonGitHubActionsConfiguration Middleware(RocketSurgeonGi
             new SetupDotNetStep("Use .NET Core 3.1 SDK") {
                 DotNetVersion = "3.1.x"
             },
+            new SetupDotNetStep("Use .NET Core 5.0 SDK") {
+                DotNetVersion = "5.0.x"
+            },
         });
 
         buildJob.Steps.Add(new UsingStep("Publish Coverage")

diff --git a/.editorconfig b/.editorconfig
@@ -323,7 +323,7 @@ dotnet_diagnostic.IDE0058.severity = none
 # dotnet_diagnostic.CA1033.severity = none
 
 # CA1034: Nested types should not be visible
-# dotnet_diagnostic.CA1034.severity = warning
+dotnet_diagnostic.CA1034.severity = none
 
 # CA1036: Override methods on comparable types
 # dotnet_diagnostic.CA1036.severity = warning

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,6 +52,10 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '3.1.x'
+      - name: 🔨 Use .NET Core 5.0 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.x'
 
       - name: 🎁 dotnet tool restore
         run: |

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" IncludeAssets="analyzers;build;buildMultitargeting;buildTransitive" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" IncludeAssets="analyzers;build;buildMultitargeting;buildTransitive" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" IncludeAssets="analyzers;build;buildMultitargeting;buildTransitive" PrivateAssets="All" />
     <PackageReference Include="Rocket.Surgery.MSBuild.CI" IncludeAssets="analyzers;build;buildMultitargeting;buildTransitive;BuildMultitargeting;" PrivateAssets="All" />

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" />
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
-    <PackageVersion Include="Rocket.Surgery.MSBuild.CI" Version="1.0.0" />
-    <PackageVersion Include="Rocket.Surgery.MSBuild.GitVersion" Version="1.0.0" />
-    <PackageVersion Include="Rocket.Surgery.MSBuild.JetBrains.Annotations" Version="1.0.0" Condition="'$(MSBuildProjectName)'!='.build'" />
-    <PackageVersion Include="Rocket.Surgery.MSBuild.Metadata" Version="1.0.0" />
-    <PackageVersion Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.0.0" />
+    <PackageVersion Include="Rocket.Surgery.MSBuild.CI" Version="1.1.0" />
+    <PackageVersion Include="Rocket.Surgery.MSBuild.GitVersion" Version="1.1.0" />
+    <PackageVersion Include="Rocket.Surgery.MSBuild.JetBrains.Annotations" Version="1.1.0" Condition="'$(MSBuildProjectName)'!='.build'" />
+    <PackageVersion Include="Rocket.Surgery.MSBuild.Metadata" Version="1.1.0" />
+    <PackageVersion Include="Rocket.Surgery.MSBuild.SourceLink" Version="1.1.0" />
     <PackageVersion Include="Roslynator.Analyzers" Version="3.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="GitVersion.Tool" Version="5.5.0" />
-    <PackageVersion Include="JetBrains.ReSharper.CommandLineTools" Version="2020.2.4" />
-    <PackageVersion Include="Nuke.Common" Version="0.25.0-alpha0334" />
-    <PackageVersion Include="ReportGenerator" Version="4.7.1" />
-    <PackageVersion Include="Rocket.Surgery.Nuke" Version="0.14.0-beta.10" />
+    <PackageVersion Include="GitVersion.Tool" Version="5.5.1" />
+    <PackageVersion Include="JetBrains.ReSharper.GlobalTools" Version="2020.2.4" />
+    <PackageVersion Include="Nuke.Common" Version="5.0.1" />
+    <PackageVersion Include="ReportGenerator" Version="4.8.1" />
+    <PackageVersion Include="Rocket.Surgery.Nuke" Version="0.14.2" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Newtonsoft.Json" Version="12.0.3" />
@@ -30,62 +29,61 @@
     <PackageVersion Include="App.Metrics.AspNetCore.Endpoints" Version="4.1.0" />
     <PackageVersion Include="App.Metrics.AspNetCore.Tracking" Version="4.1.0" />
     <PackageVersion Include="App.Metrics.Extensions.Hosting" Version="4.1.0" />
-    <PackageVersion Include="FluentValidation" Version="9.2.2" />
-    <PackageVersion Include="FluentValidation.AspNetCore" Version="9.2.0" />
-    <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="9.2.0" />
+    <PackageVersion Include="FluentValidation" Version="9.3.0" />
+    <PackageVersion Include="FluentValidation.AspNetCore" Version="9.3.0" />
+    <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="9.3.0" />
     <PackageVersion Include="Grpc.AspNetCore" Version="2.33.1" />
     <PackageVersion Include="Humanizer.Core" Version="2.8.26" />
     <PackageVersion Include="Hellang.Middleware.ProblemDetails" Version="5.1.1" />
     <PackageVersion Include="MediatR" Version="9.0.0" />
-    <PackageVersion Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
+    <PackageVersion Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
     <!--    <PackageVersion Include="MicroElements.Swashbuckle.FluentValidation" Version="4.0.0-rc.2" />-->
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.8" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="3.1.8" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="3.1.8" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
     <PackageVersion Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="3.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.8" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="3.1.8" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="3.1.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="3.1.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.8" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="3.1.8" />
-    <PackageVersion Include="Microsoft.Reactive.Testing" Version="4.4.1" />
+    <PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="3.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.Reactive.Testing" Version="5.0.0" />
     <!--        <PackageVersion Include="Newtonsoft.Json" Version="12.0.3" />-->
     <PackageVersion Include="NodaTime" Version="3.0.3" />
     <PackageVersion Include="NodaTime.Serialization.JsonNet" Version="3.0.0" />
     <PackageVersion Include="NodaTime.Serialization.SystemTextJson" Version="1.0.0" />
-    <PackageVersion Include="NodaTime.Testing" Version="3.0.0" />
+    <PackageVersion Include="NodaTime.Testing" Version="3.0.3" />
     <PackageVersion Include="Rocket.Surgery.Build.Information" Version="3.3.11" />
-    <PackageVersion Include="Rocket.Surgery.Conventions" Version="10.0.0-beta.23" />
-    <PackageVersion Include="Rocket.Surgery.Conventions.Abstractions" Version="10.0.0-beta.23" />
-    <PackageVersion Include="Rocket.Surgery.Conventions.Attributes" Version="10.0.0-beta.23" />
-    <PackageVersion Include="Rocket.Surgery.Extensions.AutoMapper.NodaTime" Version="8.0.0-beta.7" />
-    <PackageVersion Include="Rocket.Surgery.Extensions.AutoMapper.SystemTextJson" Version="8.0.0-beta.7" />
-    <PackageVersion Include="Rocket.Surgery.Extensions.AutoMapper.NewtonsoftJson" Version="8.0.0-beta.7" />
-    <PackageVersion Include="Rocket.Surgery.Conventions.AutoMapper" Version="8.0.0-beta.7" />
-    <PackageVersion Include="Rocket.Surgery.Hosting.TestHost" Version="10.0.0-beta.23" />
-    <PackageVersion Include="Rocket.Surgery.Extensions.Configuration" Version="10.0.0" />
-    <PackageVersion Include="Rocket.Surgery.Extensions.Configuration.Json" Version="10.0.0" />
-    <PackageVersion Include="Rocket.Surgery.Extensions.Configuration.Yaml" Version="10.0.0" />
-    <PackageVersion Include="Rocket.Surgery.DependencyInjection.Extensions" Version="10.0.0" />
-    <PackageVersion Include="Rocket.Surgery.Extensions" Version="10.0.0" />
+    <PackageVersion Include="Rocket.Surgery.Conventions" Version="10.0.0-beta.98" />
+    <PackageVersion Include="Rocket.Surgery.Conventions.Abstractions" Version="10.0.0-beta.98" />
+    <PackageVersion Include="Rocket.Surgery.Conventions.Attributes" Version="10.0.0-beta.98" />
+    <PackageVersion Include="Rocket.Surgery.Extensions.AutoMapper.NodaTime" Version="8.0.0-beta.8" />
+    <PackageVersion Include="Rocket.Surgery.Extensions.AutoMapper.SystemTextJson" Version="8.0.0-beta.8" />
+    <PackageVersion Include="Rocket.Surgery.Extensions.AutoMapper.NewtonsoftJson" Version="8.0.0-beta.8" />
+    <PackageVersion Include="Rocket.Surgery.Conventions.AutoMapper" Version="8.0.0-beta.8" />
+    <PackageVersion Include="Rocket.Surgery.Hosting.TestHost" Version="10.0.0-beta.98" />
+    <PackageVersion Include="Rocket.Surgery.Extensions.Configuration" Version="11.0.1" />
+    <PackageVersion Include="Rocket.Surgery.Extensions.Configuration.Json" Version="11.0.1" />
+    <PackageVersion Include="Rocket.Surgery.Extensions.Configuration.Yaml" Version="11.0.1" />
+    <PackageVersion Include="Rocket.Surgery.DependencyInjection.Extensions" Version="11.0.1" />
+    <PackageVersion Include="Rocket.Surgery.Extensions" Version="11.0.1" />
     <PackageVersion Include="Rocket.Surgery.Hosting.DryIoc" Version="0.2.0-beta.3" />
     <PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting.DryIoc" Version="0.2.0-beta.3" />
-    <PackageVersion Include="Rocket.Surgery.Hosting" Version="10.0.0-beta.23" />
-    <PackageVersion Include="Rocket.Surgery.Hosting.Abstractions" Version="10.0.0-beta.23" />
-    <PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting" Version="10.0.0-beta.23" />
-    <PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting.TestHost" Version="10.0.0-beta.23" />
-    <PackageVersion Include="Rocket.Surgery.System" Version="10.0.0" />
+    <PackageVersion Include="Rocket.Surgery.Hosting" Version="10.0.0-beta.98" />
+    <PackageVersion Include="Rocket.Surgery.Hosting.Abstractions" Version="10.0.0-beta.98" />
+    <PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting" Version="10.0.0-beta.98" />
+    <PackageVersion Include="Rocket.Surgery.WebAssembly.Hosting.TestHost" Version="10.0.0-beta.98" />
+    <PackageVersion Include="Rocket.Surgery.System" Version="11.0.1" />
     <PackageVersion Include="Scrutor" Version="3.3.0" />
     <PackageVersion Include="Serilog" Version="2.10.0" />
     <PackageVersion Include="Serilog.AspNetCore" Version="3.4.0" />
-    <PackageVersion Include="Serilog.Enrichers.Demystify" Version="0.1.0-dev-*" />
+    <PackageVersion Include="Serilog.Enrichers.Demystify" Version="1.0.0-dev-00019" />
     <PackageVersion Include="Serilog.Enrichers.Environment" Version="2.1.3" />
     <PackageVersion Include="Serilog.Enrichers.Process" Version="2.0.1" />
     <PackageVersion Include="Serilog.Enrichers.Thread" Version="3.1.0" />
@@ -98,31 +96,32 @@
     <PackageVersion Include="Serilog.Sinks.Observable" Version="2.0.2" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="5.6.3" />
     <PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="5.6.3" />
-    <PackageVersion Include="SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime" Version="1.3.3" />
-    <PackageVersion Include="System.Collections.Immutable" Version="1.7.1" />
-    <PackageVersion Include="System.Interactive" Version="4.1.1" />
-    <PackageVersion Include="System.Interactive.Async" Version="4.1.1" />
-    <PackageVersion Include="System.Reactive" Version="4.4.1" />
-    <PackageVersion Include="System.Reactive.Observable.Aliases" Version="4.4.1" />
-    <PackageVersion Include="System.Text.Json" Version="4.7.2" />
-    <PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
-    <PackageVersion Include="NSwag.ApiDescription.Client" Version="13.8.2" />
-    <PackageVersion Include="Microsoft.Extensions.ApiDescription.Client" Version="3.1.8" />
-    <PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="3.1.8" />
+    <PackageVersion Include="SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime" Version="5.0.1" />
+    <PackageVersion Include="System.Collections.Immutable" Version="5.0.0" />
+    <PackageVersion Include="System.Interactive" Version="5.0.0" />
+    <PackageVersion Include="System.Interactive.Async" Version="5.0.0" />
+    <PackageVersion Include="System.Reactive" Version="5.0.0" />
+    <PackageVersion Include="System.Reactive.Observable.Aliases" Version="5.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="5.0.0" />
+    <PackageVersion Include="System.Net.Http.Json" Version="5.0.0" />
+    <PackageVersion Include="NSwag.ApiDescription.Client" Version="13.9.4" />
+    <PackageVersion Include="Microsoft.Extensions.ApiDescription.Client" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Bogus" Version="31.0.3" />
+    <PackageVersion Include="Bogus" Version="32.0.1" />
     <PackageVersion Include="coverlet.collector" Version="1.3.0" />
     <PackageVersion Include="coverlet.msbuild" Version="2.9.0" />
     <PackageVersion Include="FakeItEasy" Version="6.2.1" />
     <PackageVersion Include="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
     <PackageVersion Include="FluentAssertions" Version="5.10.3" />
     <PackageVersion Include="FluentAssertions.Analyzers" Version="0.11.4" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageVersion Include="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="5.3.0" />
-    <PackageVersion Include="Rocket.Surgery.Extensions.Testing.XUnit" Version="5.3.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageVersion Include="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="6.0.0" />
+    <PackageVersion Include="Rocket.Surgery.Extensions.Testing.XUnit" Version="6.0.0" />
     <PackageVersion Include="xunit" Version="2.4.1" />
     <PackageVersion Include="xunit.analyzers" Version="0.10.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)/Directory.Packages.support.props" Condition="Exists('$(MSBuildThisFileDirectory)/Directory.Packages.support.props')" />
 </Project>
diff --git a/Directory.Packages.support.props b/Directory.Packages.support.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1'">
+        <PackageVersion Update="Microsoft.AspNetCore.Components.Web" Version="3.1.8" />
+        <PackageVersion Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
+        <PackageVersion Update="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.8" />
+        <PackageVersion Update="System.Net.Http.Json" Version="3.2.1" />
+    </ItemGroup>
+</Project>
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 mode: ContinuousDeployment
-continuous-delivery-fallback-tag: beta
+continuous-delivery-fallback-tag: ci
 next-version: 0.1.0
 branches:
   next: