Merge branch 'develop'

Caliban-Nano · May 15, 2022 · f5d1e9e · f5d1e9e
2 parents 7feae3a + eb232c1
commit f5d1e9e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/Caliban.Nano/Bootstrap.cs b/src/Caliban.Nano/Bootstrap.cs
@@ -77,7 +77,6 @@ public async void Show<T>(Dictionary<string, object>? settings = null) where T :
         /// Closes the main window via the window manager. 
         /// </summary>
         [ExcludeFromCodeCoverage]
-        [SuppressMessage("Performance", "CA1822", Justification = "Intended Behavior")]
         public async void Dispose()
         {
             try

diff --git a/tests/Caliban.Nano.Tests/Caliban.Nano.Tests.csproj b/tests/Caliban.Nano.Tests/Caliban.Nano.Tests.csproj
@@ -12,10 +12,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
-    <PackageReference Include="coverlet.collector" Version="3.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Caliban.Nano.Tests/Root/BootstrapTests.cs b/tests/Caliban.Nano.Tests/Root/BootstrapTests.cs
@@ -9,6 +9,12 @@ namespace Caliban.Nano.Tests.Root
     [TestClass]
     public class BootstrapTests
     {
+        [TestInitialize]
+        public void Initialize()
+        {
+            TypeFinder.Sources.Clear();
+        }
+
         [TestMethod]
         public void BootstrapTest()
         {
@@ -17,11 +23,11 @@ public void BootstrapTest()
             Assert.IsNotNull(bootstrap.Container);
             Assert.IsInstanceOfType(bootstrap.Container, typeof(NanoContainer));
 
-            Assert.AreEqual(TypeFinder.Sources.Count, 1);
+            Assert.AreEqual(1, TypeFinder.Sources.Count);
 
             bootstrap.AddSource(GetType().Assembly);
 
-            Assert.AreEqual(TypeFinder.Sources.Count, 2);
+            Assert.AreEqual(2, TypeFinder.Sources.Count);
 
             Assert.ThrowsException<TypeLoadException>(() => IoC.Get<IMock>());