Add net6.0 binary to xunit.assert

xunit · Oct 27, 2023 · a6b5cc4 · a6b5cc4
1 parent abc1dd3
commit a6b5cc4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/xunit.assert.nuspec b/src/xunit.assert.nuspec
@@ -11,14 +11,15 @@
     <icon>_content/logo-128-transparent.png</icon>
     <readme>_content/README.md</readme>
     <releaseNotes>https://xunit.net/releases/v2/$PackageVersion$</releaseNotes>
-    <description>Includes the assertion library from xUnit.net (xunit.assert.dll). Supports .NET Standard 1.1.</description>
+    <description>Includes the assertion library from xUnit.net (xunit.assert.dll). Supports .NET Standard 1.1+ and .NET 6.0+.</description>
     <copyright>Copyright (C) .NET Foundation</copyright>
     <repository type="git" url="https://github.com/xunit/xunit" commit="$GitCommitId$" />
     <dependencies>
       <group targetFramework="net452" />
       <group targetFramework="netstandard1.1">
         <dependency id="NETStandard.Library" version="1.6.1" />
       </group>
+      <group targetFramework="net6.0" />
     </dependencies>
   </metadata>
   <files>
@@ -27,5 +28,8 @@
 
     <file src="xunit.assert\bin\$Configuration$\netstandard1.1\xunit.assert.dll" target="lib\netstandard1.1\" />
     <file src="xunit.assert\bin\$Configuration$\netstandard1.1\xunit.assert.xml" target="lib\netstandard1.1\" />
+
+    <file src="xunit.assert\bin\$Configuration$\net6.0\xunit.assert.dll" target="lib\net6.0\" />
+    <file src="xunit.assert\bin\$Configuration$\net6.0\xunit.assert.xml" target="lib\net6.0\" />
   </files>
 </package>
diff --git a/src/xunit.assert/xunit.assert.csproj b/src/xunit.assert/xunit.assert.csproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);XUNIT_NULLABLE</DefineConstants>
+    <DefineConstants Condition=" '$(TargetFramework)' == 'netstandard1.1' ">$(DefineConstants);XUNIT_NULLABLE</DefineConstants>
+    <DefineConstants Condition=" '$(TargetFramework)' == 'net6.0' ">$(DefineConstants);XUNIT_IMMUTABLE_COLLECTIONS;XUNIT_NULLABLE;XUNIT_SPAN;XUNIT_VALUETASK</DefineConstants>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Nullable>enable</Nullable>
-    <TargetFramework>netstandard1.1</TargetFramework>
+    <TargetFrameworks>netstandard1.1;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/test.xunit.assert/test.xunit.assert.csproj b/test/test.xunit.assert/test.xunit.assert.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>test.xunit.assert</AssemblyName>
     <DefineConstants>$(DefineConstants);XUNIT_FRAMEWORK;XUNIT_NULLABLE</DefineConstants>
     <Nullable>enable</Nullable>
-    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp2.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>