Use xunit.v3.extensibility.core

Use `xunit.v3.extensibility.core` instead of `xunit.v3.common` and `xunit.v3.core` to resolve issues with the build.
martincostello · Dec 20, 2024 · 598689c · 598689c
1 parent b94281a
commit 598689c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -17,8 +17,7 @@
     <PackageVersion Include="xunit.extensibility.execution" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
     <PackageVersion Include="xunit.v3" Version="1.0.0" />
-    <PackageVersion Include="xunit.v3.common" Version="1.0.0" />
-    <PackageVersion Include="xunit.v3.core" Version="1.0.0" />
+    <PackageVersion Include="xunit.v3.extensibility.core" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
     <PackageReference Include="coverlet.msbuild" PrivateAssets="All" />

diff --git a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj
@@ -21,18 +21,9 @@
   <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
     <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
-  <!-- TODO Work out what properties are needed to correctly build the library without it appearing to be tests itself -->
-  <PropertyGroup Condition="false">
-    <GenerateProgramFile>false</GenerateProgramFile>
-    <GenerateSelfRegisteredExtensions>false</GenerateSelfRegisteredExtensions>
-    <GenerateTestingPlatformEntryPoint>false</GenerateTestingPlatformEntryPoint>
-    <IsTestProject>false</IsTestProject>
-    <XunitAutoGeneratedEntryPoint>false</XunitAutoGeneratedEntryPoint>
-  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" VersionOverride="8.0.1" />
-    <PackageReference Include="xunit.v3.common" />
-    <PackageReference Include="xunit.v3.core" />
+    <PackageReference Include="xunit.v3.extensibility.core" />
   </ItemGroup>
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.InteropServices.GuidAttribute">

diff --git a/tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj b/tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj
@@ -47,8 +47,4 @@
     <Using Include="Xunit.Sdk" />
     <Using Include="Xunit.v3" />
   </ItemGroup>
-  <!-- TODO Work out what properties are needed to correctly build the tests -->
-  <PropertyGroup>
-    <GenerateSelfRegisteredExtensions>false</GenerateSelfRegisteredExtensions>
-  </PropertyGroup>
 </Project>