From 29948ebf1d72e9c9aabd826dba53a8bd3fe4fe90 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Fri, 16 Aug 2024 15:59:15 +0100
Subject: [PATCH] Fix build

- Fix library not being packaged.
- Update compatibility suppressions for netstandard2.0 being removed.
- Bump version to 1.0.0.
---
 Directory.Build.props                                 | 6 ++++--
 src/Logging.XUnit/CompatibilitySuppressions.xml       | 8 ++++++++
 src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj | 3 ++-
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 src/Logging.XUnit/CompatibilitySuppressions.xml

diff --git a/Directory.Build.props b/Directory.Build.props
index 878a5548..5d62a551 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -26,6 +26,8 @@
     <LangVersion>latest</LangVersion>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <NeutralLanguage>en-US</NeutralLanguage>
+    <!-- TODO Remove when xunit v3 is stable -->
+    <NoWarn>$(NoWarn);NU5104</NoWarn>
     <NuGetAuditMode>direct</NuGetAuditMode>
     <Nullable>enable</Nullable>
     <PackageIcon></PackageIcon>
@@ -44,8 +46,8 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <UseArtifactsOutput>true</UseArtifactsOutput>
-    <AssemblyVersion>0.4.0.0</AssemblyVersion>
-    <VersionPrefix>0.4.1</VersionPrefix>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <VersionPrefix>1.0.0</VersionPrefix>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(GITHUB_ACTIONS)' != '' ">
     <VersionSuffix Condition=" '$(VersionSuffix)' == '' AND '$(GITHUB_HEAD_REF)' == '' ">beta.$(GITHUB_RUN_NUMBER)</VersionSuffix>
diff --git a/src/Logging.XUnit/CompatibilitySuppressions.xml b/src/Logging.XUnit/CompatibilitySuppressions.xml
new file mode 100644
index 00000000..b9c4ef03
--- /dev/null
+++ b/src/Logging.XUnit/CompatibilitySuppressions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETStandard,Version=v2.0</Target>
+  </Suppression>
+</Suppressions>
\ No newline at end of file
diff --git a/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj b/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj
index bd1db514..33b1bbe5 100644
--- a/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj
+++ b/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj
@@ -4,9 +4,10 @@
     <Description>Extensions for Microsoft.Extensions.Logging for xunit.</Description>
     <EnablePackageValidation>true</EnablePackageValidation>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IsPackable>true</IsPackable>
     <OutputType>Library</OutputType>
     <PackageId>MartinCostello.Logging.XUnit</PackageId>
-    <PackageValidationBaselineVersion>0.3.0</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion>0.4.0</PackageValidationBaselineVersion>
     <RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
     <Summary>$(Description)</Summary>
     <TargetFramework>net8.0</TargetFramework>