concordion · KidFashion · Aug 19, 2017 · Aug 20, 2017 · Aug 20, 2017 · Aug 20, 2017
diff --git a/Concordion.NUnit/Concordion.NUnit.csproj b/Concordion.NUnit/Concordion.NUnit.csproj
@@ -1,72 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{FB522DBB-6F64-4834-9C87-029389AA0ABB}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Concordion.NUnit</RootNamespace>
-    <AssemblyName>Concordion.NUnit</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <Reference Include="nunit.core">
-      <HintPath>..\tools\NUnit-2.6.4\nunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.core.interfaces">
-      <HintPath>..\tools\NUnit-2.6.4\nunit.core.interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\tools\NUnit-2.6.4\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\Concordion\Concordion.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Addin\ConcordionTest.cs" />
-    <Compile Include="Addin\SuiteBuilderAddin.cs" />
-    <Compile Include="Addin\ConcordionTestFixture.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <PackageReference Include="NUnit" Version="2.6.4" />
+    <PackageReference Include="NUnit.Core" Version="2.6.4" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Concordion\Concordion.csproj">
-      <Project>{F401D347-5762-49DA-B7DF-4C6C9E79E08A}</Project>
-      <Name>Concordion</Name>
-    </ProjectReference>
-  </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>
-  -->
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+  </PropertyGroup>
 </Project>
diff --git a/Concordion.NUnit/Properties/AssemblyInfo.cs b/Concordion.NUnit/Properties/AssemblyInfo.cs
diff --git a/Concordion.NUnit3/Concordion.NUnit3.csproj b/Concordion.NUnit3/Concordion.NUnit3.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\Concordion\Concordion.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit.ConsoleRunner.Libs" Version="3.7.0" />
+  </ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+  </PropertyGroup>
+</Project>
diff --git a/Concordion.NUnit3/ConcordionDriverFactory.cs b/Concordion.NUnit3/ConcordionDriverFactory.cs
@@ -0,0 +1,34 @@
+// Copyright 2017 Concordion.org
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
+using System.Reflection;
+using NUnit.Engine.Extensibility;
+
+namespace Concordion.NUnit3
+{
+    [Extension]
+    public class ConcordionFrameworkDriver : IDriverFactory
+    {
+        public bool IsSupportedTestFramework(AssemblyName reference)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IFrameworkDriver GetDriver(AppDomain domain, AssemblyName reference)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Concordion.NUnit3/ConcordionFrameworkDriver.cs b/Concordion.NUnit3/ConcordionFrameworkDriver.cs
@@ -0,0 +1,50 @@
+// Copyright 2017 Concordion.org
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System.Collections.Generic;
+using NUnit.Engine;
+using NUnit.Engine.Extensibility;
+
+namespace Concordion.NUnit3
+{
+    public class ConcordionDriverFactory : IFrameworkDriver
+    {
+        public string Load(string testAssemblyPath, IDictionary<string, object> settings)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public int CountTestCases(string filter)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public string Run(ITestEventListener listener, string filter)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public string Explore(string filter)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void StopRun(bool force)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public string ID { get; set; }
+    }
+}
diff --git a/Concordion.Runners/Concordion.Runners.csproj b/Concordion.Runners/Concordion.Runners.csproj
@@ -1,70 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.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')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C57B6220-6CE6-4165-9144-214BE62CE074}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Concordion.Runners</RootNamespace>
-    <AssemblyName>Concordion.Runners</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\tools\NUnit-2.6.4\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <Compile Include="NUnit\ExecutableSpecification.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\Concordion\Concordion.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Concordion\Concordion.csproj">
-      <Project>{F401D347-5762-49DA-B7DF-4C6C9E79E08A}</Project>
-      <Name>Concordion</Name>
-    </ProjectReference>
+    <PackageReference Include="NUnit" Version="2.6.4" />
   </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="NUnit\ExecutableSpecification.html" />
-  </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>
-  -->
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
 </Project>
diff --git a/Concordion.Runners/Properties/AssemblyInfo.cs b/Concordion.Runners/Properties/AssemblyInfo.cs
diff --git a/Concordion.Spec/Concordion.Spec.config b/Concordion.Spec/Concordion.Spec.config
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Specification>
   <!-- use to define alternative path to specification documents - default = your test DLL -->
-  <BaseInputDirectory path="../../../doc"/>
+  <BaseInputDirectory path="../../../../doc"/>
 
   <!-- use to define alternative output path for Concordion test reports - default = temp directory defined by environment variable %TEMP%
   <BaseOutputDirectory path="C:\Temp" />
@@ -25,4 +25,4 @@
   </ConcordionExtensions>
   -->
 
-</Specification>
+</Specification>