From fdcd7e93a190635d91050ec349431f1570fb1bbe Mon Sep 17 00:00:00 2001
From: dahall <dahall@byu.net>
Date: Thu, 11 Jun 2020 11:52:26 -0600
Subject: [PATCH] Updated NuGet packages

---
 Core/Vanara.Core.csproj                              | 2 +-
 PInvoke/Shared/Vanara.PInvoke.Shared.csproj          | 2 +-
 System/Vanara.SystemServices.csproj                  | 2 +-
 UnitTests/BITS/BITS.csproj                           | 4 +++-
 UnitTests/CSharpRunner/Shared.csproj                 | 6 ++++--
 UnitTests/Core/Core.csproj                           | 4 +++-
 UnitTests/ExplorerBrowser/ExplorerBrowserDemo.csproj | 4 +++-
 UnitTests/ExplorerBrowser/app.config                 | 3 ---
 UnitTests/PInvoke/AclUI/AclUI.csproj                 | 4 +++-
 UnitTests/PInvoke/BITS/BITS.csproj                   | 4 +++-
 UnitTests/PInvoke/Cabinet/Cabinet.csproj             | 4 +++-
 UnitTests/PInvoke/CldApi/CldApi.csproj               | 4 +++-
 UnitTests/PInvoke/ComCtl32/ComCtl32.csproj           | 4 +++-
 UnitTests/PInvoke/CredUI/CredUI.csproj               | 4 +++-
 UnitTests/PInvoke/Cryptography/Cryptography.csproj   | 4 +++-
 UnitTests/PInvoke/DnsApi/DnsApi.csproj               | 4 +++-
 UnitTests/PInvoke/DwmApi/DwmApi.csproj               | 4 +++-
 UnitTests/PInvoke/Gdi32/Gdi32.csproj                 | 4 +++-
 UnitTests/PInvoke/Graphics/Graphics.csproj           | 4 +++-
 UnitTests/PInvoke/IpHlpApi/IpHlpApi.csproj           | 4 +++-
 UnitTests/PInvoke/Kernel32/Kernel32.csproj           | 4 +++-
 UnitTests/PInvoke/KtmW32/KtmW32.csproj               | 4 +++-
 UnitTests/PInvoke/Mpr/Mpr.csproj                     | 4 +++-
 UnitTests/PInvoke/NTDSApi/NTDSApi.csproj             | 4 +++-
 UnitTests/PInvoke/NetApi32/NetApi32.csproj           | 4 +++-
 UnitTests/PInvoke/NetListMgr/NetListMgr.csproj       | 4 +++-
 UnitTests/PInvoke/NtDll/NtDll.csproj                 | 4 +++-
 UnitTests/PInvoke/Ole/Ole.csproj                     | 4 +++-
 UnitTests/PInvoke/Opc/Opc.csproj                     | 4 +++-
 UnitTests/PInvoke/Pdh/Pdh.csproj                     | 4 +++-
 UnitTests/PInvoke/PowrProf/PowrProf.csproj           | 4 +++-
 UnitTests/PInvoke/Printing/Printing.csproj           | 4 +++-
 UnitTests/PInvoke/Security/Security.csproj           | 4 +++-
 UnitTests/PInvoke/Shared/Shared.csproj               | 4 +++-
 UnitTests/PInvoke/Shell32/Shell32.csproj             | 4 +++-
 UnitTests/PInvoke/ShlwApi/ShlwApi.csproj             | 4 +++-
 UnitTests/PInvoke/TaskSchd/TaskSchd.csproj           | 4 +++-
 UnitTests/PInvoke/UrlMon/UrlMon.csproj               | 4 +++-
 UnitTests/PInvoke/User32/User32.csproj               | 4 +++-
 UnitTests/PInvoke/UserEnv/UserEnv.csproj             | 4 +++-
 UnitTests/PInvoke/UxTheme/UxTheme.csproj             | 4 +++-
 UnitTests/PInvoke/VirtDisk/VirtDisk.csproj           | 4 +++-
 UnitTests/PInvoke/WcmApi/WcmApi.csproj               | 4 +++-
 UnitTests/PInvoke/WinINet/WinINet.csproj             | 4 +++-
 UnitTests/PInvoke/WlanApi/WlanApi.csproj             | 4 +++-
 UnitTests/PInvoke/Ws2_32/Ws2_32.csproj               | 4 +++-
 UnitTests/Security/Security.csproj                   | 4 +++-
 UnitTests/System/System.csproj                       | 4 +++-
 UnitTests/VirtualDisk/VirtualDisk.csproj             | 4 +++-
 UnitTests/Windows.Forms/Windows.Forms.csproj         | 4 +++-
 UnitTests/Windows.Shell/Windows.Shell.csproj         | 4 +++-
 51 files changed, 145 insertions(+), 54 deletions(-)
 delete mode 100644 UnitTests/ExplorerBrowser/app.config

diff --git a/Core/Vanara.Core.csproj b/Core/Vanara.Core.csproj
index a28971ac..93a94628 100644
--- a/Core/Vanara.Core.csproj
+++ b/Core/Vanara.Core.csproj
@@ -31,7 +31,7 @@ CorrespondingAction, StringListPackMethod
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net2')) Or $(TargetFramework.StartsWith('net3')) Or '$(TargetFramework)' == 'net40' ">
     <PackageReference Include="Theraot.Core">
-      <Version>3.1.0</Version>
+      <Version>3.1.4</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
diff --git a/PInvoke/Shared/Vanara.PInvoke.Shared.csproj b/PInvoke/Shared/Vanara.PInvoke.Shared.csproj
index 92c7561d..256e4a6a 100644
--- a/PInvoke/Shared/Vanara.PInvoke.Shared.csproj
+++ b/PInvoke/Shared/Vanara.PInvoke.Shared.csproj
@@ -33,7 +33,7 @@ CharacterSet, CM_RESOURCE, CM_SHARE_DISPOSITION, CmResourceType, DMCOLLATE, DMCO
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net2')) ">
     <PackageReference Include="Theraot.Core">
-      <Version>3.1.0</Version>
+      <Version>3.1.4</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('netcore')) ">
diff --git a/System/Vanara.SystemServices.csproj b/System/Vanara.SystemServices.csproj
index 17803542..d6f06d75 100644
--- a/System/Vanara.SystemServices.csproj
+++ b/System/Vanara.SystemServices.csproj
@@ -34,7 +34,7 @@ BatteryStatus, EnergySaverStatus, JobLimit, NetworkInterfaceAccessType, NetworkI
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0" Condition=" $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('netcore')) " />
-    <PackageReference Include="Theraot.Core" Version="3.1.0" Condition=" $(TargetFramework.StartsWith('net2')) Or $(TargetFramework.StartsWith('net3')) Or '$(TargetFramework)' == 'net40' " />
+    <PackageReference Include="Theraot.Core" Version="3.1.4" Condition=" $(TargetFramework.StartsWith('net2')) Or $(TargetFramework.StartsWith('net3')) Or '$(TargetFramework)' == 'net40' " />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BITS\Vanara.BITS.csproj" />
diff --git a/UnitTests/BITS/BITS.csproj b/UnitTests/BITS/BITS.csproj
index 35b1b001..ba312898 100644
--- a/UnitTests/BITS/BITS.csproj
+++ b/UnitTests/BITS/BITS.csproj
@@ -39,7 +39,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/CSharpRunner/Shared.csproj b/UnitTests/CSharpRunner/Shared.csproj
index d65288e2..db721282 100644
--- a/UnitTests/CSharpRunner/Shared.csproj
+++ b/UnitTests/CSharpRunner/Shared.csproj
@@ -55,7 +55,7 @@
       <Version>5.0.2.5153</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis">
-      <Version>3.3.1</Version>
+      <Version>3.6.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>12.0.3</Version>
@@ -64,7 +64,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/Core/Core.csproj b/UnitTests/Core/Core.csproj
index ed46920c..acd38b3e 100644
--- a/UnitTests/Core/Core.csproj
+++ b/UnitTests/Core/Core.csproj
@@ -73,7 +73,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/ExplorerBrowser/ExplorerBrowserDemo.csproj b/UnitTests/ExplorerBrowser/ExplorerBrowserDemo.csproj
index 86f1dbfe..283c2f1f 100644
--- a/UnitTests/ExplorerBrowser/ExplorerBrowserDemo.csproj
+++ b/UnitTests/ExplorerBrowser/ExplorerBrowserDemo.csproj
@@ -56,6 +56,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="PresentationCore">
@@ -107,7 +110,6 @@
     <EmbeddedResource Include="ShellNamespaceTreeControlTestForm.resx">
       <DependentUpon>ShellNamespaceTreeControlTestForm.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Core\Vanara.Core.csproj">
diff --git a/UnitTests/ExplorerBrowser/app.config b/UnitTests/ExplorerBrowser/app.config
deleted file mode 100644
index ff995010..00000000
--- a/UnitTests/ExplorerBrowser/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
diff --git a/UnitTests/PInvoke/AclUI/AclUI.csproj b/UnitTests/PInvoke/AclUI/AclUI.csproj
index b5edb2a9..aecdf6fb 100644
--- a/UnitTests/PInvoke/AclUI/AclUI.csproj
+++ b/UnitTests/PInvoke/AclUI/AclUI.csproj
@@ -39,7 +39,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/BITS/BITS.csproj b/UnitTests/PInvoke/BITS/BITS.csproj
index e3e541d2..c9bc91bb 100644
--- a/UnitTests/PInvoke/BITS/BITS.csproj
+++ b/UnitTests/PInvoke/BITS/BITS.csproj
@@ -36,7 +36,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/Cabinet/Cabinet.csproj b/UnitTests/PInvoke/Cabinet/Cabinet.csproj
index c19f9529..141e5337 100644
--- a/UnitTests/PInvoke/Cabinet/Cabinet.csproj
+++ b/UnitTests/PInvoke/Cabinet/Cabinet.csproj
@@ -36,7 +36,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/CldApi/CldApi.csproj b/UnitTests/PInvoke/CldApi/CldApi.csproj
index 70ebbc74..7afe6582 100644
--- a/UnitTests/PInvoke/CldApi/CldApi.csproj
+++ b/UnitTests/PInvoke/CldApi/CldApi.csproj
@@ -67,7 +67,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/ComCtl32/ComCtl32.csproj b/UnitTests/PInvoke/ComCtl32/ComCtl32.csproj
index ff421cc4..cdb7baf0 100644
--- a/UnitTests/PInvoke/ComCtl32/ComCtl32.csproj
+++ b/UnitTests/PInvoke/ComCtl32/ComCtl32.csproj
@@ -41,7 +41,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/CredUI/CredUI.csproj b/UnitTests/PInvoke/CredUI/CredUI.csproj
index 982175f6..ca32d3d8 100644
--- a/UnitTests/PInvoke/CredUI/CredUI.csproj
+++ b/UnitTests/PInvoke/CredUI/CredUI.csproj
@@ -39,7 +39,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/Cryptography/Cryptography.csproj b/UnitTests/PInvoke/Cryptography/Cryptography.csproj
index 404fa3f5..527c4a97 100644
--- a/UnitTests/PInvoke/Cryptography/Cryptography.csproj
+++ b/UnitTests/PInvoke/Cryptography/Cryptography.csproj
@@ -36,7 +36,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/DnsApi/DnsApi.csproj b/UnitTests/PInvoke/DnsApi/DnsApi.csproj
index 6773543b..57dbd2bb 100644
--- a/UnitTests/PInvoke/DnsApi/DnsApi.csproj
+++ b/UnitTests/PInvoke/DnsApi/DnsApi.csproj
@@ -67,7 +67,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/DwmApi/DwmApi.csproj b/UnitTests/PInvoke/DwmApi/DwmApi.csproj
index b1f62a5c..3e96b67d 100644
--- a/UnitTests/PInvoke/DwmApi/DwmApi.csproj
+++ b/UnitTests/PInvoke/DwmApi/DwmApi.csproj
@@ -41,7 +41,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/Gdi32/Gdi32.csproj b/UnitTests/PInvoke/Gdi32/Gdi32.csproj
index e251166f..c7df4d8b 100644
--- a/UnitTests/PInvoke/Gdi32/Gdi32.csproj
+++ b/UnitTests/PInvoke/Gdi32/Gdi32.csproj
@@ -41,7 +41,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/Graphics/Graphics.csproj b/UnitTests/PInvoke/Graphics/Graphics.csproj
index 6dadea57..120d32f4 100644
--- a/UnitTests/PInvoke/Graphics/Graphics.csproj
+++ b/UnitTests/PInvoke/Graphics/Graphics.csproj
@@ -60,7 +60,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/IpHlpApi/IpHlpApi.csproj b/UnitTests/PInvoke/IpHlpApi/IpHlpApi.csproj
index d34b901f..2129918e 100644
--- a/UnitTests/PInvoke/IpHlpApi/IpHlpApi.csproj
+++ b/UnitTests/PInvoke/IpHlpApi/IpHlpApi.csproj
@@ -42,7 +42,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/Kernel32/Kernel32.csproj b/UnitTests/PInvoke/Kernel32/Kernel32.csproj
index 915b8b5f..dc39503d 100644
--- a/UnitTests/PInvoke/Kernel32/Kernel32.csproj
+++ b/UnitTests/PInvoke/Kernel32/Kernel32.csproj
@@ -122,7 +122,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/KtmW32/KtmW32.csproj b/UnitTests/PInvoke/KtmW32/KtmW32.csproj
index cb6bd867..8b7767d1 100644
--- a/UnitTests/PInvoke/KtmW32/KtmW32.csproj
+++ b/UnitTests/PInvoke/KtmW32/KtmW32.csproj
@@ -66,7 +66,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/Mpr/Mpr.csproj b/UnitTests/PInvoke/Mpr/Mpr.csproj
index e6051f8d..9f027671 100644
--- a/UnitTests/PInvoke/Mpr/Mpr.csproj
+++ b/UnitTests/PInvoke/Mpr/Mpr.csproj
@@ -39,7 +39,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/NTDSApi/NTDSApi.csproj b/UnitTests/PInvoke/NTDSApi/NTDSApi.csproj
index b551bd04..1fbe7c6b 100644
--- a/UnitTests/PInvoke/NTDSApi/NTDSApi.csproj
+++ b/UnitTests/PInvoke/NTDSApi/NTDSApi.csproj
@@ -41,7 +41,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/NetApi32/NetApi32.csproj b/UnitTests/PInvoke/NetApi32/NetApi32.csproj
index 0992c640..0a5ac608 100644
--- a/UnitTests/PInvoke/NetApi32/NetApi32.csproj
+++ b/UnitTests/PInvoke/NetApi32/NetApi32.csproj
@@ -39,7 +39,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="System.ValueTuple">
       <Version>4.5.0</Version>
diff --git a/UnitTests/PInvoke/NetListMgr/NetListMgr.csproj b/UnitTests/PInvoke/NetListMgr/NetListMgr.csproj
index 5887d37e..a8454374 100644
--- a/UnitTests/PInvoke/NetListMgr/NetListMgr.csproj
+++ b/UnitTests/PInvoke/NetListMgr/NetListMgr.csproj
@@ -39,7 +39,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/NtDll/NtDll.csproj b/UnitTests/PInvoke/NtDll/NtDll.csproj
index 98842e6f..f18e6ac3 100644
--- a/UnitTests/PInvoke/NtDll/NtDll.csproj
+++ b/UnitTests/PInvoke/NtDll/NtDll.csproj
@@ -40,7 +40,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="System.Memory">
       <Version>4.5.4</Version>
diff --git a/UnitTests/PInvoke/Ole/Ole.csproj b/UnitTests/PInvoke/Ole/Ole.csproj
index 09e12633..2f07c83d 100644
--- a/UnitTests/PInvoke/Ole/Ole.csproj
+++ b/UnitTests/PInvoke/Ole/Ole.csproj
@@ -43,7 +43,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/Opc/Opc.csproj b/UnitTests/PInvoke/Opc/Opc.csproj
index e5d08f57..0f23624e 100644
--- a/UnitTests/PInvoke/Opc/Opc.csproj
+++ b/UnitTests/PInvoke/Opc/Opc.csproj
@@ -66,7 +66,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/Pdh/Pdh.csproj b/UnitTests/PInvoke/Pdh/Pdh.csproj
index df33f650..d3bf4f2a 100644
--- a/UnitTests/PInvoke/Pdh/Pdh.csproj
+++ b/UnitTests/PInvoke/Pdh/Pdh.csproj
@@ -66,7 +66,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/PowrProf/PowrProf.csproj b/UnitTests/PInvoke/PowrProf/PowrProf.csproj
index 0539328d..1dec1a08 100644
--- a/UnitTests/PInvoke/PowrProf/PowrProf.csproj
+++ b/UnitTests/PInvoke/PowrProf/PowrProf.csproj
@@ -61,7 +61,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/Printing/Printing.csproj b/UnitTests/PInvoke/Printing/Printing.csproj
index be1edb28..9849cfa8 100644
--- a/UnitTests/PInvoke/Printing/Printing.csproj
+++ b/UnitTests/PInvoke/Printing/Printing.csproj
@@ -66,7 +66,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/Security/Security.csproj b/UnitTests/PInvoke/Security/Security.csproj
index f4c68165..6cca0309 100644
--- a/UnitTests/PInvoke/Security/Security.csproj
+++ b/UnitTests/PInvoke/Security/Security.csproj
@@ -109,7 +109,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/Shared/Shared.csproj b/UnitTests/PInvoke/Shared/Shared.csproj
index 2f1cd7c4..d84c7945 100644
--- a/UnitTests/PInvoke/Shared/Shared.csproj
+++ b/UnitTests/PInvoke/Shared/Shared.csproj
@@ -67,7 +67,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/Shell32/Shell32.csproj b/UnitTests/PInvoke/Shell32/Shell32.csproj
index cf99cc9b..52309b80 100644
--- a/UnitTests/PInvoke/Shell32/Shell32.csproj
+++ b/UnitTests/PInvoke/Shell32/Shell32.csproj
@@ -80,7 +80,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/ShlwApi/ShlwApi.csproj b/UnitTests/PInvoke/ShlwApi/ShlwApi.csproj
index 4a979d93..f916a97d 100644
--- a/UnitTests/PInvoke/ShlwApi/ShlwApi.csproj
+++ b/UnitTests/PInvoke/ShlwApi/ShlwApi.csproj
@@ -36,7 +36,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/TaskSchd/TaskSchd.csproj b/UnitTests/PInvoke/TaskSchd/TaskSchd.csproj
index bd443d1b..4405f625 100644
--- a/UnitTests/PInvoke/TaskSchd/TaskSchd.csproj
+++ b/UnitTests/PInvoke/TaskSchd/TaskSchd.csproj
@@ -53,7 +53,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/UrlMon/UrlMon.csproj b/UnitTests/PInvoke/UrlMon/UrlMon.csproj
index ec722b5e..8ff05f56 100644
--- a/UnitTests/PInvoke/UrlMon/UrlMon.csproj
+++ b/UnitTests/PInvoke/UrlMon/UrlMon.csproj
@@ -66,7 +66,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/User32/User32.csproj b/UnitTests/PInvoke/User32/User32.csproj
index 08f76667..e8660d13 100644
--- a/UnitTests/PInvoke/User32/User32.csproj
+++ b/UnitTests/PInvoke/User32/User32.csproj
@@ -38,7 +38,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/UserEnv/UserEnv.csproj b/UnitTests/PInvoke/UserEnv/UserEnv.csproj
index 3bad97a6..168021eb 100644
--- a/UnitTests/PInvoke/UserEnv/UserEnv.csproj
+++ b/UnitTests/PInvoke/UserEnv/UserEnv.csproj
@@ -38,7 +38,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/UxTheme/UxTheme.csproj b/UnitTests/PInvoke/UxTheme/UxTheme.csproj
index f301fff3..65eeb005 100644
--- a/UnitTests/PInvoke/UxTheme/UxTheme.csproj
+++ b/UnitTests/PInvoke/UxTheme/UxTheme.csproj
@@ -38,7 +38,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/VirtDisk/VirtDisk.csproj b/UnitTests/PInvoke/VirtDisk/VirtDisk.csproj
index 1ca67611..ef1b45fd 100644
--- a/UnitTests/PInvoke/VirtDisk/VirtDisk.csproj
+++ b/UnitTests/PInvoke/VirtDisk/VirtDisk.csproj
@@ -36,7 +36,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/WcmApi/WcmApi.csproj b/UnitTests/PInvoke/WcmApi/WcmApi.csproj
index 7e99daea..081b5c7d 100644
--- a/UnitTests/PInvoke/WcmApi/WcmApi.csproj
+++ b/UnitTests/PInvoke/WcmApi/WcmApi.csproj
@@ -66,7 +66,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/WinINet/WinINet.csproj b/UnitTests/PInvoke/WinINet/WinINet.csproj
index 001ee57f..43d44147 100644
--- a/UnitTests/PInvoke/WinINet/WinINet.csproj
+++ b/UnitTests/PInvoke/WinINet/WinINet.csproj
@@ -37,7 +37,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/PInvoke/WlanApi/WlanApi.csproj b/UnitTests/PInvoke/WlanApi/WlanApi.csproj
index f88a7838..8d4aadb5 100644
--- a/UnitTests/PInvoke/WlanApi/WlanApi.csproj
+++ b/UnitTests/PInvoke/WlanApi/WlanApi.csproj
@@ -63,7 +63,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/UnitTests/PInvoke/Ws2_32/Ws2_32.csproj b/UnitTests/PInvoke/Ws2_32/Ws2_32.csproj
index ce692b72..53a138bd 100644
--- a/UnitTests/PInvoke/Ws2_32/Ws2_32.csproj
+++ b/UnitTests/PInvoke/Ws2_32/Ws2_32.csproj
@@ -38,7 +38,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/Security/Security.csproj b/UnitTests/Security/Security.csproj
index f621a32f..721205b2 100644
--- a/UnitTests/Security/Security.csproj
+++ b/UnitTests/Security/Security.csproj
@@ -39,7 +39,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/System/System.csproj b/UnitTests/System/System.csproj
index a06e04cc..19c96c02 100644
--- a/UnitTests/System/System.csproj
+++ b/UnitTests/System/System.csproj
@@ -46,7 +46,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/VirtualDisk/VirtualDisk.csproj b/UnitTests/VirtualDisk/VirtualDisk.csproj
index 767890c7..3c3fbfa3 100644
--- a/UnitTests/VirtualDisk/VirtualDisk.csproj
+++ b/UnitTests/VirtualDisk/VirtualDisk.csproj
@@ -36,7 +36,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/Windows.Forms/Windows.Forms.csproj b/UnitTests/Windows.Forms/Windows.Forms.csproj
index 07852f74..625433ac 100644
--- a/UnitTests/Windows.Forms/Windows.Forms.csproj
+++ b/UnitTests/Windows.Forms/Windows.Forms.csproj
@@ -43,7 +43,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/Windows.Shell/Windows.Shell.csproj b/UnitTests/Windows.Shell/Windows.Shell.csproj
index 87d18dc2..e54dbdbd 100644
--- a/UnitTests/Windows.Shell/Windows.Shell.csproj
+++ b/UnitTests/Windows.Shell/Windows.Shell.csproj
@@ -41,7 +41,9 @@
       <Version>3.12.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>