Merge pull request #1001 from TestCentric/update-script

Update script and dependencies

build.cake

@@ -1,32 +1,18 @@
-#tool nuget:?package=GitVersion.CommandLine&version=5.6.3
-
 using System.Xml.Serialization;
 
-const string GITHUB_OWNER = "testcentric";
-const string GITHUB_REPO = "testcentric-gui";
-
-const string DEFAULT_VERSION = "2.0.0";
-static string[] VALID_CONFIGS = new [] { "Release", "Debug" };
-
 // 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-dev00025";
+const string REF_ENGINE_VERSION = "2.0.0-beta3";
 
 // We must use the latest versions of the pre-installed agents
 // which use the engine version specified above.
-const string NET462_AGENT_VERSION = "2.3.0-dev00009";
-const string NET60_AGENT_VERSION = "2.3.0-dev00005";
-const string NET70_AGENT_VERSION = "2.3.0-dev00006";
-
-const string PACKAGE_NAME = "testcentric-gui";
-const string NUGET_PACKAGE_NAME = "TestCentric.GuiRunner";
-
-const string GUI_RUNNER = "testcentric.exe";
-const string GUI_TESTS = "*.Tests.dll";
+const string NET462_AGENT_VERSION = "2.3.0-dev00012";
+const string NET60_AGENT_VERSION = "2.3.0-dev00008";
+const string NET70_AGENT_VERSION = "2.3.0-dev00011";
 
 // Load the recipe
-#load nuget:?package=TestCentric.Cake.Recipe&version=1.1.0-dev00050
+#load nuget:?package=TestCentric.Cake.Recipe&version=1.1.0-dev00055
 // Comment out above line and uncomment below for local tests of recipe changes
 //#load ../TestCentric.Cake.Recipe/recipe/*.cake
 
@@ -89,7 +75,7 @@ var nugetPackage = new NuGetPackage(
 				"nunit.uiexception.dll", "TestCentric.Gui.Model.dll", "Mono.Options.dll",
 				"testcentric.engine.dll", "testcentric.engine.core.dll", "testcentric.engine.api.dll", "TestCentric.InternalTrace.dll",
 				"testcentric.engine.metadata.dll", "testcentric.extensibility.dll", "testcentric.extensibility.api.dll",
-				"testcentric.engine.pdb", "testcentric.engine.core.pdb", "../../nuget/testcentric.nuget.addins"),
+				"testcentric.engine.pdb", "../../nuget/testcentric.nuget.addins"),
 			new DirectoryContent("tools/Images").WithFiles(
 				"Images/DebugTests.png", "Images/RunTests.png", "Images/StopRun.png", "Images/GroupBy_16x.png", "Images/SummaryReport.png"),
 			new DirectoryContent("tools/Images/Tree/Circles").WithFiles(
@@ -131,7 +117,7 @@ var chocolateyPackage = new ChocolateyPackage(
 				"nunit.uiexception.dll", "TestCentric.Gui.Model.dll", "Mono.Options.dll",
 				"testcentric.engine.dll", "testcentric.engine.core.dll", "testcentric.engine.api.dll", "TestCentric.InternalTrace.dll",
 				"testcentric.engine.metadata.dll", "testcentric.extensibility.dll", "testcentric.extensibility.api.dll",
-				"testcentric.engine.pdb", "testcentric.engine.core.pdb", "test-bed.exe", "test-bed.addins"),
+				"testcentric.engine.pdb", "../../choco/testcentric.choco.addins"),
 			new DirectoryContent("tools/Images").WithFiles(
 				"Images/DebugTests.png", "Images/RunTests.png", "Images/StopRun.png", "Images/GroupBy_16x.png", "Images/SummaryReport.png"),
 			new DirectoryContent("tools/Images/Tree/Circles").WithFiles(
@@ -279,4 +265,4 @@ Task("Default")
 // EXECUTION
 //////////////////////////////////////////////////////////////////////
 
-RunTarget(Argument("target", Argument("t", "Default")));
+RunTarget(CommandLineOptions.Target);

src/TestModel/model/TestCentric.Gui.Model.csproj

@@ -15,10 +15,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="Mono.Options" Version="6.12.0.148" />
-		<PackageReference Include="TestCentric.InternalTrace" Version="1.0.0-dev00002" />
-		<PackageReference Include="TestCentric.Extensibility" Version="2.0.0-dev00030" />
-		<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-dev00007" />
-		<PackageReference Include="TestCentric.Engine" Version="2.0.0-dev00025" />
+		<PackageReference Include="TestCentric.InternalTrace" Version="1.0.0" />
+		<PackageReference Include="TestCentric.Extensibility" Version="2.0.0" />
+		<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-beta3" />
+		<PackageReference Include="TestCentric.Engine" Version="2.0.0-beta3" />
 	</ItemGroup>
 
 </Project>

src/TestModel/tests/TestCentric.Gui.Model.Tests.csproj

@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
 	<PropertyGroup>
 		<RootNamespace>TestCentric.Gui.Model</RootNamespace>
 		<AssemblyName>TestCentric.Gui.Model.Tests</AssemblyName>
@@ -8,24 +9,28 @@
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 	</PropertyGroup>
-    <ItemGroup>
+
+	<ItemGroup>
         <Reference Include="System.Windows.Forms" />
     </ItemGroup>
-    <ItemGroup>
+
+	<ItemGroup>
         <ProjectReference Include="..\..\tests\mock-assembly\mock-assembly.csproj">
           <Name>mock-assembly</Name>
         </ProjectReference>
         <ProjectReference Include="..\model\TestCentric.Gui.Model.csproj">
           <Name>TestCentric.Gui.Model</Name>
         </ProjectReference>
     </ItemGroup>
-    <ItemGroup>
+
+	<ItemGroup>
         <PackageReference Include="NSubstitute" Version="4.0.0" />
 		<PackageReference Include="NUnit" Version="3.13.2" />
 		<PackageReference Include="NUnitLite" Version="3.13.2" />
-		<PackageReference Include="TestCentric.InternalTrace" Version="1.0.0-dev00002" />
-		<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-dev00007" />
-		<PackageReference Include="TestCentric.Extensibility" Version="2.0.0-dev00030" />
+		<PackageReference Include="TestCentric.InternalTrace" Version="1.0.0" />
+		<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-beta3" />
+		<PackageReference Include="TestCentric.Extensibility" Version="2.0.0" />
 		<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
 	</ItemGroup>
+
 </Project>