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
3 changes: 0 additions & 3 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,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),
Expand Down
Binary file removed nunit.snk
Binary file not shown.
86 changes: 86 additions & 0 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<!-- Top level Directory.Build.props -->
<Project>

<PropertyGroup>
<!-- Compile and Build Settings -->
<LangVersion>12</LangVersion>
<Features>strict</Features>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<!--<EnableNETAnalyzers>true</EnableNETAnalyzers>
<AnalysisMode>Minimum</AnalysisMode>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>-->
<Version Condition="'$(Version)'==''">2.0.0.0</Version>
<OutputPath>$(MSBuildThisFileDirectory)\..\bin\$(Configuration)\</OutputPath>
<PlatformTarget>AnyCPU</PlatformTarget>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<RollForward>Major</RollForward>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<!-- Signing Assemblies -->
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)testcentric.snk</AssemblyOriginatorKeyFile>
<!-- Debugging -->
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
<!-- Commonly Used Package Versions -->
<AgentCoreVersion>2.2.0-dev00015</AgentCoreVersion>
<EngineVersion>2.0.0-dev01659</EngineVersion>
<ExtensibilityVersion>4.0.0-dev00004</ExtensibilityVersion>
<MetadataVersion>3.0.4</MetadataVersion>
<InternalTraceVersion>1.2.1</InternalTraceVersion>
<!-- Informational Settings -->
<Company>TestCentric</Company>
<Product>TestCentric Gui Runner and Engine</Product>
<Trademark>TestCentric is a trademark of the TestCentric Project</Trademark>
<!-- Keys for Friend Assemblies -->
<NUnitPublicKey>002400000480000094000000060200000024000052534131000400000100010031eea370b1984bfa6d1ea760e1ca6065cee41a1a279ca234933fe977a096222c0e14f9e5a17d5689305c6d7f1206a85a53c48ca010080799d6eeef61c98abd18767827dc05daea6b6fbd2e868410d9bee5e972a004ddd692dec8fa404ba4591e847a8cf35de21c2d3723bc8d775a66b594adeb967537729fe2a446b548cd57a6</NUnitPublicKey>
<NSubstitutePublicKey>0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</NSubstitutePublicKey>
</PropertyGroup>

<!-- Version of NUnit and NSubstitute used depends on the target framework -->
<PropertyGroup Condition="'$(TargetFramework)'=='net35'
OR '$(TargetFramework)'=='netcoreapp2.1' OR '$(TargetFramework)'=='netcoreapp3.1'
OR '$(TargetFramework)'=='net5.0' Or '$(TargetFramework)'=='net5.0-windows'" >
<NUnitVersion>3.14.0</NUnitVersion>
<NSubstituteVersion>2.0.3</NSubstituteVersion>
</PropertyGroup>

<!-- Default versions for targets not listed above -->
<PropertyGroup>
<NUnitVersion Condition="'$(NUnitVersion)'==''">4.1.0</NUnitVersion>
<NSubstituteVersion Condition="'$(NSubstituteVersion)'==''">5.3.0</NSubstituteVersion>
</PropertyGroup>

<!-- Common package metadata, may be overridden in individual projects -->
<!-- Each project should supply properties for PackageId, Title and Description -->
<PropertyGroup>
<PackageOutputPath>$(MSBuildThisFileDirectory)..\package</PackageOutputPath>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Authors>CharliePoole</Authors>
<Owners>CharliePoole</Owners>
<Copyright>Charlie Poole and TestCentric Contributors. MIT License.</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<RequireLicenseAcceptance>false</RequireLicenseAcceptance>
<PackageProjectUrl>>https://test-centric.org</PackageProjectUrl>
<!--<PackageIcon>testcentric.png</PackageIcon>
<PackageIconUrl>https://cdn.rawgit.com/nunit/resources/master/images/icon/nunit_256.png</PackageIconUrl>
<PackageReleaseNotes>https://docs.nunit.org/articles/nunit/release-notes/console-and-engine.html</PackageReleaseNotes>-->
<RepositoryUrl>https://github.com/TestCentric/testcentric-gui</RepositoryUrl>
<!--<ReleaseNotes>https://docs.nunit.org/articles/nunit/release-notes/console-and-engine.html</ReleaseNotes>-->
</PropertyGroup>

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\LICENSE.txt" Pack="true" PackagePath="\" />
<None Include="$(MSBuildThisFileDirectory)..\testcentric.png" Pack="true" PackagePath="\" />
</ItemGroup>

<!-- Code Style Analyzers -->
<!--<ItemGroup>
<PackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" PrivateAssets="all" />
<GlobalAnalyzerConfigFiles Include="$(MSBuildThisFileDirectory)/StyleCop.Analyzers.globalconfig" />
<PackageReference Include="CSharpIsNullAnalyzer" Version="0.1.593" PrivateAssets="all" />
</ItemGroup>-->

</Project>
9 changes: 6 additions & 3 deletions src/aspnetcore-test/aspnetcore-test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<OutputPath>..\..\bin\$(Configuration)\tests\</OutputPath>
<OutputType>Library</OutputType>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<OutputType>Library</OutputType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
</ItemGroup>

<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>

</Project>
32 changes: 3 additions & 29 deletions src/mock-assembly/mock-assembly.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,13 @@

<PropertyGroup>
<RootNamespace>NUnit.Tests</RootNamespace>
<TargetFrameworks>netcoreapp1.1;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<OutputPath>..\..\bin\$(Configuration)\tests\</OutputPath>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<NuGetAudit>false</NuGetAudit>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'">
<PackageReference Include="NUnit" Version="3.12.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="NUnit" Version="3.14.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="NUnit" Version="3.14.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="NUnit" Version="3.14.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="NUnit" Version="4.1.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="NUnit" Version="4.1.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="NUnit" Version="4.1.0" />
<ItemGroup>
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
</ItemGroup>

</Project>
15 changes: 5 additions & 10 deletions src/net80-agent/net80-agent.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,21 @@
<OutputType>Exe</OutputType>
<RootNamespace>TestCentric.Agent</RootNamespace>
<TargetFramework>net8.0</TargetFramework>
<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>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
<AssemblyTitle>Net70 Pluggable Agent</AssemblyTitle>
<Description>Pluggable Agent for running tests under .NET 7.0</Description>
<Copyright>Copyright (c) 2023 Charlie Poole</Copyright>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="TestCentric.Agent.Core" Version="2.2.0-dev00013" />
<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-dev01657" />
<PackageReference Include="TestCentric.Extensibility" Version="4.0.0-dev00004" />
<PackageReference Include="TestCentric.Metadata" Version="3.0.4" />
<PackageReference Include="TestCentric.InternalTrace" Version="1.2.1" />
<PackageReference Include="TestCentric.Agent.Core" Version="$(AgentCoreVersion)" />
<PackageReference Include="TestCentric.Engine.Api" Version="$(EngineVersion)" />
<PackageReference Include="TestCentric.Extensibility" Version="$(ExtensibilityVersion)" />
<PackageReference Include="TestCentric.Metadata" Version="$(MetadataVersion)" />
<PackageReference Include="TestCentric.InternalTrace" Version="$(InternalTraceVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
</ItemGroup>

Expand Down
14 changes: 3 additions & 11 deletions src/net80-launcher-tests/net80-agent-launcher.tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,19 @@
<OutputType>Exe</OutputType>
<RootNamespace>TestCentric.Agent</RootNamespace>
<TargetFramework>net462</TargetFramework>
<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<ApplicationIcon>..\testcentric.ico</ApplicationIcon>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>

<ItemGroup>
<Reference Include="System.Runtime.Remoting" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\net80-launcher\net80-agent-launcher.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="NUnitLite" Version="4.1.0" />
<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-dev01657" />
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
<PackageReference Include="NUnitLite" Version="$(NUnitVersion)" />
<PackageReference Include="TestCentric.Engine.Api" Version="$(EngineVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 2 additions & 11 deletions src/net80-launcher/net80-agent-launcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,12 @@
<PropertyGroup>
<RootNamespace>TestCentric.Engine</RootNamespace>
<TargetFramework>net462</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
<Reference Include="System.Runtime.Remoting" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-dev01657" />
<PackageReference Include="TestCentric.Extensibility.Api" Version="4.0.0-dev00004" />
<PackageReference Include="TestCentric.Engine.Api" Version="$(EngineVersion)" />
<PackageReference Include="TestCentric.Extensibility" Version="$(ExtensibilityVersion)" />
</ItemGroup>

</Project>
File renamed without changes.
3 changes: 1 addition & 2 deletions src/windows-forms-test/windows-forms-test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
<TargetFrameworks>net8.0-windows</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
<OutputPath>..\..\bin\$(Configuration)\tests\</OutputPath>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
</ItemGroup>

</Project>
Loading