Update to beta4 engine and latest net 8.0 agent

TestCentric · Nov 23, 2023 · 123dcab · 123dcab
1 parent 0c38843
commit 123dcab
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/build.cake b/build.cake
@@ -1,10 +1,10 @@
 // NOTE: This must match what is actually referenced by
 // the GUI test model project. Hopefully, this is a temporary
 // fix, which we can get rid of in the future.
-const string REF_ENGINE_VERSION = "2.0.0-dev00035";
+const string REF_ENGINE_VERSION = "2.0.0-beta4";
 
 // Load the recipe
-#load nuget:?package=TestCentric.Cake.Recipe&version=1.1.0-dev00065
+#load nuget:?package=TestCentric.Cake.Recipe&version=1.1.0-dev00066
 // Comment out above line and uncomment below for local tests of recipe changes
 //#load ../TestCentric.Cake.Recipe/recipe/*.cake
 

diff --git a/package-tests.cake b/package-tests.cake
@@ -50,9 +50,15 @@ public static void DefinePackageTests()
         MockAssemblyExpectedResult("Net60AgentLauncher")));
 
     PackageTests.Add(new PackageTest(1, "Net70Test", "Run mock-assembly.dll under .NET 7.0",
-        "net7.0/mock-assembly.dll --trace:Debug",
+        "net7.0/mock-assembly.dll",
         MockAssemblyExpectedResult("Net70AgentLauncher")));
 
+    // Can't run .NET 8.0 tests under appveyor yet
+    if (!BuildSettings.IsRunningOnAppVeyor)
+        PackageTests.Add(new PackageTest(1, "Net80Test", "Run mock-assembly.dll under .NET 8.0",
+            "net8.0/mock-assembly.dll",
+            MockAssemblyExpectedResult("Net80AgentLauncher")));
+
     // AspNetCore tests
 
 	PackageTests.Add(new PackageTest(1, "AspNetCore31Test", "Run test using AspNetCore under .NET Core 3.1",
@@ -83,14 +89,6 @@ public static void DefinePackageTests()
             Assemblies = new [] { new ExpectedAssemblyResult("aspnetcore-test.dll", "Net70AgentLauncher") }
         }));
 
-    // TODO: Need a --runtime command-line option to do this test
-    //// We can't yet mock-assembly under .NET 8.0 until we use VS 17.8, so we just run the .NET 7.0
-    //// build under .NET 8.0. On AppVeyor, we can't even do that.
-    //if (!BuildSettings.IsRunningOnAppVeyor)
-    //    packageTests.Add(new PackageTest(1, "Net80Test", "Run mock-assembly.dll targeting .NET 7.0 under .NET 8.0",
-    //        "engine-tests/net7.0/mock-assembly.dll --trace:Debug --runtime:netcore-8.0",
-    //        MockAssemblyExpectedResult("Net80AgentLauncher")));
-
 	// Windows Forms Tests
 
     PackageTests.Add(new PackageTest(1, "Net50WindowsFormsTest", "Run test using windows forms under .NET 5.0",

diff --git a/src/TestModel/model/TestCentric.Gui.Model.csproj b/src/TestModel/model/TestCentric.Gui.Model.csproj
@@ -15,7 +15,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Mono.Options" Version="6.12.0.148" />
-		<PackageReference Include="TestCentric.Engine" Version="2.0.0-dev00035" />
+		<PackageReference Include="TestCentric.Engine" Version="2.0.0-beta4" />
 		<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-beta4" />
 		<PackageReference Include="TestCentric.Extensibility" Version="2.0.0" />
 		<PackageReference Include="TestCentric.InternalTrace" Version="1.0.0" />

diff --git a/src/tests/mock-assembly/mock-assembly.csproj b/src/tests/mock-assembly/mock-assembly.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>NUnit.Tests</RootNamespace>
-    <TargetFrameworks>net35;net462;net48;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net35;net462;net48;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\testcentric.snk</AssemblyOriginatorKeyFile>
     <OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>