Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added net core support #75

Merged
merged 6 commits into from
Nov 23, 2020
+30 −176
Merged

Added net core support #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5c9cda
Updated csproj to new format and added netstandard build target
oldmine Oct 6, 2020
a9cf9ad
Added PrivateAssets to don't add dependency from NUnit.Engine.Api
oldmine Oct 6, 2020
ef75ded
Set image with updated msbuild
oldmine Oct 6, 2020
578cb89
Updated paths to dlls after added many target frameworks
oldmine Oct 6, 2020
d98328b
Updated path for INTEGRATION_TEST_ASSEMBLY
oldmine Oct 6, 2020
e669afa
Remove path duplication
oldmine Oct 6, 2020
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: 3 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# base image
image: Visual Studio 2019

build_script:
- ps: .\build.ps1 -Target "Appveyor"

Expand Down
6 changes: 4 additions & 2 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,12 @@ if (BuildSystem.IsRunningOnAppVeyor)
//////////////////////////////////////////////////////////////////////

// Directories
var TARGET_FRAMEWORK = "net20";
var PROJECT_DIR = Context.Environment.WorkingDirectory.FullPath + "/";
var PACKAGE_DIR = PROJECT_DIR + "package/";
var TOOLS_DIR = PROJECT_DIR + "tools/";
var BIN_DIR = PROJECT_DIR + "bin/" + configuration + "/";
var BIN_CONFIG_DIR = PROJECT_DIR + "bin/" + configuration + "/";
var BIN_DIR = BIN_CONFIG_DIR + TARGET_FRAMEWORK + "/";
var BIN_SRC = BIN_DIR; // Source of binaries used in packaging
var TEST_NUNIT_DIR = PROJECT_DIR + "bin/nunit/";
var TEST_PACKAGES_DIR = PROJECT_DIR + "bin/packages/";
Expand All @@ -85,7 +87,7 @@ var SOLUTION_FILE = PROJECT_DIR + "teamcity-event-listener.sln";
var TEST_SOLUTION_FILE = PROJECT_DIR + "teamcity-event-listener-tests.sln";
var NUNIT3_CONSOLE = TOOLS_DIR + "NUnit.ConsoleRunner.3.8.0/tools/nunit3-console.exe";
var TEST_ASSEMBLY = BIN_DIR + "teamcity-event-listener.tests.dll";
var INTEGRATION_TEST_ASSEMBLY = BIN_DIR + "nunit.integration.tests.dll";
var INTEGRATION_TEST_ASSEMBLY = BIN_CONFIG_DIR + "nunit.integration.tests.dll";

// MetaData used in the nuget and chocolatey packages
var GITHUB_SITE = "https://github.com/nunit/teamcity-event-listener";
Expand Down
35 changes: 0 additions & 35 deletions src/extension/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/extension/packages.config
View file
Open in desktop

This file was deleted.

61 changes: 12 additions & 49 deletions src/extension/teamcity-event-listener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{A867079B-A172-4DAE-9549-63B331092A23}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NUnit.Engine.Listeners</RootNamespace>
<AssemblyName>teamcity-event-listener</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Version>1.0.8.0</Version>
<Copyright>Copyright © 2016</Copyright>
<Description>NUnit Engine extension that helps integration with TeamCity.</Description>
<TargetFrameworks>net20;netstandard2.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand All @@ -23,6 +23,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<LangVersion>5</LangVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
Expand All @@ -33,53 +34,15 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<LangVersion>5</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.Engine.Api.3.7.0\lib\nunit.engine.api.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Event.cs" />
<Compile Include="EventId.cs" />
<Compile Include="Hierarchy.cs" />
<Compile Include="IEventConverter.cs" />
<Compile Include="IHierarchy.cs" />
<Compile Include="IServiceMessageFactory.cs" />
<Compile Include="IServiceMessageWriter.cs" />
<Compile Include="ISuiteNameReplacer.cs" />
<Compile Include="ITeamCityInfo.cs" />
<Compile Include="ServiceMessageFactory.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceMessage.cs" />
<Compile Include="ServiceMessageAttr.cs" />
<Compile Include="ServiceMessageWriter.cs" />
<Compile Include="EventConverter3.cs" />
<Compile Include="EventConverter2.cs" />
<Compile Include="Statistics.cs" />
<Compile Include="SuiteNameReplacer.cs" />
<Compile Include="TeamCityEventListener.cs" />
<Compile Include="SafeAttributeAccess.cs" />
<Compile Include="TeamCityInfo.cs" />
<Compile Include="TeamCityVersion.cs" />
</ItemGroup>

<ItemGroup>
<Content Include="LICENSE.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<None Include="packages.config" />
<PackageReference Include="NUnit.Engine.Api" Version="3.11.1" PrivateAssets="all" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->

</Project>
35 changes: 0 additions & 35 deletions src/tests/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/tests/packages.config
View file
Open in desktop

This file was deleted.

57 changes: 11 additions & 46 deletions src/tests/teamcity-event-listener.tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{709AFF60-B15E-43D5-830A-F22E4701D8B8}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NUnit.Engine.Listeners</RootNamespace>
<AssemblyName>teamcity-event-listener.tests</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFramework>net20</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand All @@ -22,6 +19,7 @@
<WarningLevel>4</WarningLevel>
<LangVersion>5</LangVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
Expand All @@ -31,47 +29,14 @@
<WarningLevel>4</WarningLevel>
<LangVersion>5</LangVersion>
</PropertyGroup>

<ItemGroup>
<Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.Engine.Api.3.7.0\lib\nunit.engine.api.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.7.1\lib\net20\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="NUnit.System.Linq, Version=0.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.7.1\lib\net20\NUnit.System.Linq.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<ProjectReference Include="..\extension\teamcity-event-listener.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Include="ServiceMessageWriterTest.cs" />
<Compile Include="SuiteNameReplacerTest.cs" />
<Compile Include="TeamCityEventListener2IntegrationTests.cs" />
<Compile Include="TeamCityEventListenerIntegrationTests.cs" />
<Compile Include="TeamCityVersionTest.cs" />
<Compile Include="TestUtil.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TeamCityEventListener3IntegrationTests.cs" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit.Engine.Api" Version="3.11.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\extension\teamcity-event-listener.csproj">
<Project>{a867079b-a172-4dae-9549-63b331092a23}</Project>
<Name>teamcity-event-listener</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->

</Project>