Bump test project SDK and package versions

Washi1337 · Jan 17, 2025 · eb34a8f · eb34a8f
1 parent 5d121df
commit eb34a8f
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 58 deletions.
diff --git a/src/Platforms/Echo.Platforms.AsmResolver/Echo.Platforms.AsmResolver.csproj b/src/Platforms/Echo.Platforms.AsmResolver/Echo.Platforms.AsmResolver.csproj
@@ -25,7 +25,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.1" />
+      <PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.2" />
       <PackageReference Include="Nullable" Version="1.3.1">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/test/Core/Echo.Ast.Tests/Echo.Ast.Tests.csproj b/test/Core/Echo.Ast.Tests/Echo.Ast.Tests.csproj
@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-        <PackageReference Include="coverlet.collector" Version="1.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/Core/Echo.ControlFlow.Tests/Analysis/Domination/DominanceFrontierTest.cs b/test/Core/Echo.ControlFlow.Tests/Analysis/Domination/DominanceFrontierTest.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Echo.ControlFlow.Analysis.Domination;
 using Echo.Graphing;
 using Echo.Platforms.DummyPlatform;
@@ -85,8 +86,8 @@ public void Loop()
             cfg.EntryPoint = nodes[0];
 
             var tree = DominatorTree<int>.FromGraph(cfg);
-            Assert.Equal(new HashSet<INode> {nodes[2]}, tree.GetDominanceFrontier(nodes[1]));
-            Assert.Equal(new HashSet<INode> {nodes[2]}, tree.GetDominanceFrontier(nodes[2]));
+            Assert.Equal(new HashSet<ControlFlowNode<int>> {nodes[2]}, tree.GetDominanceFrontier(nodes[1]).ToHashSet());
+            Assert.Equal(new HashSet<ControlFlowNode<int>> {nodes[2]}, tree.GetDominanceFrontier(nodes[2]).ToHashSet());
         }
 
         [Fact]
@@ -127,16 +128,16 @@ public void Complex()
 
             var tree = DominatorTree<int>.FromGraph(cfg);
             Assert.Empty(tree.GetDominanceFrontier(nodes[0]));
-            Assert.Equal(new HashSet<INode> {nodes[1]}, tree.GetDominanceFrontier(nodes[1]));
-            Assert.Equal(new HashSet<INode> {nodes[3]}, tree.GetDominanceFrontier(nodes[2]));
-            Assert.Equal(new HashSet<INode> {nodes[1], nodes[3]}, tree.GetDominanceFrontier(nodes[3]));
-            Assert.Equal(new HashSet<INode> {nodes[1], nodes[3], nodes[4]}, tree.GetDominanceFrontier(nodes[4]));
-            Assert.Equal(new HashSet<INode> {nodes[7]}, tree.GetDominanceFrontier(nodes[5]));
-            Assert.Equal(new HashSet<INode> {nodes[7]}, tree.GetDominanceFrontier(nodes[6]));
-            Assert.Equal(new HashSet<INode> {nodes[1], nodes[3], nodes[4], nodes[7]}, tree.GetDominanceFrontier(nodes[7]));
-            Assert.Equal(new HashSet<INode> {nodes[1], nodes[3], nodes[7]}, tree.GetDominanceFrontier(nodes[8]));
-            Assert.Equal(new HashSet<INode> {nodes[1]}, tree.GetDominanceFrontier(nodes[9]));
-            Assert.Equal(new HashSet<INode> {nodes[7]}, tree.GetDominanceFrontier(nodes[10]));
+            Assert.Equal(new HashSet<ControlFlowNode<int>> {nodes[1]}, tree.GetDominanceFrontier(nodes[1]).ToHashSet());
+            Assert.Equal(new HashSet<ControlFlowNode<int>> {nodes[3]}, tree.GetDominanceFrontier(nodes[2]).ToHashSet());
+            Assert.Equal(new HashSet<ControlFlowNode<int>> {nodes[1], nodes[3]}, tree.GetDominanceFrontier(nodes[3]).ToHashSet());
+            Assert.Equal(new HashSet<ControlFlowNode<int>> {nodes[1], nodes[3], nodes[4]}, tree.GetDominanceFrontier(nodes[4]).ToHashSet());
+            Assert.Equal(new HashSet<ControlFlowNode<int>> {nodes[7]}, tree.GetDominanceFrontier(nodes[5]).ToHashSet());
+            Assert.Equal(new HashSet<ControlFlowNode<int>> {nodes[7]}, tree.GetDominanceFrontier(nodes[6]).ToHashSet());
+            Assert.Equal(new HashSet<ControlFlowNode<int>> {nodes[1], nodes[3], nodes[4], nodes[7]}, tree.GetDominanceFrontier(nodes[7]).ToHashSet());
+            Assert.Equal(new HashSet<ControlFlowNode<int>> {nodes[1], nodes[3], nodes[7]}, tree.GetDominanceFrontier(nodes[8]).ToHashSet());
+            Assert.Equal(new HashSet<ControlFlowNode<int>> {nodes[1]}, tree.GetDominanceFrontier(nodes[9]).ToHashSet());
+            Assert.Equal(new HashSet<ControlFlowNode<int>> {nodes[7]}, tree.GetDominanceFrontier(nodes[10]).ToHashSet());
         }
     }
 }
diff --git a/test/Core/Echo.ControlFlow.Tests/Echo.ControlFlow.Tests.csproj b/test/Core/Echo.ControlFlow.Tests/Echo.ControlFlow.Tests.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <LangVersion>12</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/Core/Echo.DataFlow.Tests/Echo.DataFlow.Tests.csproj b/test/Core/Echo.DataFlow.Tests/Echo.DataFlow.Tests.csproj
@@ -6,9 +6,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/Core/Echo.Tests/Echo.Tests.csproj b/test/Core/Echo.Tests/Echo.Tests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Echo.Platforms.AsmResolver.Tests.csproj b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Echo.Platforms.AsmResolver.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
 
@@ -13,12 +13,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Fody" Version="6.6.0" PrivateAssets="all" />
-        <PackageReference Include="InlineIL.Fody" Version="1.7.1" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-        <PackageReference Include="coverlet.collector" Version="1.2.0" />
+        <PackageReference Include="Fody" Version="6.9.1" PrivateAssets="all" />
+        <PackageReference Include="InlineIL.Fody" Version="1.10.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/CilVirtualMachineTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/CilVirtualMachineTest.cs
@@ -86,7 +86,7 @@ public void SingleStep()
             Assert.True(Assert.Single(_mainThread.CallStack).IsRoot);
         }
 
-        [Fact(Timeout = 5000)]
+        [Fact]
         public void RunShouldTerminate()
         {
             // Prepare dummy method.
@@ -111,7 +111,7 @@ public void RunShouldTerminate()
             Assert.True(Assert.Single(_mainThread.CallStack).IsRoot);
         }
 
-        [Fact(Timeout = 5000)]
+        [Fact]
         public void CancelShouldThrow()
         {
             // Prepare dummy method.

diff --git a/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/Misc/ConvHandlerTest.cs b/test/Platforms/Echo.Platforms.AsmResolver.Tests/Emulation/Dispatch/Misc/ConvHandlerTest.cs
@@ -13,16 +13,16 @@ public ConvHandlerTest(MockModuleFixture fixture)
         }
 
         [Theory]
-        [InlineData(0x7f, CilCode.Conv_I1, 0x7f)]
-        [InlineData(0x7f, CilCode.Conv_Ovf_I1, 0x7f)]
-        [InlineData(0x80, CilCode.Conv_I1, -0x80)]
+        [InlineData(0x7f, CilCode.Conv_I1, 0x7fL)]
+        [InlineData(0x7f, CilCode.Conv_Ovf_I1, 0x7fL)]
+        [InlineData(0x80, CilCode.Conv_I1, -0x80L)]
         [InlineData(0x80, CilCode.Conv_Ovf_I1, null)]
-        [InlineData(0x80, CilCode.Conv_I2, 0x80)]
-        [InlineData(0x7fff, CilCode.Conv_I2, 0x7fff)]
-        [InlineData(0x8000, CilCode.Conv_I2, -0x8000)]
+        [InlineData(0x80, CilCode.Conv_I2, 0x80L)]
+        [InlineData(0x7fff, CilCode.Conv_I2, 0x7fffL)]
+        [InlineData(0x8000, CilCode.Conv_I2, -0x8000L)]
         [InlineData(0x8000, CilCode.Conv_Ovf_I2, null)]
-        [InlineData(0x7fffffff, CilCode.Conv_I4, 0x7fffffff)]
-        [InlineData(0x80000000, CilCode.Conv_I4, -0x80000000)]
+        [InlineData(0x7fffffff, CilCode.Conv_I4, 0x7fffffffL)]
+        [InlineData(0x80000000, CilCode.Conv_I4, -0x80000000L)]
         [InlineData(0x80000000, CilCode.Conv_Ovf_I4, null)]
         public void ConvIToI(long value, CilCode code, long? expectedValue)
         {
@@ -38,8 +38,8 @@ public void ConvIToI(long value, CilCode code, long? expectedValue)
         }
 
         [Theory]
-        [InlineData(1.0, CilCode.Conv_I4, 1)]
-        [InlineData(-1.0, CilCode.Conv_I4, -1)]
+        [InlineData(1.0, CilCode.Conv_I4, 1L)]
+        [InlineData(-1.0, CilCode.Conv_I4, -1L)]
         public void ConvFToI(double value, CilCode code, long? expectedValue)
         {
             var stack = Context.CurrentFrame.EvaluationStack;

diff --git a/test/Platforms/Echo.Platforms.Dnlib.Tests/Echo.Platforms.Dnlib.Tests.csproj b/test/Platforms/Echo.Platforms.Dnlib.Tests/Echo.Platforms.Dnlib.Tests.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-        <PackageReference Include="coverlet.collector" Version="1.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/Platforms/Echo.Platforms.Iced.Tests/Echo.Platforms.Iced.Tests.csproj b/test/Platforms/Echo.Platforms.Iced.Tests/Echo.Platforms.Iced.Tests.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-        <PackageReference Include="coverlet.collector" Version="1.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     </ItemGroup>
 
     <ItemGroup>