Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
next-version: 2.5.0
next-version: 2.5.2
mode: ContinuousDelivery
legacy-semver-padding: 5
build-metadata-padding: 5
Expand Down
24 changes: 13 additions & 11 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// Comment out above line and uncomment below for local tests of recipe changes
//#load ../TestCentric.Cake.Recipe/recipe/*.cake

const string AGENT_NAME = "testcentric-net80-agent";

BuildSettings.Initialize
(
context: Context,
Expand Down Expand Up @@ -79,12 +81,12 @@ BuildSettings.Packages.Add(new NuGetPackage(
"net80-agent-launcher.dll", "net80-agent-launcher.pdb",
"TestCentric.Extensibility.Api.dll", "TestCentric.Engine.Api.dll" ),
new DirectoryContent("tools/agent").WithFiles(
"agent/net80-agent.dll", "agent/net80-agent.pdb", "agent/net80-agent.dll.config", "agent/TestCentric.Agent.Core.dll",
"agent/net80-agent.deps.json", $"agent/net80-agent.runtimeconfig.json",
"agent/TestCentric.InternalTrace.dll", "agent/TestCentric.Metadata.dll",
"agent/TestCentric.Extensibility.dll", "agent/TestCentric.Extensibility.Api.dll",
"agent/testcentric.engine.api.dll", "agent/Microsoft.Extensions.DependencyModel.dll") ),
testRunner: new AgentRunner(BuildSettings.NuGetTestDirectory + "TestCentric.Extension.Net80PluggableAgent." + BuildSettings.PackageVersion + "/tools/agent/net80-agent.dll"),
$"agent/{AGENT_NAME}.dll", $"agent/{AGENT_NAME}.pdb", $"agent/{AGENT_NAME}.dll.config",
$"agent/{AGENT_NAME}.deps.json", $"agent/{AGENT_NAME}.runtimeconfig.json",
"agent/TestCentric.InternalTrace.dll", "agent/TestCentric.Metadata.dll", "agent/TestCentric.Agent.Core.dll",
"agent/TestCentric.Extensibility.dll", "agent/TestCentric.Extensibility.Api.dll",
"agent/testcentric.engine.api.dll", "agent/Microsoft.Extensions.DependencyModel.dll") ),
testRunner: new AgentRunner($"{BuildSettings.NuGetTestDirectory}TestCentric.Extension.Net80PluggableAgent.{BuildSettings.PackageVersion}/tools/agent/{AGENT_NAME}.dll"),
tests: PackageTests) );

BuildSettings.Packages.Add(new ChocolateyPackage(
Expand All @@ -100,12 +102,12 @@ BuildSettings.Packages.Add(new ChocolateyPackage(
"net80-agent-launcher.dll", "net80-agent-launcher.pdb",
"TestCentric.Extensibility.Api.dll", "TestCentric.Engine.Api.dll" ),
new DirectoryContent("tools/agent").WithFiles(
"agent/net80-agent.dll", "agent/net80-agent.pdb", "agent/net80-agent.dll.config", "agent/TestCentric.Agent.Core.dll",
"agent/net80-agent.deps.json", $"agent/net80-agent.runtimeconfig.json",
"agent/TestCentric.InternalTrace.dll", "agent/TestCentric.Metadata.dll",
"agent/TestCentric.Extensibility.dll", "agent/TestCentric.Extensibility.Api.dll",
$"agent/{AGENT_NAME}.dll", $"agent/{AGENT_NAME}.pdb", $"agent/{AGENT_NAME}.dll.config",
$"agent/{AGENT_NAME}.deps.json", $"agent/{AGENT_NAME}.runtimeconfig.json",
"agent/TestCentric.InternalTrace.dll", "agent/TestCentric.Metadata.dll", "agent/TestCentric.Agent.Core.dll",
"agent/TestCentric.Extensibility.dll", "agent/TestCentric.Extensibility.Api.dll",
"agent/TestCentric.Engine.Api.dll", "agent/Microsoft.Extensions.DependencyModel.dll") ),
testRunner: new AgentRunner(BuildSettings.ChocolateyTestDirectory + "testcentric-extension-net80-pluggable-agent." + BuildSettings.PackageVersion + "/tools/agent/net80-agent.dll"),
testRunner: new AgentRunner($"{BuildSettings.ChocolateyTestDirectory}testcentric-extension-net80-pluggable-agent.{BuildSettings.PackageVersion}/tools/agent/{AGENT_NAME}.dll"),
tests: PackageTests) );

//////////////////////////////////////////////////////////////////////
Expand Down
9 changes: 5 additions & 4 deletions src/agent-exe/net80-agent.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
<OutputPath>..\..\bin\$(Configuration)\agent\</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AssemblyName>testcentric-net80-agent</AssemblyName>
<ApplicationManifest>app.manifest</ApplicationManifest>
<ApplicationIcon>..\testcentric.ico</ApplicationIcon>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
Expand All @@ -18,10 +19,10 @@
</PropertyGroup>

<ItemGroup>
<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.Agent.Core" Version="2.1.1" />
<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-beta7" />
<PackageReference Include="TestCentric.Extensibility" Version="3.1.0" />
<PackageReference Include="TestCentric.Metadata" Version="3.0.4" />
<PackageReference Include="TestCentric.InternalTrace" Version="1.2.1" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/launcher/net80-agent-launcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-beta6" />
<PackageReference Include="TestCentric.Extensibility.Api" Version="3.0.2" />
<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-beta7" />
<PackageReference Include="TestCentric.Extensibility.Api" Version="3.1.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/tests/net80-agent-launcher.tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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-beta6" />
<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-beta7" />
</ItemGroup>

<ItemGroup>
Expand Down