From 2e17f28f9ad24a71e1312743b4077ddb265a1dcb Mon Sep 17 00:00:00 2001
From: Amer Koleci <amerkoleci@gmail.com>
Date: Fri, 7 Oct 2022 12:30:36 +0200
Subject: [PATCH] Add netstandard2.1 support.

---
 src/Vortice.Win32.Direct3D11/DepthStencilDescription.cs    | 2 +-
 .../DepthStencilOperationDescription.cs                    | 2 +-
 .../Vortice.Win32.Direct3D11.csproj                        | 2 +-
 .../Vortice.Win32.Direct3D11on12.csproj                    | 2 +-
 .../Vortice.Win32.Direct3D12.csproj                        | 2 +-
 src/Vortice.Win32.Dxc/Vortice.Win32.Dxc.csproj             | 2 +-
 src/Vortice.Win32/Vortice.Win32.csproj                     | 7 +++++--
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Vortice.Win32.Direct3D11/DepthStencilDescription.cs b/src/Vortice.Win32.Direct3D11/DepthStencilDescription.cs
index 163896d..ecc93e6 100644
--- a/src/Vortice.Win32.Direct3D11/DepthStencilDescription.cs
+++ b/src/Vortice.Win32.Direct3D11/DepthStencilDescription.cs
@@ -58,7 +58,7 @@ public unsafe partial struct DepthStencilDescription
     /// </summary>
     /// <param name="depthEnable">Specifies whether to enable depth testing. Set this member to <b>true</b> to enable depth testing.</param>
     /// <param name="depthWriteEnable">Specifies a value that identifies a portion of the depth-stencil buffer that can be modified by depth data.</param>
-    /// <param name="depthFunc">A <see cref="ComparisonFunc"/> value that identifies a function that compares depth data against existing depth data.</param>
+    /// <param name="depthFunc">A <see cref="ComparisonFunction"/> value that identifies a function that compares depth data against existing depth data.</param>
     /// <param name="stencilEnable">Specifies whether to enable stencil testing. Set this member to <b>true</b> to enable stencil testing.</param>
     /// <param name="stencilReadMask">Identify a portion of the depth-stencil buffer for reading stencil data.</param>
     /// <param name="stencilWriteMask">Identify a portion of the depth-stencil buffer for writing stencil data.</param>
diff --git a/src/Vortice.Win32.Direct3D11/DepthStencilOperationDescription.cs b/src/Vortice.Win32.Direct3D11/DepthStencilOperationDescription.cs
index 248deb7..fdedbe7 100644
--- a/src/Vortice.Win32.Direct3D11/DepthStencilOperationDescription.cs
+++ b/src/Vortice.Win32.Direct3D11/DepthStencilOperationDescription.cs
@@ -16,7 +16,7 @@ public unsafe partial struct DepthStencilOperationDescription
     /// <param name="stencilFailOp">A <see cref="StencilOperation"/> value that identifies the stencil operation to perform when stencil testing fails.</param>
     /// <param name="stencilDepthFailOp">A <see cref="StencilOperation"/> value that identifies the stencil operation to perform when stencil testing passes and depth testing fails.</param>
     /// <param name="stencilPassOp">A <see cref="StencilOperation"/> value that identifies the stencil operation to perform when stencil testing and depth testing both pass.</param>
-    /// <param name="stencilFunc">A <see cref="ComparisonFunc"/> value that identifies the function that compares stencil data against existing stencil data.</param>
+    /// <param name="stencilFunc">A <see cref="ComparisonFunction"/> value that identifies the function that compares stencil data against existing stencil data.</param>
     public DepthStencilOperationDescription(StencilOperation stencilFailOp, StencilOperation stencilDepthFailOp, StencilOperation stencilPassOp, ComparisonFunction stencilFunc)
     {
         StencilFailOp = stencilFailOp;
diff --git a/src/Vortice.Win32.Direct3D11/Vortice.Win32.Direct3D11.csproj b/src/Vortice.Win32.Direct3D11/Vortice.Win32.Direct3D11.csproj
index c5ebea9..02b7ebc 100644
--- a/src/Vortice.Win32.Direct3D11/Vortice.Win32.Direct3D11.csproj
+++ b/src/Vortice.Win32.Direct3D11/Vortice.Win32.Direct3D11.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
     <Description>Direct3D11 bindings.</Description>
     
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Vortice.Win32.Direct3D11on12/Vortice.Win32.Direct3D11on12.csproj b/src/Vortice.Win32.Direct3D11on12/Vortice.Win32.Direct3D11on12.csproj
index 75b6738..bdff859 100644
--- a/src/Vortice.Win32.Direct3D11on12/Vortice.Win32.Direct3D11on12.csproj
+++ b/src/Vortice.Win32.Direct3D11on12/Vortice.Win32.Direct3D11on12.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
     <Description>Direct3D11on12 bindings.</Description>
     
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Vortice.Win32.Direct3D12/Vortice.Win32.Direct3D12.csproj b/src/Vortice.Win32.Direct3D12/Vortice.Win32.Direct3D12.csproj
index 24dd64c..d173e07 100644
--- a/src/Vortice.Win32.Direct3D12/Vortice.Win32.Direct3D12.csproj
+++ b/src/Vortice.Win32.Direct3D12/Vortice.Win32.Direct3D12.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
     <Description>Direct3D12 bindings.</Description>
     
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Vortice.Win32.Dxc/Vortice.Win32.Dxc.csproj b/src/Vortice.Win32.Dxc/Vortice.Win32.Dxc.csproj
index 1670469..05e3b78 100644
--- a/src/Vortice.Win32.Dxc/Vortice.Win32.Dxc.csproj
+++ b/src/Vortice.Win32.Dxc/Vortice.Win32.Dxc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
     <Description>DXC bindings.</Description>
     
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Vortice.Win32/Vortice.Win32.csproj b/src/Vortice.Win32/Vortice.Win32.csproj
index 35de665..312cd39 100644
--- a/src/Vortice.Win32/Vortice.Win32.csproj
+++ b/src/Vortice.Win32/Vortice.Win32.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
     <Description>Windows API low level bindings.</Description>
     
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -26,10 +26,13 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.Memory" Version="4.5.4" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
       <_Parameter1>Vortice.Win32.Direct3D11</_Parameter1>