Merge pull request #75 from oldmine/dev/netCoreSupport

Added net core support
nunit · Nov 23, 2020 · d6bf628 · d6bf628
2 parents a03222f + e669afa
commit d6bf628
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 176 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,3 +1,6 @@
+# base image
+image: Visual Studio 2019
+
 build_script: 
   - ps: .\build.ps1 -Target "Appveyor"
 

diff --git a/build.cake b/build.cake
@@ -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/";
@@ -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";

diff --git a/src/extension/Properties/AssemblyInfo.cs b/src/extension/Properties/AssemblyInfo.cs
diff --git a/src/extension/packages.config b/src/extension/packages.config
diff --git a/src/extension/teamcity-event-listener.csproj b/src/extension/teamcity-event-listener.csproj
@@ -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>
@@ -23,6 +23,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LangVersion>5</LangVersion>
   </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
@@ -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>
diff --git a/src/tests/Properties/AssemblyInfo.cs b/src/tests/Properties/AssemblyInfo.cs
diff --git a/src/tests/packages.config b/src/tests/packages.config
diff --git a/src/tests/teamcity-event-listener.tests.csproj b/src/tests/teamcity-event-listener.tests.csproj
@@ -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>
@@ -22,6 +19,7 @@
     <WarningLevel>4</WarningLevel>
     <LangVersion>5</LangVersion>
   </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
@@ -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>