Skip to content
This repository was archived by the owner on Jun 22, 2023. It is now read-only.

Commit 01a52fe

Browse files
FObermaierFObermaier
committed
Fixing build (20)
Removing CIBuild as there was nothing special to it Fixing path issues Adding unit test to travis-ci Flattened project.json
1 parent c9cef8b commit 01a52fe

File tree

11 files changed

+298
-185
lines changed

11 files changed

+298
-185
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ install:
2424
- export DOTNET_INSTALL_DIR="$PWD/.dotnetcli"
2525
- curl -sSL https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version "$CLI_VERSION" --install-dir "$DOTNET_INSTALL_DIR"
2626
- export PATH="$DOTNET_INSTALL_DIR:$PATH"
27+
- nuget restore GeoAPI.sln
2728
script:
2829
- ./build.sh

‎GeoAPI.Tests/GeoAPI.Tests.csproj‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
5+
<!-- Define SolutionDir if not already set -->
6+
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildThisFileDirectory)\..\</SolutionDir>
57
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
68
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
79
<ProjectGuid>{A2CC5645-37A7-4762-ACC4-6C8AA18B1574}</ProjectGuid>
@@ -16,25 +18,24 @@
1618
<DebugSymbols>true</DebugSymbols>
1719
<DebugType>full</DebugType>
1820
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
21+
<OutputPath>$(SolutionDir)$(Configuration)\$(TargetFrameworkVersion)\$(Platform)\</OutputPath>
2022
<DefineConstants>DEBUG;TRACE</DefineConstants>
2123
<ErrorReport>prompt</ErrorReport>
2224
<WarningLevel>4</WarningLevel>
2325
</PropertyGroup>
2426
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2527
<DebugType>pdbonly</DebugType>
2628
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
29+
<OutputPath>$(SolutionDir)$(Configuration)\$(TargetFrameworkVersion)\$(Platform)\</OutputPath>
2830
<DefineConstants>TRACE</DefineConstants>
2931
<ErrorReport>prompt</ErrorReport>
3032
<WarningLevel>4</WarningLevel>
3133
</PropertyGroup>
3234
<ItemGroup>
33-
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
35+
<Reference Include="System" />
36+
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
3437
<HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
35-
<Private>True</Private>
3638
</Reference>
37-
<Reference Include="System" />
3839
</ItemGroup>
3940
<ItemGroup>
4041
<Compile Include="Geometries\CoordinateTest.cs" />
@@ -44,7 +45,7 @@
4445
</ItemGroup>
4546
<ItemGroup>
4647
<ProjectReference Include="..\GeoAPI\GeoAPI.csproj">
47-
<Project>{ffb69466-79de-466a-ada7-5c47c5c5ca3a}</Project>
48+
<Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
4849
<Name>GeoAPI</Name>
4950
</ProjectReference>
5051
</ItemGroup>
@@ -59,4 +60,4 @@
5960
<Target Name="AfterBuild">
6061
</Target>
6162
-->
62-
</Project>
63+
</Project>

‎GeoAPI.nuspec‎

Lines changed: 94 additions & 94 deletions
Large diffs are not rendered by default.

‎GeoAPI.sln‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
3+
# Visual Studio 2012
44
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeoAPI", "GeoAPI\GeoAPI.csproj", "{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}"
@@ -21,34 +21,27 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeoAPI.Tests", "GeoAPI.Test
2121
EndProject
2222
Global
2323
GlobalSection(SolutionConfigurationPlatforms) = preSolution
24-
CIBuild|Any CPU = CIBuild|Any CPU
2524
Debug|Any CPU = Debug|Any CPU
2625
Release|Any CPU = Release|Any CPU
2726
EndGlobalSection
2827
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29-
{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.CIBuild|Any CPU.ActiveCfg = CIBuild|Any CPU
30-
{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.CIBuild|Any CPU.Build.0 = CIBuild|Any CPU
31-
{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32-
{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
33-
{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
34-
{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Release|Any CPU.Build.0 = Release|Any CPU
35-
{92B3B84B-50F1-4147-8B97-D93B90FA5514}.CIBuild|Any CPU.ActiveCfg = CIBuild|Any CPU
36-
{92B3B84B-50F1-4147-8B97-D93B90FA5514}.CIBuild|Any CPU.Build.0 = CIBuild|Any CPU
3728
{92B3B84B-50F1-4147-8B97-D93B90FA5514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3829
{92B3B84B-50F1-4147-8B97-D93B90FA5514}.Debug|Any CPU.Build.0 = Debug|Any CPU
3930
{92B3B84B-50F1-4147-8B97-D93B90FA5514}.Release|Any CPU.ActiveCfg = Release|Any CPU
4031
{92B3B84B-50F1-4147-8B97-D93B90FA5514}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{A2CC5645-37A7-4762-ACC4-6C8AA18B1574}.CIBuild|Any CPU.ActiveCfg = Release|Any CPU
42-
{A2CC5645-37A7-4762-ACC4-6C8AA18B1574}.CIBuild|Any CPU.Build.0 = Release|Any CPU
4332
{A2CC5645-37A7-4762-ACC4-6C8AA18B1574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4433
{A2CC5645-37A7-4762-ACC4-6C8AA18B1574}.Debug|Any CPU.Build.0 = Debug|Any CPU
4534
{A2CC5645-37A7-4762-ACC4-6C8AA18B1574}.Release|Any CPU.ActiveCfg = Release|Any CPU
4635
{A2CC5645-37A7-4762-ACC4-6C8AA18B1574}.Release|Any CPU.Build.0 = Release|Any CPU
47-
EndGlobalSection
48-
GlobalSection(SolutionProperties) = preSolution
49-
HideSolutionNode = FALSE
36+
{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}.Release|Any CPU.Build.0 = Release|Any CPU
5040
EndGlobalSection
5141
GlobalSection(NestedProjects) = preSolution
5242
{A2CC5645-37A7-4762-ACC4-6C8AA18B1574} = {76B6EFF2-4A17-4C0A-904C-66B20C88BF42}
5343
EndGlobalSection
44+
GlobalSection(SolutionProperties) = preSolution
45+
HideSolutionNode = FALSE
46+
EndGlobalSection
5447
EndGlobal

‎GeoAPI/GeoAPI.Pcl.csproj‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,26 @@
1919
<DebugSymbols>true</DebugSymbols>
2020
<DebugType>full</DebugType>
2121
<Optimize>false</Optimize>
22-
<OutputPath>..\Debug\PCL\AnyCPU\</OutputPath>
22+
<OutputPath>$(SolutionDir)$(Configuration)\PCL\$(Platform)\</OutputPath>
2323
<DefineConstants>TRACE;DEBUG;PCL;NET45</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
26-
<DocumentationFile>
27-
</DocumentationFile>
2826
</PropertyGroup>
2927
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3028
<DebugType>pdbonly</DebugType>
3129
<Optimize>true</Optimize>
32-
<OutputPath>..\Release\PCL\AnyCPU\</OutputPath>
30+
<OutputPath>$(SolutionDir)$(Configuration)\PCL\$(Platform)\</OutputPath>
3331
<DefineConstants>TRACE;PCL;NET45</DefineConstants>
3432
<ErrorReport>prompt</ErrorReport>
3533
<WarningLevel>4</WarningLevel>
36-
<DocumentationFile>..\Release\PCL\AnyCPU\GeoAPI.xml</DocumentationFile>
34+
<DocumentationFile>$(SolutionDir)$(Configuration)\PCL\$(Platform)\GeoAPI.xml</DocumentationFile>
3735
</PropertyGroup>
3836
<PropertyGroup>
3937
<SignAssembly>true</SignAssembly>
4038
</PropertyGroup>
4139
<PropertyGroup>
4240
<AssemblyOriginatorKeyFile>..\geoapi.snk</AssemblyOriginatorKeyFile>
4341
</PropertyGroup>
44-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CIBuild|AnyCPU'">
45-
<OutputPath>bin\CIBuild\</OutputPath>
46-
<DefineConstants>TRACE;PCL;NET45</DefineConstants>
47-
<DocumentationFile>..\Release\PCL\AnyCPU\GeoAPI.xml</DocumentationFile>
48-
<Optimize>true</Optimize>
49-
<DebugType>pdbonly</DebugType>
50-
<PlatformTarget>AnyCPU</PlatformTarget>
51-
<ErrorReport>prompt</ErrorReport>
52-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
53-
</PropertyGroup>
5442
<ItemGroup>
5543
<!-- A reference to the entire .NET Framework is automatically included -->
5644
<Folder Include="CoordinateSystems\Projections\" />
@@ -158,7 +146,7 @@
158146
<Reference Include="System" />
159147
</ItemGroup>
160148
<ItemGroup>
161-
<Content Include="..\GeoAPI\License.txt" />
149+
<Content Include="License.txt" />
162150
</ItemGroup>
163151
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
164152
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎GeoAPI/GeoAPI.csproj‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<!-- Define SolutionDir if not already set -->
5-
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildThisFileDirectory)\..</SolutionDir>
5+
<SolutionDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildThisFileDirectory)\..\</SolutionDir>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
77
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProductVersion>8.0.50727</ProductVersion>
9-
<SchemaVersion>2.0</SchemaVersion>
108
<ProjectGuid>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</ProjectGuid>
119
<OutputType>Library</OutputType>
1210
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -20,12 +18,10 @@
2018
<DebugSymbols>true</DebugSymbols>
2119
<DebugType>full</DebugType>
2220
<Optimize>false</Optimize>
23-
<OutputPath>$(SolutionDir)$(Configuration)\$(TargetFrameworkIdentifier)$(TargetFrameworkVersion)\$(Platform)\</OutputPath>
21+
<OutputPath>$(SolutionDir)$(Configuration)\$(TargetFrameworkVersion)\$(Platform)\</OutputPath>
2422
<DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
2523
<ErrorReport>prompt</ErrorReport>
2624
<WarningLevel>4</WarningLevel>
27-
<DocumentationFile>
28-
</DocumentationFile>
2925
<NoWarn>1591</NoWarn>
3026
</PropertyGroup>
3127
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -38,17 +34,6 @@
3834
<DocumentationFile>$(SolutionDir)$(Configuration)\$(TargetFrameworkVersion)\$(Platform)\GeoAPI.xml</DocumentationFile>
3935
<NoWarn>1591</NoWarn>
4036
</PropertyGroup>
41-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CIBuild|AnyCPU'">
42-
<OutputPath>bin\CIBuild\</OutputPath>
43-
<DefineConstants>TRACE;NET45</DefineConstants>
44-
<DocumentationFile>$(SolutionDir)$(Configuration)\$(TargetFrameworkVersion)\$(Platform)\GeoAPI.xml</DocumentationFile>
45-
<Optimize>true</Optimize>
46-
<NoWarn>1591</NoWarn>
47-
<DebugType>pdbonly</DebugType>
48-
<PlatformTarget>AnyCPU</PlatformTarget>
49-
<ErrorReport>prompt</ErrorReport>
50-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
51-
</PropertyGroup>
5237
<ItemGroup>
5338
<Compile Include="Consts.cs" />
5439
<Compile Include="CoordinateSystems\AxisInfo.cs" />
@@ -158,6 +143,7 @@
158143
</ItemGroup>
159144
<ItemGroup>
160145
<Reference Include="System" />
146+
<Reference Include="System.Core" />
161147
</ItemGroup>
162148
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
163149
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -172,4 +158,4 @@
172158
<MSBuild Condition=" '$(TargetFrameworkVersion)' == 'v2.0'" Projects="$(MSBuildProjectFile)" Properties="TargetFrameworkVersion=v4.0.3;TargetFrameworkProfile=Client" ContinueOnError="true" RunEachTargetSeparately="true" />
173159
</Target>
174160
-->
175-
</Project>
161+
</Project>

‎GeoAPI/Geometries/ICoordinate.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ public interface ICoordinate :
5555
/// Compares equality for x- and y-ordinates
5656
/// </summary>
5757
/// <param name="other">The other coordinate</param>
58-
/// <returns><c>true</c> if x- and y-ordinates of <see cref="this"/> coordinate and <see paramref="other"/> coordiante are equal.</returns>
58+
/// <returns><c>true</c> if x- and y-ordinates of this coordinate and <see paramref="other"/> coordiante are equal.</returns>
5959
bool Equals2D(ICoordinate other);
6060

6161
/// <summary>
6262
/// Compares equality for x-, y- and z-ordinates
6363
/// </summary>
6464
/// <param name="other">The other coordinate</param>
65-
/// <returns><c>true</c> if x-, y- and z-ordinates of <see cref="this"/> coordinate and <see paramref="other"/> coordiante are equal.</returns>
65+
/// <returns><c>true</c> if x-, y- and z-ordinates of this coordinate and <see paramref="other"/> coordiante are equal.</returns>
6666
bool Equals3D(ICoordinate other);
6767
}
6868
}

0 commit comments

Comments
 (0)