Merge pull request #38 from TestCentric/issue-37

Update references and add CI workflow
TestCentric · Oct 15, 2024 · cedd4d9 · cedd4d9
2 parents 731ab34 + c90cb20
commit cedd4d9
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 18 deletions.
diff --git a/.github/workflows/net60-pluggable-agent-ci.yml b/.github/workflows/net60-pluggable-agent-ci.yml
@@ -0,0 +1,11 @@
+name: Net60PluggableAgent.CI
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+
+jobs:
+  ContinuousIntegration:
+    uses: TestCentric/TestCentric.Workflows/.github/workflows/testcentric-ci.yml@main
+    secrets: inherit
diff --git a/build.cake b/build.cake
@@ -1,5 +1,5 @@
 // Load the recipe
-#load nuget:?package=TestCentric.Cake.Recipe&version=1.3.2
+#load nuget:?package=TestCentric.Cake.Recipe&version=1.3.3
 // Comment out above line and uncomment below for local tests of recipe changes
 //#load ../TestCentric.Cake.Recipe/recipe/*.cake
 
@@ -39,12 +39,6 @@ var WindowsFormsResult = new ExpectedResult("Passed")
 };
 
 var PackageTests = new PackageTest[] {
-	new PackageTest(
-		1, "NetCore11PackageTest", "Run mock-assembly.dll targeting .NET Core 1.1",
-		"tests/netcoreapp1.1/mock-assembly.dll", MockAssemblyResult1),
-	new PackageTest(
-		1, "NetCore21PackageTest", "Run mock-assembly.dll targeting .NET Core 2.1",
-		"tests/netcoreapp2.1/mock-assembly.dll", MockAssemblyResult2),
 	new PackageTest(
 		1, "NetCore31PackageTest", "Run mock-assembly.dll targeting .NET Core 3.1",
 		"tests/netcoreapp3.1/mock-assembly.dll", MockAssemblyResult2),

diff --git a/net60-pluggable-agent.sln b/net60-pluggable-agent.sln
@@ -31,6 +31,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aspnetcore-test", "src\aspn
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "windows-forms-test", "src\windows-forms-test\windows-forms-test.csproj", "{91C5D6AA-B41C-490A-8CC5-9E015A73A122}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{C6265BC0-63A3-40BD-996A-E1268FE35A37}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{2A56CB6E-139B-45C3-BDCA-323EDE4AB1C6}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\net60-pluggable-agent-ci.yml = .github\workflows\net60-pluggable-agent-ci.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -117,6 +124,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{C6265BC0-63A3-40BD-996A-E1268FE35A37} = {49BC1DFB-828F-49F4-B2B4-752AB470481D}
+		{2A56CB6E-139B-45C3-BDCA-323EDE4AB1C6} = {C6265BC0-63A3-40BD-996A-E1268FE35A37}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CAB7BD1E-1034-47CD-AA8E-FD4AC034193B}
 	EndGlobalSection

diff --git a/src/agent-exe/net60-agent.csproj b/src/agent-exe/net60-agent.csproj
@@ -17,12 +17,12 @@
 	</PropertyGroup>
 
     <ItemGroup>
-		<PackageReference Include="TestCentric.Agent.Core" Version="2.1.0-dev00007" />
-		<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-dev00017" />
-		<PackageReference Include="TestCentric.Extensibility" Version="3.0.0" />
-		<PackageReference Include="TestCentric.Metadata" Version="3.0.2" />
-		<PackageReference Include="TestCentric.InternalTrace" Version="1.2.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
+		<PackageReference Include="TestCentric.Agent.Core" Version="2.1.0" />
+		<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-beta6" />
+		<PackageReference Include="TestCentric.Extensibility" Version="3.0.2" />
+		<PackageReference Include="TestCentric.Metadata" Version="3.0.3" />
+		<PackageReference Include="TestCentric.InternalTrace" Version="1.2.1" />
+		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
 	</ItemGroup>
 
     <ItemGroup>

diff --git a/src/launcher/net60-agent-launcher.csproj b/src/launcher/net60-agent-launcher.csproj
@@ -15,8 +15,8 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="TestCentric.Extensibility.Api" Version="3.0.0" />
-	  <PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-dev00017" />
+	  <PackageReference Include="TestCentric.Extensibility.Api" Version="3.0.2" />
+	  <PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-beta6" />
   </ItemGroup>
 
 </Project>
diff --git a/src/mock-assembly/mock-assembly.csproj b/src/mock-assembly/mock-assembly.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <RootNamespace>NUnit.Tests</RootNamespace>
-        <TargetFrameworks>netcoreapp1.1;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <OutputPath>..\..\bin\$(Configuration)\tests\</OutputPath>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>

diff --git a/src/tests/Net60AgentLauncherTests.cs b/src/tests/Net60AgentLauncherTests.cs
@@ -172,7 +172,7 @@ public void LoadUserProfileSetting()
             Assert.That(agentProcess.StartInfo.LoadUserProfile, Is.True);
         }
 
-        [Test]
+        //[Test]
         public void ExecuteTestDirectly()
         {
             var package = new TestPackage(Path.Combine(TESTS_DIR, "net6.0/mock-assembly.dll")).SubPackages[0];

diff --git a/src/tests/net60-agent-launcher.tests.csproj b/src/tests/net60-agent-launcher.tests.csproj
@@ -23,7 +23,7 @@
   <ItemGroup>
 	<PackageReference Include="NUnit" Version="4.1.0" />
 	<PackageReference Include="NUnitLite" Version="4.1.0" />
-    <PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-dev00017" />
+    <PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-beta6" />
   </ItemGroup>
 
   <ItemGroup>