-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19 from alexandre-lecoq/master
Upgraded project to net standard 2.0
- Loading branch information
Showing
12 changed files
with
105 additions
and
535 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ TestResults | |
| *.suo | ||
| *.user | ||
| *.sln.docstates | ||
| .vs/ | ||
|
|
||
| # Build results | ||
| [Dd]ebug/ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,38 @@ | ||
|
|
||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio 14 | ||
| VisualStudioVersion = 14.0.24720.0 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TspLibNet", "TspLibNet\TspLibNet.csproj", "{A5F17DFD-80C3-4F1F-B85F-F30E24E6F158}" | ||
| EndProject | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TspLibNetTests", "TspLibNetTests\TspLibNetTests.csproj", "{452F80AC-536C-4E55-A2DC-D78AA0E9EF66}" | ||
| EndProject | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{986E4312-63AB-4356-9340-D31AE28DD4E2}" | ||
| ProjectSection(SolutionItems) = preProject | ||
| Local.testsettings = Local.testsettings | ||
| TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings | ||
| TspLibNet.vsmdi = TspLibNet.vsmdi | ||
| EndProjectSection | ||
| EndProject | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{C6161D34-B3DA-4941-A2CB-0A92160B890B}" | ||
| ProjectSection(SolutionItems) = preProject | ||
| NuGet\TSPLib.Net.nuspec = NuGet\TSPLib.Net.nuspec | ||
| EndProjectSection | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Any CPU = Debug|Any CPU | ||
| Release|Any CPU = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {A5F17DFD-80C3-4F1F-B85F-F30E24E6F158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {A5F17DFD-80C3-4F1F-B85F-F30E24E6F158}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {A5F17DFD-80C3-4F1F-B85F-F30E24E6F158}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {A5F17DFD-80C3-4F1F-B85F-F30E24E6F158}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {452F80AC-536C-4E55-A2DC-D78AA0E9EF66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {452F80AC-536C-4E55-A2DC-D78AA0E9EF66}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {452F80AC-536C-4E55-A2DC-D78AA0E9EF66}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {452F80AC-536C-4E55-A2DC-D78AA0E9EF66}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(TestCaseManagementSettings) = postSolution | ||
| CategoryFile = TspLibNet.vsmdi | ||
| EndGlobalSection | ||
| EndGlobal | ||
|
|
||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio 14 | ||
| VisualStudioVersion = 14.0.24720.0 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TspLibNet", "TspLibNet\TspLibNet.csproj", "{A5F17DFD-80C3-4F1F-B85F-F30E24E6F158}" | ||
| EndProject | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TspLibNetTests", "TspLibNetTests\TspLibNetTests.csproj", "{452F80AC-536C-4E55-A2DC-D78AA0E9EF66}" | ||
| EndProject | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{986E4312-63AB-4356-9340-D31AE28DD4E2}" | ||
| ProjectSection(SolutionItems) = preProject | ||
| Local.testsettings = Local.testsettings | ||
| TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings | ||
| TspLibNet.vsmdi = TspLibNet.vsmdi | ||
| EndProjectSection | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Any CPU = Debug|Any CPU | ||
| Release|Any CPU = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {A5F17DFD-80C3-4F1F-B85F-F30E24E6F158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {A5F17DFD-80C3-4F1F-B85F-F30E24E6F158}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {A5F17DFD-80C3-4F1F-B85F-F30E24E6F158}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {A5F17DFD-80C3-4F1F-B85F-F30E24E6F158}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {452F80AC-536C-4E55-A2DC-D78AA0E9EF66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {452F80AC-536C-4E55-A2DC-D78AA0E9EF66}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {452F80AC-536C-4E55-A2DC-D78AA0E9EF66}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {452F80AC-536C-4E55-A2DC-D78AA0E9EF66}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(TestCaseManagementSettings) = postSolution | ||
| CategoryFile = TspLibNet.vsmdi | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,126 +1,36 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="12.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>{A5F17DFD-80C3-4F1F-B85F-F30E24E6F158}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>TspLibNet</RootNamespace> | ||
| <AssemblyName>TspLibNet</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| <TargetFrameworkProfile /> | ||
| </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> | ||
| <Prefer32Bit>false</Prefer32Bit> | ||
| </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> | ||
| <Prefer32Bit>false</Prefer32Bit> | ||
| <DocumentationFile>bin\Release\TspLibNet.XML</DocumentationFile> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <SignAssembly>false</SignAssembly> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile> | ||
| </AssemblyOriginatorKeyFile> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <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> | ||
| <ItemGroup> | ||
| <Compile Include="DistanceFunctions\DistanceFunctionBase.cs" /> | ||
| <Compile Include="Exceptions\TourInvalidException.cs" /> | ||
| <Compile Include="Exceptions\GraphException.cs" /> | ||
| <Compile Include="Graph\Demand\DictionaryBasedDemandProvider.cs" /> | ||
| <Compile Include="Graph\Demand\IDemandProvider.cs" /> | ||
| <Compile Include="Graph\Depots\IDepotsProvider.cs" /> | ||
| <Compile Include="Graph\Depots\NodeListBasedDepotProvider.cs" /> | ||
| <Compile Include="Graph\Edges\Edge.cs" /> | ||
| <Compile Include="Graph\Edges\EdgeListBasedEdgeProvider.cs" /> | ||
| <Compile Include="Graph\Edges\IEdgeProvider.cs" /> | ||
| <Compile Include="Graph\Edges\WeightMatrixBasedEdgeProvider.cs" /> | ||
| <Compile Include="Graph\Edges\NodeBasedEdgeProvider.cs" /> | ||
| <Compile Include="Graph\Edges\WeightMatrixBasedEdgeProviderWithExclusions.cs" /> | ||
| <Compile Include="Graph\EdgeWeights\FunctionBasedWeightProviderWithCaching.cs" /> | ||
| <Compile Include="Graph\FixedEdges\EdgeListBasedFixedEdgesProvider.cs" /> | ||
| <Compile Include="Graph\FixedEdges\IFixedEdgesProvider.cs" /> | ||
| <Compile Include="Graph\Nodes\EdgeListBasedNodeProvider.cs" /> | ||
| <Compile Include="Graph\Nodes\INodeProvider.cs" /> | ||
| <Compile Include="Graph\Nodes\DimensionBasedNodeProvider.cs" /> | ||
| <Compile Include="Graph\Nodes\NodeListBasedNodeProvider.cs" /> | ||
| <Compile Include="IProblem.cs" /> | ||
| <Compile Include="NodesFactory.cs" /> | ||
| <Compile Include="TspLib95.cs" /> | ||
| <Compile Include="TspLib95Item.cs" /> | ||
| <Compile Include="TSP\TspFileDataExtractor.cs" /> | ||
| <Compile Include="Graph\EdgeWeights\NodeAdjacencyBasedWeightProvider.cs" /> | ||
| <Compile Include="Graph\Edges\EdgesCollection.cs" /> | ||
| <Compile Include="Graph\Nodes\Node.cs" /> | ||
| <Compile Include="Graph\Nodes\NodesCollection.cs" /> | ||
| <Compile Include="CapacitatedVehicleRoutingProblem.cs" /> | ||
| <Compile Include="HamiltonianCycleProblem.cs" /> | ||
| <Compile Include="ProblemBase.cs" /> | ||
| <Compile Include="SequentialOrderingProblem.cs" /> | ||
| <Compile Include="TravelingSalesmanProblem.cs" /> | ||
| <Compile Include="Tours\ITour.cs" /> | ||
| <Compile Include="Tours\Tour.cs" /> | ||
| <Compile Include="DistanceFunctions\IDistanceFunction.cs" /> | ||
| <Compile Include="Graph\Edges\IEdge.cs" /> | ||
| <Compile Include="Graph\Nodes\INode.cs" /> | ||
| <Compile Include="Graph\EdgeWeights\IEdgeWeightsProvider.cs" /> | ||
| <Compile Include="Graph\EdgeWeights\FunctionBasedWeightProvider.cs" /> | ||
| <Compile Include="Graph\EdgeWeights\MatrixBasedWeightProvider.cs" /> | ||
| <Compile Include="Graph\EdgeWeights\MatrixBuilder.cs" /> | ||
| <Compile Include="TSP\Defines\DisplayDataType.cs" /> | ||
| <Compile Include="TSP\Defines\EdgeDataFormat.cs" /> | ||
| <Compile Include="TSP\Defines\EdgeWeightFormat.cs" /> | ||
| <Compile Include="TSP\Defines\EdgeWeightType.cs" /> | ||
| <Compile Include="TSP\Defines\FileType.cs" /> | ||
| <Compile Include="Graph\Nodes\Node3D.cs" /> | ||
| <Compile Include="DistanceFunctions\Euclidean.cs" /> | ||
| <Compile Include="DistanceFunctions\EuclideanCeiled.cs" /> | ||
| <Compile Include="DistanceFunctions\Geographical.cs" /> | ||
| <Compile Include="DistanceFunctions\Manhattan.cs" /> | ||
| <Compile Include="DistanceFunctions\Maximum.cs" /> | ||
| <Compile Include="DistanceFunctions\PseudoEuclidean.cs" /> | ||
| <Compile Include="DistanceFunctions\GeoLocation.cs" /> | ||
| <Compile Include="Extensions\MathExtensions.cs" /> | ||
| <Compile Include="TSP\Defines\NodeCoordinatesType.cs" /> | ||
| <Compile Include="TSP\TspFile.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| <Compile Include="TSP\TspFileLoader.cs" /> | ||
| <Compile Include="Graph\Nodes\Node2D.cs" /> | ||
| </ItemGroup> | ||
| <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 Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| <OutputType>Library</OutputType> | ||
| <GenerateAssemblyInfo>false</GenerateAssemblyInfo> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DocumentationFile>bin\Release\TspLibNet.XML</DocumentationFile> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile> | ||
| <GeneratePackageOnBuild>true</GeneratePackageOnBuild> | ||
| <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> | ||
| <PackageLicenseExpression></PackageLicenseExpression> | ||
| <PackageId>TSPLib.Net</PackageId> | ||
| <Version>1.1.6</Version> | ||
| <Authors>Pawel Drozdowski, William Hallatt</Authors> | ||
| <PackageLicenseFile>LICENSE.txt</PackageLicenseFile> | ||
| <PackageProjectUrl>https://github.com/pdrozdowski/TSPLib.Net</PackageProjectUrl> | ||
| <PackageReleaseNotes>Migrated to .net core.</PackageReleaseNotes> | ||
| <PackageTags>TSP, traveling salesman problem</PackageTags> | ||
| <RepositoryUrl>https://github.com/pdrozdowski/TSPLib.Net</RepositoryUrl> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <None Include="..\..\LICENSE"> | ||
| <Pack>True</Pack> | ||
| <PackagePath></PackagePath> | ||
| </None> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Include="..\..\README.md"> | ||
| <Pack>true</Pack> | ||
| <PackagePath>\</PackagePath> | ||
| </Content> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.