Merge pull request #1 from jcasale/dev

Updates Serilog and adds tests.

Author: jcasale

.editorconfig

@@ -85,7 +85,7 @@ insert_final_newline = false
 #### .NET Coding Conventions ####
 
 # Organize usings
-dotnet_separate_import_directive_groups = false
+dotnet_separate_import_directive_groups = true
 dotnet_sort_system_directives_first = true
 
 # this. and Me. preferences

.github/workflows/main.yml

@@ -24,37 +24,28 @@ jobs:
 
       - name: Setup wix
         run: |
-          dotnet.exe tool install --global wix
+          dotnet.exe tool install --global wix --version 4.0.4 --verbosity diag
 
-          wix.exe extension add WixToolset.UI.wixext --global
+          wix.exe extension add WixToolset.UI.wixext/4.0.4 --global
+          wix.exe extension list --global
 
-          nuget.exe install WixToolset.Heat -NonInteractive
+          nuget.exe install WixToolset.Heat -Version 4.0.4 -NonInteractive -Verbosity detailed
           Get-ChildItem -Path .\WixToolset.Heat* -Recurse |
             Where-Object { $_.FullName.EndsWith('x64\heat.exe') } |
             Select-Object -ExpandProperty DirectoryName |
             Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-      - name: Generate module manifest and version properties
+      - name: Generate version property
         id: version
         run: |
-          New-Item ./publish -ItemType Directory -ErrorAction Stop |Out-Null
+          $tag = git.exe describe --tags --long
+          $version = [version]::new($tag.Split('-')[0].TrimStart('v'))
 
-          if ('${{ github.ref_type }}' -eq 'tag')
-          {
-              $tag = "${{ github.ref_name }}".TrimStart("v")
-              ./src/ModuleManifest.ps1 -Path ./publish/PSSerilog.psd1 -Verbose -ErrorAction Stop
-              ./src/VersionInfo.ps1 -Verbose -ErrorAction Stop
-          }
-          else
-          {
-              $tag = '0.0.1'
-              ./src/ModuleManifest.ps1 -Version $tag -Path ./publish/PSSerilog.psd1 -Verbose -ErrorAction Stop
-              ./src/VersionInfo.ps1 -Version $tag -Verbose -ErrorAction Stop
-          }
-
-          $version = [version]::new($tag)
           echo "version=$version" >> $env:GITHUB_OUTPUT
 
+      - name: Run tests
+        run: dotnet.exe test .\src\PSSerilog.sln
+
       - name: Clean solution
         run: dotnet.exe clean .\src\PSSerilog.sln --configuration Release
 

src/Directory.Build.props

@@ -7,6 +7,8 @@
     <Copyright>Copyright (c) Joseph L. Casale. All rights reserved.</Copyright>
   </PropertyGroup>
 
-  <Import Project=".\version.props" Condition="Exists('.\version.props')" />
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)StyleCop.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
 
 </Project>

src/ModuleManifest.ps1

@@ -8,8 +8,11 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C7EE16A6-CF23-46CF-8C33-E71E28353D0D}"
 	ProjectSection(SolutionItems) = preProject
 		..\.editorconfig = ..\.editorconfig
+		StyleCop.ruleset = StyleCop.ruleset
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{A071EC5E-47A2-4FF8-BA35-5B4DB360C203}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,6 +23,10 @@ Global
 		{9692ACAE-59C0-48A0-BB3F-26F5CD245239}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9692ACAE-59C0-48A0-BB3F-26F5CD245239}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9692ACAE-59C0-48A0-BB3F-26F5CD245239}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A071EC5E-47A2-4FF8-BA35-5B4DB360C203}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A071EC5E-47A2-4FF8-BA35-5B4DB360C203}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A071EC5E-47A2-4FF8-BA35-5B4DB360C203}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A071EC5E-47A2-4FF8-BA35-5B4DB360C203}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/PSSerilog.sln

@@ -2,6 +2,7 @@ namespace PSSerilog;
 
 using System;
 using System.Management.Automation;
+
 using Serilog;
 using Serilog.Core;
 using Serilog.Events;