Getting tests running for standard2.0 and 2.1, and some general c… (#16)

Getting tests running for standard2.0 and 2.1, and some general cleanup.
ekmsystems · Nov 5, 2019 · 796e37d · 796e37d
2 parents 0d440fc + 48b5ffe
commit 796e37d
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 269 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 version: '{build}'
-image: Visual Studio 2017
+image: Visual Studio 2019
 configuration: Release
 pull_requests:
   do_not_increment_build_number: true
@@ -17,7 +17,7 @@ environment:
   #- packages -> **\packages.config
 
 install:
-  - ps: choco install gitversion.portable -y -r --no-progress
+  - ps: choco install gitversion.portable -y -r --no-progress --version=4.0.0
   - ps: dotnet tool install --global coverlet.console
 
 assembly_info:

diff --git a/src/CoverageReports/.gitignore b/src/CoverageReports/.gitignore
@@ -0,0 +1 @@
+*.opencover.xml
diff --git a/src/CoverageResults/coverage.opencover.xml b/src/CoverageResults/coverage.opencover.xml
diff --git a/src/Serilog.Enrichers.CorrelationId.Tests/Enrichers/CorrelationIdEnricherTests.cs b/src/Serilog.Enrichers.CorrelationId.Tests/Enrichers/CorrelationIdEnricherTests.cs
@@ -1,9 +1,9 @@
-using FakeItEasy;
-using Microsoft.AspNetCore.Http;
+using FakeItEasy;
 using NUnit.Framework;
 using Serilog.Enrichers;
 using Serilog.Events;
 using Serilog.Tests.Support;
+using Microsoft.AspNetCore.Http;
 
 namespace Serilog.Tests.Enrichers
 {
@@ -20,7 +20,7 @@ public void SetUp()
 
         private IHttpContextAccessor _httpContextAccessor;
         private CorrelationIdEnricher _enricher;
-        
+
         [Test]
         public void When_CurrentHttpContextIsNotNull_Should_CreateCorrelationIdProperty()
         {
@@ -45,7 +45,7 @@ public void When_CurrentHttpContextIsNotNull_ShouldNot_CreateCorrelationIdProper
         {
             A.CallTo(() => _httpContextAccessor.HttpContext)
                 .Returns(null);
-            
+
             LogEvent evt = null;
             var log = new LoggerConfiguration()
                 .Enrich.With(_enricher)

diff --git a/src/Serilog.Enrichers.CorrelationId.Tests/Enrichers/CorrelationIdHeaderEnricherTests.cs b/src/Serilog.Enrichers.CorrelationId.Tests/Enrichers/CorrelationIdHeaderEnricherTests.cs
@@ -1,9 +1,9 @@
-using FakeItEasy;
-using Microsoft.AspNetCore.Http;
+using FakeItEasy;
 using NUnit.Framework;
 using Serilog.Enrichers;
 using Serilog.Events;
 using Serilog.Tests.Support;
+using Microsoft.AspNetCore.Http;
 
 namespace Serilog.Tests.Enrichers
 {
@@ -12,7 +12,7 @@ namespace Serilog.Tests.Enrichers
     public class CorrelationIdHeaderEnricherTests
     {
         private const string HeaderKey = "x-correlation-id";
-        
+
         [SetUp]
         public void SetUp()
         {
@@ -28,7 +28,7 @@ public void When_CorrelationIdNotInHeader_Should_CreateCorrelationIdProperty()
         {
             A.CallTo(() => _httpContextAccessor.HttpContext)
                 .Returns(new DefaultHttpContext());
-            
+
             LogEvent evt = null;
             var log = new LoggerConfiguration()
                 .Enrich.With(_enricher)

diff --git a/src/Serilog.Enrichers.CorrelationId.Tests/Serilog.Enrichers.CorrelationId.Tests.csproj b/src/Serilog.Enrichers.CorrelationId.Tests/Serilog.Enrichers.CorrelationId.Tests.csproj
@@ -1,22 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.0</TargetFramework>
+        <TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <RootNamespace>Serilog.Tests</RootNamespace>
-    </PropertyGroup>
-
+    </PropertyGroup>    
     <ItemGroup>
-        <PackageReference Include="FakeItEasy" Version="4.9.2" />
+        <PackageReference Include="FakeItEasy" Version="5.4.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
         <PackageReference Include="NUnit" Version="3.11.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
         <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
         <PackageReference Include="coverlet.msbuild" Version="2.7.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     </ItemGroup>
-
     <ItemGroup>
       <ProjectReference Include="..\Serilog.Enrichers.CorrelationId\Serilog.Enrichers.CorrelationId.csproj" />
     </ItemGroup>
-
 </Project>
diff --git a/src/Serilog.Enrichers.CorrelationId.nuspec b/src/Serilog.Enrichers.CorrelationId.nuspec
@@ -13,20 +13,23 @@
     <releaseNotes></releaseNotes>
     <copyright></copyright>
     <tags>serilog enrichers enricher correlationid correlation id</tags>
-
     <dependencies>
         <group targetFramework="net45">
             <dependency id="Serilog" version="2.4.0" />
         </group>
-
         <group targetFramework="netstandard2.0">
             <dependency id="Microsoft.AspNetCore.Http" version="2.1.1" />
             <dependency id="Serilog" version="2.7.1" />
         </group>
+        <group targetFramework="netstandard2.1">
+            <dependency id="Microsoft.AspNetCore.Http" version="2.2.2" />
+            <dependency id="Serilog" version="2.9.0" />
+        </group>
     </dependencies>  
   </metadata>
   <files>
       <file src="Serilog.Enrichers.CorrelationId\bin\$target$\net45\*.dll" target="lib/net45" />
       <file src="Serilog.Enrichers.CorrelationId\bin\$target$\netstandard2.0\*.dll" target="lib/netstandard2.0" />
+      <file src="Serilog.Enrichers.CorrelationId\bin\$target$\netstandard2.1\*.dll" target="lib/netstandard2.1" />
   </files>  
 </package>
diff --git a/src/Serilog.Enrichers.CorrelationId.sln b/src/Serilog.Enrichers.CorrelationId.sln
@@ -7,6 +7,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Enrichers.Correlati
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Enrichers.CorrelationId.Tests", "Serilog.Enrichers.CorrelationId.Tests\Serilog.Enrichers.CorrelationId.Tests.csproj", "{1979E570-3BB8-4DF4-B056-664A924442F8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ci_config", "ci_config", "{4012140B-49D7-48A8-A264-97AE936099CD}"
+ProjectSection(SolutionItems) = preProject
+	..\appveyor.yml = ..\appveyor.yml
+	..\GitVersion.yml = ..\GitVersion.yml
+	Serilog.Enrichers.CorrelationId.nuspec = Serilog.Enrichers.CorrelationId.nuspec
+EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/src/Serilog.Enrichers.CorrelationId/Enrichers/CorrelationIdHeaderEnricher.cs b/src/Serilog.Enrichers.CorrelationId/Enrichers/CorrelationIdHeaderEnricher.cs
@@ -21,7 +21,7 @@ public class CorrelationIdHeaderEnricher : ILogEventEnricher
         public CorrelationIdHeaderEnricher(string headerKey) : this(headerKey, new HttpContextAccessor())
         {
         }
-        
+
         internal CorrelationIdHeaderEnricher(string headerKey, IHttpContextAccessor contextAccessor)
         {
             _headerKey = headerKey;

diff --git a/src/Serilog.Enrichers.CorrelationId/Serilog.Enrichers.CorrelationId.csproj b/src/Serilog.Enrichers.CorrelationId/Serilog.Enrichers.CorrelationId.csproj
@@ -3,29 +3,31 @@
     <PropertyGroup>
         <AssemblyName>Serilog.Enrichers.CorrelationId</AssemblyName>
         <RootNamespace>Serilog</RootNamespace>
-        <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net45;netstandard2.0;netstandard2.1</TargetFrameworks>
         <LangVersion>7.3</LangVersion>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
         <DefineConstants>NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
     </PropertyGroup>
-
+    <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
+        <DefineConstants>NETCORE;NETSTANDARD;NETSTANDARD2_1</DefineConstants>
+    </PropertyGroup>
     <PropertyGroup Condition=" '$(TargetFramework)' == 'net45'">
         <DefineConstants>NET45;NETFULL</DefineConstants>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Serilog" Version="2.7.1" />
-    </ItemGroup>
-
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
         <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
+        <PackageReference Include="Serilog" Version="2.7.1" />
+    </ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
+        <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
+        <PackageReference Include="Serilog" Version="2.9.0" />
     </ItemGroup>
-
     <ItemGroup Condition=" '$(TargetFramework)' == 'net45'">
       <Reference Include="System.Web" />
+      <PackageReference Include="Serilog" Version="2.7.1" />
     </ItemGroup>
-
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ public class CorrelationIdHeaderEnricher : ILogEventEnricher @@
             public CorrelationIdHeaderEnricher(string headerKey) : this(headerKey, new HttpContextAccessor())
             {
             }
             internal CorrelationIdHeaderEnricher(string headerKey, IHttpContextAccessor contextAccessor)
             {
                 _headerKey = headerKey;
@@ Expand Down @@