cross-framework (netcore3.0 added); packages updated

justdmitry · Nov 26, 2019 · 102465e · 102465e
1 parent ccdabe4
commit 102465e
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 27 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 version: N{build}
 configuration: Debug
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 before_build:
 - cmd: dotnet restore

diff --git a/sample/RecurrentTasks.Sample/RecurrentTasks.Sample.csproj b/sample/RecurrentTasks.Sample/RecurrentTasks.Sample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>RecurrentTasks.Sample</AssemblyName>
     <OutputType>Exe</OutputType>
@@ -15,11 +15,13 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.4" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\RecurrentTasks\RecurrentTasks.csproj" />
   </ItemGroup>

diff --git a/sample/RecurrentTasks.Sample/Startup.cs b/sample/RecurrentTasks.Sample/Startup.cs
@@ -17,12 +17,21 @@ public void ConfigureServices(IServiceCollection services)
             // SampleTask expect this instance in .ctor(), we need to register it in DI
             services.AddSingleton<SampleTaskRunHistory>();
 
+#if NETCOREAPP2_1
             services.AddMvc();
+#else
+            services.AddControllersWithViews();
+#endif
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
+#if NETCOREAPP2_1
             app.UseMvcWithDefaultRoute();
+#else
+            app.UseRouting();
+            app.UseEndpoints(c => c.MapDefaultControllerRoute());
+#endif
         }
     }
 }
diff --git a/src/RecurrentTasks/RecurrentTasks.csproj b/src/RecurrentTasks/RecurrentTasks.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Copyright>Dmitry Popov, 2016-2019</Copyright>
     <AssemblyTitle>RecurrentTasks</AssemblyTitle>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
     <AssemblyName>RecurrentTasks</AssemblyName>
     <PackageId>RecurrentTasks</PackageId>
     <PackageTags>task;job;recurrent;recurring;aspnetcore</PackageTags>
@@ -28,12 +28,18 @@
     <Compile Include="..\..\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/test/RecurrentTasks.Tests/RecurrentTasks.Tests.csproj b/test/RecurrentTasks.Tests/RecurrentTasks.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
     <AssemblyName>RecurrentTasks.Tests</AssemblyName>
     <PackageId>RecurrentTasks.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -10,22 +10,30 @@
     <Compile Include="..\..\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Codecov" Version="1.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
-    <PackageReference Include="Moq" Version="4.10.0" />
-    <PackageReference Include="OpenCover" Version="4.6.519" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
+    <PackageReference Include="Codecov" Version="1.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Moq" Version="4.13.1" />
+    <PackageReference Include="OpenCover" Version="4.7.922" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\RecurrentTasks\RecurrentTasks.csproj" />
   </ItemGroup>

diff --git a/test/RecurrentTasks.Tests/TaskRunnerTests.cs b/test/RecurrentTasks.Tests/TaskRunnerTests.cs
@@ -16,17 +16,15 @@ public class TaskRunnerTests : IDisposable
 
         public TaskRunnerTests()
         {
-            var lf = new LoggerFactory();
-            lf.AddConsole();
-
             var serviceProvider = new ServiceCollection()
+                .AddLogging(lb => lb.AddConsole())
                 .AddTransient(_ => new SampleTask(settings))
                 .BuildServiceProvider();
 
             var options = new TaskOptions<SampleTask>();
             options.FirstRunDelay = TimeSpan.Zero;
 
-            sampleTask = new TaskRunner<SampleTask>(lf, options, serviceProvider.GetService<IServiceScopeFactory>());
+            sampleTask = new TaskRunner<SampleTask>(serviceProvider.GetService<ILoggerFactory>(), options, serviceProvider.GetService<IServiceScopeFactory>());
             sampleTask.Options.Interval = TimeSpan.FromSeconds(5);
         }
 

diff --git a/testpublishreport.ps1 b/testpublishreport.ps1
@@ -1,7 +1,7 @@
 # General configurations, such as location of the code coverage report, location of the OpenCover and location of .NET
 $resultsFile = 'opencover-result.xml'
-$openCoverConsole = $ENV:USERPROFILE + '\.nuget\packages\OpenCover\4.6.519\tools\OpenCover.Console.exe'
-$codecovUploader = $ENV:USERPROFILE + '\.nuget\packages\codecov\1.1.0\tools\codecov.exe'
+$openCoverConsole = $ENV:USERPROFILE + '\.nuget\packages\OpenCover\4.7.922\tools\OpenCover.Console.exe'
+$codecovUploader = $ENV:USERPROFILE + '\.nuget\packages\codecov\1.9.0\tools\codecov.exe'
 $target = '-target: C:\Program Files\dotnet\dotnet.exe'
 
 # Configuration and execution of the tests