Updated Nuget packages, accommodating several breaking changes in MSTest.

RyanLamansky · RyanLamansky · commit 111b7572763e · 2025-11-16T10:31:42.000-06:00
diff --git a/Example/Example.csproj b/Example/Example.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SqlServerSimulator.Tests.EFCore/EFCoreBasics.cs b/SqlServerSimulator.Tests.EFCore/EFCoreBasics.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.EntityFrameworkCore;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace SqlServerSimulator;
 
diff --git a/SqlServerSimulator.Tests.EFCore/Properties/AssemblyInfo.cs b/SqlServerSimulator.Tests.EFCore/Properties/AssemblyInfo.cs
@@ -1,3 +1 @@
-﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
+﻿[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
diff --git a/SqlServerSimulator.Tests.EFCore/SqlServerSimulator.Tests.EFCore.csproj b/SqlServerSimulator.Tests.EFCore/SqlServerSimulator.Tests.EFCore.csproj
@@ -19,10 +19,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.9.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.9.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SqlServerSimulator.Tests/ConnectionTests.cs b/SqlServerSimulator.Tests/ConnectionTests.cs
@@ -1,4 +1,3 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Data;
 
 namespace SqlServerSimulator;
diff --git a/SqlServerSimulator.Tests/CreateTableTests.cs b/SqlServerSimulator.Tests/CreateTableTests.cs
@@ -1,6 +1,4 @@
-﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace SqlServerSimulator;
+﻿namespace SqlServerSimulator;
 
 [TestClass]
 public class CreateTableTests
diff --git a/SqlServerSimulator.Tests/Extensions.cs b/SqlServerSimulator.Tests/Extensions.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Data.Common;
+﻿using System.Data.Common;
 
 namespace SqlServerSimulator;
 
@@ -58,7 +57,7 @@ public static void ValidateSyntaxError(this Simulation simulation, string comman
         Assert.IsFalse(exception.IsTransient);
 
         var data = exception.Data;
-        Assert.AreEqual(6, data.Count);
+        Assert.HasCount(6, data);
         Assert.AreEqual("Microsoft SQL Server", data["HelpLink.ProdName"]);
         Assert.AreEqual("99.00.1000", data["HelpLink.ProdVer"]); // This should probably be a simulation property.
         Assert.AreEqual("MSSQLServer", data["HelpLink.EvtSrc"]);
diff --git a/SqlServerSimulator.Tests/InsertTests.cs b/SqlServerSimulator.Tests/InsertTests.cs
@@ -1,17 +1,16 @@
-﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Data.Common;
+﻿using System.Data.Common;
 
 namespace SqlServerSimulator;
 
 [TestClass]
 public class InsertTests
 {
     [TestMethod]
-    [ExpectedException(typeof(DbException), AllowDerivedTypes = true)]
-    public void InsertRequiresTableToExist() => new Simulation()
+    public void InsertRequiresTableToExist() => Assert.Throws<DbException>(() => new Simulation()
         .CreateOpenConnection()
         .CreateCommand("insert t ( v ) values ( 1 )")
-        .ExecuteNonQuery();
+        .ExecuteNonQuery()
+    );
 
     [TestMethod]
     public void InsertWithoutColumnNames()
@@ -36,14 +35,11 @@ public void InsertParameterized()
     }
 
     [TestMethod]
-    [ExpectedException(typeof(DbException), AllowDerivedTypes = true)]
-    public void InsertParameterizedNameMismatch()
-    {
-        _ = new Simulation()
-            .CreateOpenConnection()
-            .CreateCommand("create table t ( v int );insert t values ( @p0 )", ("p1", 1))
-            .ExecuteNonQuery();
-    }
+    public void InsertParameterizedNameMismatch() => Assert.Throws<DbException>(() => new Simulation()
+        .CreateOpenConnection()
+        .CreateCommand("create table t ( v int );insert t values ( @p0 )", ("p1", 1))
+        .ExecuteNonQuery()
+    );
 
     [TestMethod]
     public void InsertWithoutColumnNamesCaseInsensitive()
@@ -79,14 +75,9 @@ public void InsertWithColumnNamesCaseInsensitive()
     }
 
     [TestMethod]
-    [ExpectedException(typeof(DbException), AllowDerivedTypes = true)]
-    public void InsertRequiresValidColumnNames()
-    {
-        var result = new Simulation()
-            .CreateOpenConnection()
-            .CreateCommand("create table t ( v int );insert t ( x ) values ( 1 )")
-            .ExecuteNonQuery();
-
-        Assert.AreEqual(1, result);
-    }
+    public void InsertRequiresValidColumnNames() => Assert.Throws<DbException>(() => new Simulation()
+        .CreateOpenConnection()
+        .CreateCommand("create table t ( v int );insert t ( x ) values ( 1 )")
+        .ExecuteNonQuery()
+    );
 }
diff --git a/SqlServerSimulator.Tests/Properties/AssemblyInfo.cs b/SqlServerSimulator.Tests/Properties/AssemblyInfo.cs
@@ -1,3 +1 @@
-﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
+﻿[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
diff --git a/SqlServerSimulator.Tests/QualityTests.cs b/SqlServerSimulator.Tests/QualityTests.cs
@@ -1,11 +1,9 @@
-﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace SqlServerSimulator;
+﻿namespace SqlServerSimulator;
 
 [TestClass]
 public class QualityTests
 {
-    [TestMethod("Public API Whitelist")]
+    [TestMethod()]
     [Description("Prevents unintentional expansion of the public API.")]
     public void PublicApiWhitelist()
     {
@@ -17,15 +15,15 @@ public void PublicApiWhitelist()
             .Where(type => type.IsPublic)
             .ToArray();
 
-        Assert.AreEqual(1, types.Length);
+        Assert.HasCount(1, types);
         Assert.AreEqual(simulation, types[0]);
 
         var members = simulation
             .GetMembers()
             .Where(member => member.DeclaringType == simulation)
             .ToArray();
 
-        Assert.AreEqual(2, members.Length);
+        Assert.HasCount(2, members);
 
         HashSet<string> allowedMemberNames = [
             ".ctor",
diff --git a/SqlServerSimulator.Tests/RoundTripTests.cs b/SqlServerSimulator.Tests/RoundTripTests.cs
@@ -1,6 +1,4 @@
-﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace SqlServerSimulator;
+﻿namespace SqlServerSimulator;
 
 [TestClass]
 public class RoundTripTests
diff --git a/SqlServerSimulator.Tests/SelectTests.cs b/SqlServerSimulator.Tests/SelectTests.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Data.Common;
+﻿using System.Data.Common;
 
 namespace SqlServerSimulator;
 
@@ -88,8 +87,8 @@ public void SelectExpressionFromSystemTable()
             .Select(reader => reader.GetInt32(0))
             .ToArray();
 
-        Assert.AreEqual(34, results.Length);
-        Assert.AreEqual(1, results.ToHashSet().Count);
+        Assert.HasCount(34, results);
+        Assert.HasCount(1, results.ToHashSet());
         Assert.AreEqual(1, results[0]);
     }
 
@@ -104,8 +103,8 @@ public void SelectExpressionFromAliasedSystemTable()
             .Select(reader => reader.GetInt32(0))
             .ToArray();
 
-        Assert.AreEqual(34, results.Length);
-        Assert.AreEqual(1, results.ToHashSet().Count);
+        Assert.HasCount(34, results);
+        Assert.HasCount(1, results.ToHashSet());
         Assert.AreEqual(1, results[0]);
     }
 
@@ -120,8 +119,8 @@ public void SelectColumnFromSystemTable()
             .Select(reader => reader.GetString(0))
             .ToHashSet();
 
-        Assert.AreEqual(34, results.Count);
-        Assert.IsTrue(results.Contains("int"));
+        Assert.HasCount(34, results);
+        Assert.Contains("int", results);
     }
 
     [TestMethod]
@@ -135,8 +134,8 @@ public void SelectAliasedColumnFromSystemTable()
             .Select(reader => reader.GetName(0))
             .ToHashSet();
 
-        Assert.AreEqual(1, results.Count);
-        Assert.IsTrue(results.Contains("c"));
+        Assert.HasCount(1, results);
+        Assert.Contains("c", results);
     }
 
     [TestMethod]
@@ -150,8 +149,8 @@ public void SelectAliasedColumnFromAliasedSystemTable()
             .Select(reader => reader.GetName(0))
             .ToHashSet();
 
-        Assert.AreEqual(1, results.Count);
-        Assert.IsTrue(results.Contains("c"));
+        Assert.HasCount(1, results);
+        Assert.Contains("c", results);
     }
 
     [TestMethod]
@@ -165,8 +164,8 @@ public void SelectMultiPartColumnFromSystemTable()
             .Select(reader => reader.GetName(0))
             .ToHashSet();
 
-        Assert.AreEqual(1, results.Count);
-        Assert.IsTrue(results.Contains("name"));
+        Assert.HasCount(1, results);
+        Assert.Contains("name", results);
     }
 
     [TestMethod]
@@ -180,8 +179,8 @@ public void SelectMultiPartColumnFromAliasedSystemTable()
             .Select(reader => reader.GetName(0))
             .ToHashSet();
 
-        Assert.AreEqual(1, results.Count);
-        Assert.IsTrue(results.Contains("name"));
+        Assert.HasCount(1, results);
+        Assert.Contains("name", results);
     }
 
     [TestMethod]
@@ -194,7 +193,7 @@ public void Select1Comma2()
             .Select(reader => (C1: reader.GetInt32(0), C2: reader.GetInt32(1)))
             .ToArray();
 
-        Assert.AreEqual(1, results.Length);
+        Assert.HasCount(1, results);
         var (C1, C2) = results[0];
         Assert.AreEqual(1, C1);
         Assert.AreEqual(2, C2);
@@ -211,7 +210,7 @@ public void SelectTwoColumns()
             .Select(reader => (C1: reader.GetString(0), C2: reader.GetInt32(1)))
             .ToArray();
 
-        Assert.AreEqual(34, results.Length);
+        Assert.HasCount(34, results);
         var (C1, C2) = results[0];
         Assert.AreEqual("image", C1);
         Assert.AreEqual(16, C2);
@@ -223,10 +222,4 @@ public void SelectTwoColumns()
     [DataRow("select ,", ",")]
     public void SelectSyntaxErrorsAreCorrect(string commandText, string nearSyntax) =>
         new Simulation().ValidateSyntaxError(commandText, nearSyntax);
-
-    [TestMethod]
-    [TestCategory("TODO")]
-    [ExpectedException(typeof(NotSupportedException))]
-    public void Select1FromDerivedTable() =>
-        Assert.AreEqual(1, new Simulation().ExecuteScalar("select 1 from ( select 1 x ) x"));
 }
diff --git a/SqlServerSimulator.Tests/SetTests.cs b/SqlServerSimulator.Tests/SetTests.cs
@@ -1,6 +1,4 @@
-﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace SqlServerSimulator;
+﻿namespace SqlServerSimulator;
 
 /// <summary>
 /// Verifies that a variety of set commands are processed without error.
diff --git a/SqlServerSimulator.Tests/SimpleCommandTests.cs b/SqlServerSimulator.Tests/SimpleCommandTests.cs
diff --git a/SqlServerSimulator.Tests/SqlServerSimulator.Tests.csproj b/SqlServerSimulator.Tests/SqlServerSimulator.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Microsoft.EntityFrameworkCore;`
`2`		`-using Microsoft.VisualStudio.TestTools.UnitTesting;`
`3`	`2`
`4`	`3`	`namespace SqlServerSimulator;`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using Microsoft.VisualStudio.TestTools.UnitTesting;`
`2`	`1`	`using System.Data;`
`3`	`2`
`4`	`3`	`namespace SqlServerSimulator;`