Fix issue with keyfile and signing. Also correct namespace to match project.

Author: CZEMacLeod

Directory.Build.targets

@@ -1,4 +1,51 @@
 <Project>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)'=='' AND EXISTS('$(MSBuildThisFileDirectory)build/cloud3d-codesign.snk')">$(MSBuildThisFileDirectory)build/cloud3d-codesign.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)'==''">$(MSBuildThisFileDirectory)build/Test.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly Condition="EXISTS('$(AssemblyOriginatorKeyFile)')">true</SignAssembly>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GenerateNuspecDependsOn>SetAuthors;SetPackageTags;SetPackageDescription;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
+  </PropertyGroup>
+
+  <Target Name="SetAuthors">
+    <RemoveDuplicates
+            Inputs="@(Author)">
+      <Output
+          TaskParameter="Filtered"
+          ItemName="_Author"/>
+    </RemoveDuplicates>
+    <PropertyGroup>
+      <Authors Condition="'@(_Author)'!=''">@(_Author, ',')</Authors>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="SetPackageTags">
+    <RemoveDuplicates
+            Inputs="@(PackageTag)">
+      <Output
+          TaskParameter="Filtered"
+          ItemName="_PackageTag"/>
+    </RemoveDuplicates>
+    <PropertyGroup>
+      <PackageTags Condition="'$(PackageTags)'==''">@(_PackageTag, ' ')</PackageTags>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="SetPackageDescription" DependsOnTargets="GetBuildVersion">
+    <PropertyGroup>
+      <PackageDescription>
+        Assembly Version: $(AssemblyVersion)
+        File Version: $(AssemblyFileVersion)
+        Informational Version: $(AssemblyInformationalVersion)
+        Build Configuration: $(Configuration)
+        $(AssemblyDescription)
+      </PackageDescription>
+    </PropertyGroup>
+    <Message Text="Package Description: $(PackageDescription)" Importance="high" />
+  </Target>
+
   <Target Name="PackIfChanged">
     <ItemGroup>
       <_Temporary Remove="@_Temporary)" />
@@ -30,7 +77,7 @@
       <_Temporary Remove="@_Temporary)" />
     </ItemGroup>
     <Message Importance="high" Text="CommitIDFound: $(CommitIDFound)" />
-    
+
     <!-- Pack libraries -->
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="Pack" Condition="'$(IsPackable)'=='true' AND '$(CommitIDFound)'=='true'" />
     <!-- Build sample and test projects to ensure they can build correctly -->

README.md

@@ -4,6 +4,9 @@ A set of Logging related packages, most that are based on `Microsoft.Extensions.
 
 ## C3D.Extensions.Logging.Xunit
 
+[![NuGet package](https://img.shields.io/nuget/v/C3D.Extensions.Logging.Xunit.svg)](https://nuget.org/packages/C3D.Extensions.Logging.Xunit)
+[![NuGet downloads](https://img.shields.io/nuget/dt/C3D.Extensions.Logging.Xunit.svg)](https://nuget.org/packages/C3D.Extensions.Logging.Xunit)
+
 An implementation of `Microsoft.Extensions.Logging` Loggers wrapping the `xunit` 'output' types `ITestOutputHelper` and `IMessageSink`.
 This allows you to take the logged output from things like hosting or SUT classes that take an `ILogger` and show it in the test output.
 

src/C3D/Extensions/Logging/Xunit/C3D.Extensions.Logging.Xunit.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
-    <RootNamespace>C3D.Core.Xunit.Logging</RootNamespace>
+    <RootNamespace>C3D.Extensions.Xunit.Logging</RootNamespace>
 
     <AssemblyTitle>$(AssemblyTitle) Logging</AssemblyTitle>
   </PropertyGroup>

src/C3D/Extensions/Logging/Xunit/Loggers/MessageSinkLogger.cs

@@ -2,7 +2,7 @@
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
-namespace C3D.Core.Xunit.Logging.Loggers;
+namespace C3D.Extensions.Xunit.Logging.Loggers;
 
 public class MessageSinkLogger : XunitLoggerBase
 {

src/C3D/Extensions/Logging/Xunit/Loggers/TextOutputLogger.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using Xunit.Abstractions;
 
-namespace C3D.Core.Xunit.Logging.Loggers;
+namespace C3D.Extensions.Xunit.Logging.Loggers;
 
 public class TextOutputLogger : XunitLoggerBase
 {

src/C3D/Extensions/Logging/Xunit/Loggers/XunitLoggerBase.cs

@@ -1,8 +1,8 @@
-using C3D.Core.Xunit.Logging.Loggers;
+using C3D.Extensions.Xunit.Logging.Loggers;
 using Microsoft.Extensions.Logging;
 using System.Text;
 
-namespace C3D.Core.Xunit.Logging.Loggers;
+namespace C3D.Extensions.Xunit.Logging.Loggers;
 
 public abstract class XunitLoggerBase : ILogger
 {

src/C3D/Extensions/Logging/Xunit/XunitLoggerOptions.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace C3D.Core.Xunit.Logging;
+namespace C3D.Extensions.Xunit.Logging;
 
 public enum XunitLoggerTimeStamp
 {

src/C3D/Extensions/Logging/Xunit/XunitLoggerProvider.cs

@@ -1,12 +1,12 @@
-using C3D.Core.Xunit.Logging.Loggers;
+using C3D.Extensions.Xunit.Logging.Loggers;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using Xunit.Abstractions;
 
-namespace C3D.Core.Xunit.Logging;
+namespace C3D.Extensions.Xunit.Logging;
 
 [ProviderAlias("Xunit")]
 public sealed class XunitLoggerProvider : ILoggerProvider

src/Directory.Build.Props

@@ -8,10 +8,10 @@
     <PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(MSBuildThisFileDirectory)..\packages\</PackageOutputPath>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
     <NoWarn>$(NoWarn);NU5128;SA0001</NoWarn>
+    <AssemblyTitle>C3D Extensions Logging</AssemblyTitle>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageTag Include="C3D" />
     <PackageTag Include="CZEM" />
     <PackageTag Include="Logging" />
   </ItemGroup>