diff --git a/PInvoke/CfgMgr32/Vanara.PInvoke.CfgMgr32.csproj b/PInvoke/CfgMgr32/Vanara.PInvoke.CfgMgr32.csproj
index bf9ec981..72d92ff5 100644
--- a/PInvoke/CfgMgr32/Vanara.PInvoke.CfgMgr32.csproj
+++ b/PInvoke/CfgMgr32/Vanara.PInvoke.CfgMgr32.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <Description>PInvoke API (methods, structures and constants) imported from Windows CfgMgr32.dll.</Description>
     <AssemblyTitle>$(AssemblyName)</AssemblyTitle>
-    <TargetFrameworks>net20;net35;net40;net45;net5.0-windows;net6.0-windows;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net45;net5.0;net6.0;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Vanara.PInvoke.CfgMgr32</AssemblyName>
     <PackageId>$(AssemblyName)</PackageId>
     <PackageTags>pinvoke;vanara;net-extensions;interop;CfgMgr32</PackageTags>
diff --git a/PInvoke/CimFs/Vanara.PInvoke.CimFs.csproj b/PInvoke/CimFs/Vanara.PInvoke.CimFs.csproj
index a8f17836..5815af9a 100644
--- a/PInvoke/CimFs/Vanara.PInvoke.CimFs.csproj
+++ b/PInvoke/CimFs/Vanara.PInvoke.CimFs.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <Description>PInvoke API (methods, structures and constants) imported from Windows CimFs.dll.</Description>
     <AssemblyTitle>$(AssemblyName)</AssemblyTitle>
-    <TargetFrameworks>net20;net35;net40;net45;net5.0-windows;net6.0-windows;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net45;net5.0;net6.0;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Vanara.PInvoke.CimFs</AssemblyName>
     <PackageId>$(AssemblyName)</PackageId>
     <PackageTags>pinvoke;vanara;net-extensions;interop;Cim;CimFs</PackageTags>
diff --git a/PInvoke/EnhancedStorage/Vanara.PInvoke.EnhancedStorage.csproj b/PInvoke/EnhancedStorage/Vanara.PInvoke.EnhancedStorage.csproj
index c1992fa8..2e38a0c7 100644
--- a/PInvoke/EnhancedStorage/Vanara.PInvoke.EnhancedStorage.csproj
+++ b/PInvoke/EnhancedStorage/Vanara.PInvoke.EnhancedStorage.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <Description>PInvoke API (methods, structures and constants) imported from Windows EnhancedStorage.dll.</Description>
     <AssemblyTitle>$(AssemblyName)</AssemblyTitle>
-    <TargetFrameworks>net20;net35;net40;net45;net5.0-windows;net6.0-windows;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net45;net5.0;net6.0;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Vanara.PInvoke.EnhancedStorage</AssemblyName>
     <PackageId>$(AssemblyName)</PackageId>
     <PackageTags>pinvoke;vanara;net-extensions;interop;EnhancedStorage</PackageTags>
diff --git a/PInvoke/FhSvcCtl/Vanara.PInvoke.FhSvcCtl.csproj b/PInvoke/FhSvcCtl/Vanara.PInvoke.FhSvcCtl.csproj
index 020ab23a..50c8445d 100644
--- a/PInvoke/FhSvcCtl/Vanara.PInvoke.FhSvcCtl.csproj
+++ b/PInvoke/FhSvcCtl/Vanara.PInvoke.FhSvcCtl.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <Description>PInvoke API (methods, structures and constants) imported from Windows FhSvcCtl.dll.</Description>
     <AssemblyTitle>$(AssemblyName)</AssemblyTitle>
-    <TargetFrameworks>net20;net35;net40;net45;net5.0-windows;net6.0-windows;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net45;net5.0;net6.0;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Vanara.PInvoke.FhSvcCtl</AssemblyName>
     <PackageId>$(AssemblyName)</PackageId>
     <PackageTags>pinvoke;vanara;net-extensions;interop;FhSvcCtl;file history</PackageTags>
diff --git a/PInvoke/IMAPI/Vanara.PInvoke.IMAPI.csproj b/PInvoke/IMAPI/Vanara.PInvoke.IMAPI.csproj
index d8912a75..64523a68 100644
--- a/PInvoke/IMAPI/Vanara.PInvoke.IMAPI.csproj
+++ b/PInvoke/IMAPI/Vanara.PInvoke.IMAPI.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <Description>PInvoke API (interfaces and constants) imported from Windows Image Mastering API.</Description>
     <AssemblyTitle>$(AssemblyName)</AssemblyTitle>
-    <TargetFrameworks>net20;net35;net40;net45;net5.0-windows;net6.0-windows;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net45;net5.0;net6.0;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Vanara.PInvoke.IMAPI</AssemblyName>
     <PackageId>$(AssemblyName)</PackageId>
     <PackageTags>pinvoke;vanara;net-extensions;interop;IMAPI;Image Mastering</PackageTags>
diff --git a/PInvoke/Lz32/Vanara.PInvoke.Lz32.csproj b/PInvoke/Lz32/Vanara.PInvoke.Lz32.csproj
index 59d9f3c0..17a3b7c7 100644
--- a/PInvoke/Lz32/Vanara.PInvoke.Lz32.csproj
+++ b/PInvoke/Lz32/Vanara.PInvoke.Lz32.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <Description>PInvoke API (methods, structures and constants) imported from Windows Lz32.dll.</Description>
     <AssemblyTitle>$(AssemblyName)</AssemblyTitle>
-    <TargetFrameworks>net20;net35;net40;net45;net5.0-windows;net6.0-windows;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net45;net5.0;net6.0;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Vanara.PInvoke.Lz32</AssemblyName>
     <PackageId>$(AssemblyName)</PackageId>
     <PackageTags>pinvoke;vanara;net-extensions;interop;Lz32;compression</PackageTags>
diff --git a/PInvoke/Multimedia/Vanara.PInvoke.Multimedia.csproj b/PInvoke/Multimedia/Vanara.PInvoke.Multimedia.csproj
index 15c54abc..dcc9d26f 100644
--- a/PInvoke/Multimedia/Vanara.PInvoke.Multimedia.csproj
+++ b/PInvoke/Multimedia/Vanara.PInvoke.Multimedia.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <Description>PInvoke API (methods, structures and constants) imported from Windows Multimedia (avicap32.dll, avifil32.dll, msacm32.dll, msvfw32.dll, winmm.dll).</Description>
     <AssemblyTitle>$(AssemblyName)</AssemblyTitle>
-    <TargetFrameworks>net20;net35;net40;net45;net5.0-windows;net6.0-windows;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net45;net5.0;net6.0;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Vanara.PInvoke.Multimedia</AssemblyName>
     <PackageId>$(AssemblyName)</PackageId>
     <PackageTags>pinvoke;vanara;net-extensions;interop;winmm;windows multimedia;wav;waveform;audio;msacm32;avifil32</PackageTags>
diff --git a/PInvoke/PortableDeviceApi/Vanara.PInvoke.PortableDeviceApi.csproj b/PInvoke/PortableDeviceApi/Vanara.PInvoke.PortableDeviceApi.csproj
index 347ff843..f053b1f9 100644
--- a/PInvoke/PortableDeviceApi/Vanara.PInvoke.PortableDeviceApi.csproj
+++ b/PInvoke/PortableDeviceApi/Vanara.PInvoke.PortableDeviceApi.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <Description>PInvoke API (methods, structures and constants) imported from Windows Portable Device (WPD) Api.</Description>
     <AssemblyTitle>$(AssemblyName)</AssemblyTitle>
-    <TargetFrameworks>net20;net35;net40;net45;net5.0-windows;net6.0-windows;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net45;net5.0;net6.0;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Vanara.PInvoke.PortableDeviceApi</AssemblyName>
     <PackageId>$(AssemblyName)</PackageId>
     <PackageTags>pinvoke;vanara;net-extensions;interop;WPD;PortableDeviceApi</PackageTags>
diff --git a/PInvoke/TextServicesFramework/Vanara.PInvoke.TextServicesFramework.csproj b/PInvoke/TextServicesFramework/Vanara.PInvoke.TextServicesFramework.csproj
index de86de57..26e965b7 100644
--- a/PInvoke/TextServicesFramework/Vanara.PInvoke.TextServicesFramework.csproj
+++ b/PInvoke/TextServicesFramework/Vanara.PInvoke.TextServicesFramework.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <Description>PInvoke API (methods, structures and constants) imported from Windows Text Services Framework modules.</Description>
     <AssemblyTitle>$(AssemblyName)</AssemblyTitle>
-    <TargetFrameworks>net20;net35;net40;net45;net5.0-windows;net6.0-windows;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net45;net5.0;net6.0;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Vanara.PInvoke.TextServicesFramework</AssemblyName>
     <PackageId>$(AssemblyName)</PackageId>
     <PackageTags>pinvoke;vanara;net-extensions;interop;Text Services Framework;msctf</PackageTags>
diff --git a/PInvoke/WinBio/Vanara.PInvoke.WinBio.csproj b/PInvoke/WinBio/Vanara.PInvoke.WinBio.csproj
index b2f12cff..0842ec59 100644
--- a/PInvoke/WinBio/Vanara.PInvoke.WinBio.csproj
+++ b/PInvoke/WinBio/Vanara.PInvoke.WinBio.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <Description>PInvoke API (methods, structures and constants) imported from Windows WinBio.dll.</Description>
     <AssemblyTitle>$(AssemblyName)</AssemblyTitle>
-    <TargetFrameworks>net20;net35;net40;net45;net5.0-windows;net6.0-windows;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net45;net5.0;net6.0;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Vanara.PInvoke.WinBio</AssemblyName>
     <PackageId>$(AssemblyName)</PackageId>
     <PackageTags>pinvoke;vanara;net-extensions;interop;WinBio;windows biometric framework;biometric</PackageTags>