fix(tests): restore VS discovery with MSTest v4 alignment

Agash · Agash · commit a0c7ceaf9554 · 2026-02-24T17:09:34.000+01:00
diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-publish.yml
@@ -42,10 +42,10 @@ jobs:
         run: dotnet build TTSTextNormalization.sln --configuration Release --no-restore
 
       - name: Run Tests for .NET 10.0
-        run: dotnet test TTSTextNormalization.Tests/TTSTextNormalization.Tests.csproj --configuration Release --framework net10.0 --no-build --report-trx --report-trx-filename test-results-net10.trx
+        run: dotnet test TTSTextNormalization.Tests/TTSTextNormalization.Tests.csproj --configuration Release --framework net10.0 --no-build --logger "trx;LogFileName=test-results-net10.trx"
 
       - name: Run Tests for .NET 9.0
-        run: dotnet test TTSTextNormalization.Tests/TTSTextNormalization.Tests.csproj --configuration Release --framework net9.0 --no-build --report-trx --report-trx-filename test-results-net9.trx
+        run: dotnet test TTSTextNormalization.Tests/TTSTextNormalization.Tests.csproj --configuration Release --framework net9.0 --no-build --logger "trx;LogFileName=test-results-net9.trx"
 
       - name: Upload Test Results
         if: always()
@@ -95,4 +95,4 @@ jobs:
           Get-ChildItem "${{ env.NuGetDirectory }}" -Filter *.nupkg | ForEach-Object {
             Write-Host "Pushing $($_.FullName)..."
             dotnet nuget push $_.FullName --api-key "$env:NUGET_API_KEY" --source https://api.nuget.org/v3/index.json --skip-duplicate
-          }
+          }
diff --git a/TTSTextNormalization.Generator/TTSTextNormalization.EmojiDataGenerator.csproj b/TTSTextNormalization.Generator/TTSTextNormalization.EmojiDataGenerator.csproj
@@ -13,19 +13,19 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
-	<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" PrivateAssets="all" />
+	<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" PrivateAssets="all" />
   </ItemGroup>
 
 	<ItemGroup Label="Package References">
-		<PackageReference Include="System.Text.Json" Version="9.0.4" GeneratePathProperty="true" PrivateAssets="all" />
-		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.4" GeneratePathProperty="true" PrivateAssets="all" />
+		<PackageReference Include="System.Text.Json" Version="10.0.3" GeneratePathProperty="true" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.3" GeneratePathProperty="true" PrivateAssets="all" />
 		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" GeneratePathProperty="true" PrivateAssets="all" />
 		<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" GeneratePathProperty="true" PrivateAssets="all" />
-		<PackageReference Include="System.Text.Encodings.Web" Version="9.0.4" GeneratePathProperty="true" PrivateAssets="all" />
+		<PackageReference Include="System.Text.Encodings.Web" Version="10.0.3" GeneratePathProperty="true" PrivateAssets="all" />
 		<PackageReference Include="System.Buffers" Version="4.6.1" GeneratePathProperty="true" PrivateAssets="all" />
 		<PackageReference Include="System.Memory" Version="4.6.3" GeneratePathProperty="true" PrivateAssets="all" />
 		<PackageReference Include="System.Numerics.Vectors" Version="4.6.1" GeneratePathProperty="true" PrivateAssets="all" />
-		<PackageReference Include="System.IO.Pipelines" Version="9.0.4" GeneratePathProperty="true" PrivateAssets="all" />
+		<PackageReference Include="System.IO.Pipelines" Version="10.0.3" GeneratePathProperty="true" PrivateAssets="all" />
 	</ItemGroup>
 
 	<PropertyGroup>
diff --git a/TTSTextNormalization.Tests/Rules/AbbreviationNormalizationRuleTests.cs b/TTSTextNormalization.Tests/Rules/AbbreviationNormalizationRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using System.Collections.Frozen;
+using System.Collections.Frozen;
 using Microsoft.Extensions.Options;
 using TTSTextNormalization.Rules;
 
@@ -129,7 +129,7 @@ public void Apply_NullInput_ThrowsArgumentNullException()
         string? input = null;
 
         // Act & Assert
-        Assert.ThrowsException<ArgumentNullException>(() => _rule.Apply(input!));
+        Assert.Throws<ArgumentNullException>(() => _rule.Apply(input!));
     }
 
     [TestMethod]
diff --git a/TTSTextNormalization.Tests/Rules/BasicSanitizationRuleTests.cs b/TTSTextNormalization.Tests/Rules/BasicSanitizationRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using TTSTextNormalization.Rules;
+using TTSTextNormalization.Rules;
 
 namespace TTSTextNormalization.Tests.Rules;
 
@@ -80,6 +80,6 @@ public void Apply_NullInput_ThrowsArgumentNullException()
         // Arrange
         string? input = null;
         // Act & Assert
-        Assert.ThrowsException<ArgumentNullException>(() => _rule.Apply(input!));
+        Assert.Throws<ArgumentNullException>(() => _rule.Apply(input!));
     }
-}
+}
diff --git a/TTSTextNormalization.Tests/Rules/CurrencyNormalizationRuleTests.cs b/TTSTextNormalization.Tests/Rules/CurrencyNormalizationRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using TTSTextNormalization.Rules;
+using TTSTextNormalization.Rules;
 
 namespace TTSTextNormalization.Tests.Rules;
 
@@ -98,6 +98,6 @@ public void Apply_NullInput_ThrowsArgumentNullException()
         string? input = null;
 
         // Act & Assert
-        Assert.ThrowsException<ArgumentNullException>(() => _rule.Apply(input!));
+        Assert.Throws<ArgumentNullException>(() => _rule.Apply(input!));
     }
-}
+}
diff --git a/TTSTextNormalization.Tests/Rules/EmojiNormalizationRuleTests.cs b/TTSTextNormalization.Tests/Rules/EmojiNormalizationRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
 using TTSTextNormalization.Rules;
 
 namespace TTSTextNormalization.Tests.Rules;
@@ -52,7 +52,7 @@ public void Apply_KnownEmojis_ReplacesWithGeneratedName(string input, string exp
     public void Apply_NullInput_ThrowsArgumentNullException()
     {
         string? input = null;
-        Assert.ThrowsException<ArgumentNullException>(() => _rule.Apply(input!));
+        Assert.Throws<ArgumentNullException>(() => _rule.Apply(input!));
     }
 
     [TestMethod]
diff --git a/TTSTextNormalization.Tests/Rules/ExcessivePunctuationRuleTests.cs b/TTSTextNormalization.Tests/Rules/ExcessivePunctuationRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using TTSTextNormalization.Rules;
+using TTSTextNormalization.Rules;
 
 namespace TTSTextNormalization.Tests.Rules;
 
@@ -59,6 +59,6 @@ public void Apply_NullInput_ThrowsArgumentNullException()
         // Arrange
         string? input = null;
         // Act & Assert
-        Assert.ThrowsException<ArgumentNullException>(() => _rule.Apply(input!));
+        Assert.Throws<ArgumentNullException>(() => _rule.Apply(input!));
     }
-}
+}
diff --git a/TTSTextNormalization.Tests/Rules/LetterRepetitionRuleTests.cs b/TTSTextNormalization.Tests/Rules/LetterRepetitionRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using TTSTextNormalization.Rules;
+using TTSTextNormalization.Rules;
 
 namespace TTSTextNormalization.Tests.Rules;
 
@@ -58,6 +58,6 @@ public void Apply_NullInput_ThrowsArgumentNullException()
         // Arrange
         string? input = null;
         // Act & Assert
-        Assert.ThrowsException<ArgumentNullException>(() => _rule.Apply(input!));
+        Assert.Throws<ArgumentNullException>(() => _rule.Apply(input!));
     }
-}
+}
diff --git a/TTSTextNormalization.Tests/Rules/NumberNormalizationRuleTests.cs b/TTSTextNormalization.Tests/Rules/NumberNormalizationRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using TTSTextNormalization.Rules;
+using TTSTextNormalization.Rules;
 
 namespace TTSTextNormalization.Tests.Rules;
 
@@ -97,6 +97,6 @@ public void Apply_NonStandaloneNumbers_NoChange(string input, string expected)
     public void Apply_NullInput_ThrowsArgumentNullException()
     {
         string? input = null;
-        Assert.ThrowsException<ArgumentNullException>(() => _rule.Apply(input!));
+        Assert.Throws<ArgumentNullException>(() => _rule.Apply(input!));
     }
-}
+}
diff --git a/TTSTextNormalization.Tests/Rules/UrlNormalizationRuleTests.cs b/TTSTextNormalization.Tests/Rules/UrlNormalizationRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
 using TTSTextNormalization.Rules;
 
 namespace TTSTextNormalization.Tests.Rules;
@@ -132,7 +132,7 @@ public void Apply_NullInput_ThrowsArgumentNullException()
         // Arrange
         string? input = null;
         // Act & Assert
-        Assert.ThrowsException<ArgumentNullException>(() => _rule.Apply(input!));
+        Assert.Throws<ArgumentNullException>(() => _rule.Apply(input!));
     }
 
     [TestMethod]
diff --git a/TTSTextNormalization.Tests/Rules/WhitespaceNormalizationRuleTests.cs b/TTSTextNormalization.Tests/Rules/WhitespaceNormalizationRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using TTSTextNormalization.Rules;
+using TTSTextNormalization.Rules;
 
 namespace TTSTextNormalization.Tests.Rules;
 
@@ -109,6 +109,6 @@ public void Apply_NullInput_ThrowsArgumentNullException()
         // Arrange
         string? input = null;
         // Act & Assert
-        Assert.ThrowsException<ArgumentNullException>(() => _rule.Apply(input!));
+        Assert.Throws<ArgumentNullException>(() => _rule.Apply(input!));
     }
-}
+}
diff --git a/TTSTextNormalization.Tests/TTSTextNormalization.Tests.csproj b/TTSTextNormalization.Tests/TTSTextNormalization.Tests.csproj
@@ -1,53 +1,30 @@
-<Project Sdk="MSTest.Sdk/3.6.4">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net10.0;net9.0</TargetFrameworks>
     <LangVersion>preview</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <!--
-      Displays error on console in addition to the log file. Note that this feature comes with a performance impact.
-      For more information, visit https://learn.microsoft.com/dotnet/core/testing/unit-testing-platform-integration-dotnet-test#show-failure-per-test
-      -->
-    <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\TTSTextNormalization\TTSTextNormalization.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="Microsoft.Testing.Extensions.TrxReport" Version="1.6.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="MSTest.Analyzers" Version="3.8.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.1.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.1.0" />
+    <PackageReference Include="MSTest.Analyzers" Version="4.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-  </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="MSTest.TestAdapter" Version="3.8.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="MSTest.TestFramework" Version="3.8.3" />
+    <ProjectReference Include="..\TTSTextNormalization\TTSTextNormalization.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/TTSTextNormalization/TTSTextNormalization.csproj b/TTSTextNormalization/TTSTextNormalization.csproj
@@ -53,15 +53,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.4" />
-	  <PackageReference Include="MinVer" Version="6.0.0">
+    <PackageReference Include="Humanizer.Core" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.3" />
+	  <PackageReference Include="MinVer" Version="7.0.0">
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		  <PrivateAssets>all</PrivateAssets>
 	  </PackageReference>
-	  <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25">
+	  <PackageReference Include="DotNet.ReproducibleBuilds" Version="2.0.2">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 	  </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Microsoft.Extensions.Options;`
	`1`	`+using Microsoft.Extensions.Options;`
`2`	`2`	`using TTSTextNormalization.Rules;`
`3`	`3`
`4`	`4`	`namespace TTSTextNormalization.Tests.Rules;`
`@@ -52,7 +52,7 @@ public void Apply_KnownEmojis_ReplacesWithGeneratedName(string input, string exp`
`52`	`52`	`public void Apply_NullInput_ThrowsArgumentNullException()`
`53`	`53`	`{`
`54`	`54`	`string? input = null;`
`55`		`- Assert.ThrowsException<ArgumentNullException>(() => _rule.Apply(input!));`
	`55`	`+ Assert.Throws<ArgumentNullException>(() => _rule.Apply(input!));`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`[TestMethod]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using TTSTextNormalization.Rules;`
	`1`	`+using TTSTextNormalization.Rules;`
`2`	`2`
`3`	`3`	`namespace TTSTextNormalization.Tests.Rules;`
`4`	`4`
`@@ -97,6 +97,6 @@ public void Apply_NonStandaloneNumbers_NoChange(string input, string expected)`
`97`	`97`	`public void Apply_NullInput_ThrowsArgumentNullException()`
`98`	`98`	`{`
`99`	`99`	`string? input = null;`
`100`		`- Assert.ThrowsException<ArgumentNullException>(() => _rule.Apply(input!));`
	`100`	`+ Assert.Throws<ArgumentNullException>(() => _rule.Apply(input!));`
`101`	`101`	`}`
`102`		`-}`
	`102`	`+}`