project cleanup

- PackageLicenseExpression instead of PackageLicense
- PackageIcon instead of PackageIconUrl
- new platforms for tests: netcoreapp3.0, netcoreapp2.2
- remove unused CommonAssemblyInfo.cs

Author: sungam3r

Build.ps1

@@ -2,7 +2,7 @@ echo "build: Build started"
 
 Push-Location $PSScriptRoot
 
-if(Test-Path .\artifacts) {
+if (Test-Path .\artifacts) {
 	echo "build: Cleaning .\artifacts"
 	Remove-Item .\artifacts -Force -Recurse
 }
@@ -24,14 +24,14 @@ foreach ($src in ls src/*) {
 	echo "build: Packaging project in $src"
 
     & dotnet build -c Release --version-suffix=$buildSuffix
-    if($LASTEXITCODE -ne 0) { exit 1 }    
+    if ($LASTEXITCODE -ne 0) { exit 1 }    
 
     if ($suffix) {
 	& dotnet pack -c Release --include-source -o ..\..\artifacts --version-suffix=$suffix --no-build
     } else {
 	& dotnet pack -c Release --include-source -o ..\..\artifacts --no-build
     }
-    if($LASTEXITCODE -ne 0) { exit 1 }    
+    if ($LASTEXITCODE -ne 0) { exit 1 }    
 
     Pop-Location
 }
@@ -42,7 +42,7 @@ foreach ($test in ls test/*.Tests) {
 	echo "build: Testing project in $test"
 
     & dotnet test -c Release
-    if($LASTEXITCODE -ne 0) { exit 3 }
+    if ($LASTEXITCODE -ne 0) { exit 3 }
 
     Pop-Location
 }

appveyor.yml

@@ -1,6 +1,6 @@
 version: '{build}'
 skip_tags: true
-image: Visual Studio 2017
+image: Visual Studio 2019
 configuration: Release
 test: off
 build_script:

assets/CommonAssemblyInfo.cs

@@ -1,11 +1,22 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.12
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29503.13
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Destructurama.JsonNet", "src\Destructurama.JsonNet\Destructurama.JsonNet.csproj", "{A79F906E-0298-49DC-93EC-CE4F1F5D13E2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Destructurama.JsonNet", "src\Destructurama.JsonNet\Destructurama.JsonNet.csproj", "{A79F906E-0298-49DC-93EC-CE4F1F5D13E2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Destructurama.JsonNet.Tests", "test\Destructurama.JsonNet.Tests\Destructurama.JsonNet.Tests.csproj", "{182ECDA3-A97D-4BB6-BC6F-60A137478B92}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Destructurama.JsonNet.Tests", "test\Destructurama.JsonNet.Tests\Destructurama.JsonNet.Tests.csproj", "{182ECDA3-A97D-4BB6-BC6F-60A137478B92}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{213D204A-57AB-4450-9B11-8BD26B1BCAD3}"
+	ProjectSection(SolutionItems) = preProject
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		appveyor.yml = appveyor.yml
+		Build.ps1 = Build.ps1
+		CHANGES.md = CHANGES.md
+		LICENSE = LICENSE
+		README.md = README.md
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,4 +36,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2E880E39-B4F2-4E27-AF13-528DF2CE4651}
+	EndGlobalSection
 EndGlobal

assets/icon.png

@@ -1,30 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net452;netcoreapp1.1;netstandard2.0</TargetFrameworks>
     <RootNamespace>Destructurama</RootNamespace>
     <SignAssembly>True</SignAssembly>
+    <LangVersion>latest</LangVersion>
     <AssemblyOriginatorKeyFile>..\..\assets\Destructurama.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
     <Authors>Destructurama Contributors</Authors>
     <Description>Adds support for logging JSON.NET dynamic types as structured data with Serilog.</Description>
     <PackageTags>serilog json</PackageTags>
     <PackageProjectUrl>https://github.com/destructurama</PackageProjectUrl>
-    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
-    <PackageIconUrl>http://destructurama.github.io/pages/images/destructurama.png</PackageIconUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageIcon>icon.png</PackageIcon>
     <Product />
     <Company />
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <VersionPrefix>1.2.2</VersionPrefix>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\Destructurama.JsonNet.xml</DocumentationFile>
-    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="..\assets\Destructurama.snk" Link="Destructurama.snk" />
+    <None Include="..\..\assets\icon.png" Pack="true" PackagePath=""/>
   </ItemGroup>
 
   <ItemGroup>

destructurama-json-net.sln

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>    
-    <TargetFrameworks>net452;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp1.1;netcoreapp2.2;netcoreapp3.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/Destructurama.JsonNet/Destructurama.JsonNet.csproj

@@ -11,8 +11,7 @@ public class DelegatingSink : ILogEventSink
 
         public DelegatingSink(Action<LogEvent> write)
         {
-            if (write == null) throw new ArgumentNullException("write");
-            _write = write;
+            _write = write ?? throw new ArgumentNullException("write");
         }
 
         public void Emit(LogEvent logEvent)