Merge pull request #11 from matiii/net-standard-support

move to net standard

src/Dijkstra.NET/Dijkstra.NET.Benchmark/App.config → src/Dijkstra.NET.Benchmark/App.config

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-  <runtime>
-    <gcAllowVeryLargeObjects enabled="true" />
-  </runtime>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
 </configuration>

src/Dijkstra.NET/Dijkstra.NET.Benchmark/BfsParallelBenchmark.cs → src/Dijkstra.NET.Benchmark/BfsParallelBenchmark.cs

@@ -1,9 +1,9 @@
-namespace Dijkstra.NET.Benchmark
-{
-    using Contract;
-    using Model;
-    using ShortestPath;
+using Dijkstra.NET.Contract;
+using Dijkstra.NET.Model;
+using Dijkstra.NET.ShortestPath;
 
+namespace Dijkstra.NET.Benchmark
+{
     public class BfsParallelBenchmark: DijkstraBenchmarkBase
     {
         public BfsParallelBenchmark()

src/Dijkstra.NET/Dijkstra.NET.Benchmark/Dijkstra.NET.Benchmark.csproj → src/Dijkstra.NET.Benchmark/Dijkstra.NET.Benchmark.csproj

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" 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>{2BBC072D-75B7-43A3-BECB-BEF9562EE377}</ProjectGuid>
+    <ProjectGuid>{FD137CCE-DB20-4C6A-ABBB-6E853994DB29}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Dijkstra.NET.Benchmark</RootNamespace>
     <AssemblyName>Dijkstra.NET.Benchmark</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
@@ -32,30 +31,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Management" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -75,16 +53,9 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dijkstra.NET\Dijkstra.NET.csproj">
-      <Project>{9699834f-a0ce-4653-ae38-55922352d4b5}</Project>
+      <Project>{2d42c275-6a10-4ac9-bbcf-1483feb68b04}</Project>
       <Name>Dijkstra.NET</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>
-  -->
 </Project>

src/Dijkstra.NET/Dijkstra.NET.Benchmark/DijkstraBenchmark.cs → src/Dijkstra.NET.Benchmark/DijkstraBenchmark.cs

@@ -1,9 +1,8 @@
-namespace Dijkstra.NET.Benchmark
-{
-    using Contract;
-    using Model;
-    using ShortestPath;
+using Dijkstra.NET.Contract;
+using Dijkstra.NET.Model;
 
+namespace Dijkstra.NET.Benchmark
+{
     public class DijkstraBenchmark: DijkstraBenchmarkBase
     {
 
@@ -17,7 +16,7 @@ public DijkstraBenchmark(Graph<int, string> graph, uint from, uint to) : base(gr
 
         public override IShortestPathResult GetPath()
         {
-            var dijkstra = new Dijkstra<int, string>(_graph);
+            var dijkstra = new ShortestPath.Dijkstra<int, string>(_graph);
             return dijkstra.Process(_from, _to);
         }
 

src/Dijkstra.NET/Dijkstra.NET.Benchmark/DijkstraBenchmarkBase.cs → src/Dijkstra.NET.Benchmark/DijkstraBenchmarkBase.cs

@@ -1,9 +1,9 @@
-namespace Dijkstra.NET.Benchmark
-{
-    using System;
-    using Contract;
-    using Model;
+using System;
+using Dijkstra.NET.Contract;
+using Dijkstra.NET.Model;
 
+namespace Dijkstra.NET.Benchmark
+{
     public abstract class DijkstraBenchmarkBase
     {
         protected readonly Graph<int, string> _graph;

src/Dijkstra.NET/Dijkstra.NET.Benchmark/Program.cs → src/Dijkstra.NET.Benchmark/Program.cs

@@ -1,10 +1,10 @@
-namespace Dijkstra.NET.Benchmark
-{
-    using System;
-    using System.Diagnostics;
-    using System.Linq;
-    using Contract;
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Dijkstra.NET.Contract;
 
+namespace Dijkstra.NET.Benchmark
+{
     class Program
     {
         static void Main()

src/Dijkstra.NET/Dijkstra.NET.Benchmark/Properties/AssemblyInfo.cs → src/Dijkstra.NET.Benchmark/Properties/AssemblyInfo.cs

@@ -2,34 +2,34 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Dijkstra.NET.Benchmark")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Dijkstra.NET.Benchmark")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("2bbc072d-75b7-43a3-becb-bef9562ee377")]
+[assembly: Guid("fd137cce-db20-4c6a-abbb-6e853994db29")]
 
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]