#49 cross-target all projects to netcoreapp3.1 and net5.0

sitkoru · Sep 21, 2020 · 291777a · 291777a
1 parent aa7a41a
commit 291777a
Show file tree

Hide file tree

Showing 47 changed files with 242 additions and 128 deletions.
diff --git a/src/Sitko.Core.App.Web/Sitko.Core.App.Web.csproj b/src/Sitko.Core.App.Web/Sitko.Core.App.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
@@ -22,11 +22,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="3.1.1" />
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="3.1.2" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.8" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.8" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.0-rc.1.20451.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.0-rc.1.20451.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-rc.1.20451.17" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Sitko.Core.App/Sitko.Core.App.csproj b/src/Sitko.Core.App/Sitko.Core.App.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <!--<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>-->
@@ -20,26 +20,39 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Flurl.Http" Version="2.4.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Serilog.Exceptions" Version="5.6.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Scrutor" Version="3.2.2" />
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
+    <PackageReference Include="Flurl.Http" Version="2.4.2"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Serilog.Exceptions" Version="5.6.0"/>
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1"/>
+    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0"/>
+    <PackageReference Include="Scrutor" Version="3.2.2"/>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8"/>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8"/>
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.8"/>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.8"/>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8"/>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8"/>
+    <PackageReference Include="System.Text.Json" Version="4.7.2"/>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0-rc.1.20451.14"/>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0-rc.1.20451.14"/>
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.0-rc.1.20451.17"/>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0-rc.1.20451.14"/>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-rc.1.20451.14"/>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0-rc.1.20451.14"/>
+    <PackageReference Include="System.Text.Json" Version="5.0.0-rc.1.20451.14"/>
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
-    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\" />
-    <None Pack="true" PackagePath="buildTransitive" Include="Build\**\*.xml; Build\**\*.props; Build\**\*.targets;" />
+    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md"/>
+    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\"/>
+    <None Pack="true" PackagePath="buildTransitive" Include="Build\**\*.xml; Build\**\*.props; Build\**\*.targets;"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Sitko.Core.Auth.Basic/Sitko.Core.Auth.Basic.csproj b/src/Sitko.Core.Auth.Basic/Sitko.Core.Auth.Basic.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <!--<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>-->

diff --git a/src/Sitko.Core.Auth.IdentityServer/Sitko.Core.Auth.IdentityServer.csproj b/src/Sitko.Core.Auth.IdentityServer/Sitko.Core.Auth.IdentityServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <!--<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>-->
@@ -17,20 +17,29 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.OpenIdConnectServer" Version="3.1.1" />
-    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.8" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="AspNetCore.HealthChecks.OpenIdConnectServer" Version="3.1.1"/>
+    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.8"/>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.8"/>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.0-rc.1.20451.17"/>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.0-rc.1.20451.17"/>
+  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\Sitko.Core.Auth\Sitko.Core.Auth.csproj" />
+    <ProjectReference Include="..\Sitko.Core.Auth\Sitko.Core.Auth.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
-    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\" />
+    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md"/>
+    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\"/>
   </ItemGroup>
 </Project>
diff --git a/src/Sitko.Core.Auth/Sitko.Core.Auth.csproj b/src/Sitko.Core.Auth/Sitko.Core.Auth.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <!--<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>-->

diff --git a/src/Sitko.Core.Automapper/Sitko.Core.Automapper.csproj b/src/Sitko.Core.Automapper/Sitko.Core.Automapper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <!--<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>-->

diff --git a/src/Sitko.Core.Caching/Sitko.Core.Caching.csproj b/src/Sitko.Core.Caching/Sitko.Core.Caching.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <!--<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>-->
@@ -17,17 +17,26 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <NoWarn>8600,8601,8603,8605,8618,8625,8629</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.8"/>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8"/>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-rc.1.20451.14"/>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-rc.1.20451.14"/>
+  </ItemGroup>
+
   <ItemGroup>
-    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
-    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\" />
+    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md"/>
+    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\"/>
   </ItemGroup>
 </Project>
diff --git a/src/Sitko.Core.Consul.Web/ConsulWebModule.cs b/src/Sitko.Core.Consul.Web/ConsulWebModule.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Consul;
 using Microsoft.Extensions.Configuration;
@@ -10,23 +9,26 @@
 
 namespace Sitko.Core.Consul.Web
 {
-    public class ConsulWebModule : BaseApplicationModule<ConsulWebModuleConfig>
+    public class ConsulWebModule : ConsulModule<ConsulWebModuleConfig>
     {
         public ConsulWebModule(ConsulWebModuleConfig config, Application application) : base(config, application)
         {
         }
 
-        public override List<Type> GetRequiredModules()
-        {
-            return new List<Type> {typeof(ConsulModule)};
-        }
-
         public override void ConfigureServices(IServiceCollection services, IConfiguration configuration,
             IHostEnvironment environment)
         {
             base.ConfigureServices(services, configuration, environment);
             services.AddSingleton<ConsulWebClient>();
-            services.AddHealthChecks().AddCheck<ConsulWebHealthCheck>("Consul registration");
+            services.AddHealthChecks()
+                .AddCheck<ConsulWebHealthCheck>("Consul registration")
+                .AddConsul(options =>
+                {
+                    var uri = new Uri(Config.ConsulUri);
+                    options.HostName = uri.Host;
+                    options.Port = uri.Port;
+                    options.RequireHttps = false;
+                });
         }
 
         public override Task ApplicationStarted(IConfiguration configuration, IHostEnvironment environment,

diff --git a/src/Sitko.Core.Consul.Web/ConsulWebModuleConfig.cs b/src/Sitko.Core.Consul.Web/ConsulWebModuleConfig.cs
@@ -2,7 +2,7 @@
 
 namespace Sitko.Core.Consul.Web
 {
-    public class ConsulWebModuleConfig
+    public class ConsulWebModuleConfig : ConsulModuleConfig
     {
         public string? IpAddress { get; set; }
         public Uri? ServiceUri { get; set; }

diff --git a/src/Sitko.Core.Consul.Web/Sitko.Core.Consul.Web.csproj b/src/Sitko.Core.Consul.Web/Sitko.Core.Consul.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
@@ -24,6 +24,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Sitko.Core.App.Web\Sitko.Core.App.Web.csproj"/>
     <ProjectReference Include="..\Sitko.Core.Consul\Sitko.Core.Consul.csproj"/>
+    <PackageReference Include="AspNetCore.HealthChecks.Consul" Version="3.1.1"/>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Sitko.Core.Consul/ConsulModule.cs b/src/Sitko.Core.Consul/ConsulModule.cs
@@ -7,9 +7,14 @@
 
 namespace Sitko.Core.Consul
 {
-    public class ConsulModule : BaseApplicationModule<ConsulModuleConfig>
+    public interface IConsulModule
     {
-        public ConsulModule(ConsulModuleConfig config, Application application) : base(config,
+    }
+
+    public class ConsulModule<TConfig> : BaseApplicationModule<TConfig>, IConsulModule
+        where TConfig : ConsulModuleConfig, new()
+    {
+        public ConsulModule(TConfig config, Application application) : base(config,
             application)
         {
         }
@@ -23,13 +28,6 @@ public override void ConfigureServices(IServiceCollection services, IConfigurati
                 var options = p.GetRequiredService<ConsulModuleConfig>();
                 return new ConsulClient(config => { config.Address = new Uri(options.ConsulUri); });
             });
-            services.AddHealthChecks().AddConsul(options =>
-            {
-                var uri = new Uri(Config.ConsulUri);
-                options.HostName = uri.Host;
-                options.Port = uri.Port;
-                options.RequireHttps = false;
-            });
         }
     }
 

diff --git a/src/Sitko.Core.Consul/Sitko.Core.Consul.csproj b/src/Sitko.Core.Consul/Sitko.Core.Consul.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <!--<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>-->
@@ -23,9 +23,8 @@
   <ItemGroup>
     <ProjectReference Include="..\Sitko.Core.App\Sitko.Core.App.csproj"/>
   </ItemGroup>
-
+  
   <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.Consul" Version="3.1.1"/>
     <!-- https://github.com/SonicGD/consuldotnet cause original lib is dead Wait for https://github.com/G-Research/consuldotnet/pull/22 -->
     <PackageReference Include="Consul.GRPC" Version="0.7.2.6"/>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>

diff --git a/src/Sitko.Core.Db.InMemory/Sitko.Core.Db.InMemory.csproj b/src/Sitko.Core.Db.InMemory/Sitko.Core.Db.InMemory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <!--<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>-->
@@ -17,18 +17,26 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.8" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.8"/>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-rc.1.20451.13"/>
+  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\Sitko.Core.Db\Sitko.Core.Db.csproj" />
+    <ProjectReference Include="..\Sitko.Core.Db\Sitko.Core.Db.csproj"/>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
-    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\" />
+    <None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md"/>
+    <None Include="..\..\packageIcon.png" Pack="true" PackagePath="\"/>
   </ItemGroup>
 </Project>