Skip to content

Commit

Permalink
Update dependency on GeoAPI
Browse files Browse the repository at this point in the history
Update nuspec files
Update AssemblyVersion
  • Loading branch information
FObermaier committed Feb 22, 2015
1 parent a63bc5e commit b6d15ea
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 19 deletions.
3 changes: 3 additions & 0 deletions SbnSharp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSbn.PCL", "SharpSbn.PC
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{BDE9A125-7B3D-42E1-B519-0637568A1423}"
ProjectSection(SolutionItems) = preProject
SharpSbn.GeoAPI.nuspec = SharpSbn.GeoAPI.nuspec
SharpSbn.GeoAPI.targets = SharpSbn.GeoAPI.targets
SharpSbn.nuspec = SharpSbn.nuspec
SharpSbn.targets = SharpSbn.targets
EndProjectSection
EndProject
Expand Down
10 changes: 6 additions & 4 deletions SharpSbn.GeoAPI.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>SharpSbn.GeoAPI</id>
<version>$version$</version>
<title>Shapefile Spatial Index (SBN) Library</title>
<title>Shapefile Spatial Index (SBN) Library for GeoAPI</title>
<authors>FObermaier</authors>
<owners>FObermaier</owners>
<licenseUrl>https://github.com/FObermaier/SbnSharp/blob/master/LICENSE.txt</licenseUrl>
Expand All @@ -17,7 +17,7 @@ This package depends on GeoAPI.
<releaseNotes>Initial release</releaseNotes>
<tags>SBN ShapeFile</tags>
<dependencies>
<dependency id="GeoAPI" version="[1.7.2]" />
<dependency id="GeoAPI" version="[1.7,1.8)" />
</dependencies>
</metadata>
<files>
Expand All @@ -32,11 +32,13 @@ This package depends on GeoAPI.
<!--
<file src="Release\v4.5\SharpSbn.GeoAPI.dll" target="lib\net45\SharpSbn.GeoAPI.dll" />
<file src="Release\v4.5\SharpSbn.GeoAPI.pdb" target="lib\net45\SharpSbn.GeoAPI.pdb" />
<file src="Release\PCL.147\SharpSbn.GeoAPI.PCL.dll" target="lib\portable-net403+sl5+wp71+win8\SharpSbn.PCL.dll" />
<file src="Release\PCL.147\SharpSbn.GeoAPI.PCL.pdb" target="lib\portable-net403+sl5+wp71+win8\SharpSbn.PCL.pdb" />
<file src="Release\PCL.147\SharpSbn.GeoAPI.PCL.dll" target="lib\portable-net403+sl5+netcore45+wp8+MonoAndroid1+MonoTouch1\SharpSbn.PCL.dll" />
<file src="Release\PCL.147\SharpSbn.GeoAPI.PCL.pdb" target="lib\portable-net403+sl5+netcore45+wp8+MonoAndroid1+MonoTouch1\SharpSbn.PCL.pdb" />
-->
<!--
<file src="SharpSbn\DataStructures\Envelope.cs" target="src\DataStructures\Envelope.cs" />
<file src="SharpSbn\DataStructures\Interval.cs" target="src\DataStructures\Interval.cs" />
-->
<file src="SharpSbn\Properties\AssemblyInfo.cs" target="src\Properties\AssemblyInfo.cs" />
<file src="SharpSbn\BinaryIOExtensions.cs" target="src\BinaryIOExtensions.cs" />
<file src="SharpSbn\ClampUtility.cs" target="src\ClampUtility.cs" />
Expand Down
6 changes: 3 additions & 3 deletions SharpSbn.PCL/SharpSbn.PCL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<ProjectGuid>{1A3D1636-8576-463D-BA97-673E739A0B3C}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SharpSbn.PCL</RootNamespace>
<AssemblyName>SharpSbn.PCL</AssemblyName>
<RootNamespace>SharpSbn</RootNamespace>
<AssemblyName>SharpSbn</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile136</TargetFrameworkProfile>
<TargetFrameworkProfile>Profile147</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions SharpSbn.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ The implementation is based on hasbeen by Marc Pfister (drwelby).</description>
<file src="Release\v4.03\SharpSbn.pdb" target="lib\net403-client\SharpSbn.pdb" />
<file src="Release\v4.5\SharpSbn.dll" target="lib\net45\SharpSbn.dll" />
<file src="Release\v4.5\SharpSbn.pdb" target="lib\net45\SharpSbn.pdb" />
<file src="Release\PCL.147\SharpSbn.PCL.dll" target="lib\portable-net403+sl5+wp71+win8\SharpSbn.PCL.dll" />
<file src="Release\PCL.147\SharpSbn.PCL.pdb" target="lib\portable-net403+sl5+wp71+win8\SharpSbn.PCL.pdb" />
<file src="Release\PCL.147\SharpSbn.dll" target="lib\portable-net403+sl5+netcore45+wp8+MonoAndroid1+MonoTouch1\SharpSbn.PCL.dll" />
<file src="Release\PCL.147\SharpSbn.pdb" target="lib\portable-net403+sl5+netcore45+wp8+MonoAndroid1+MonoTouch1\SharpSbn.PCL.pdb" />

<file src="SharpSbn\DataStructures\Envelope.cs" target="src\DataStructures\Envelope.cs" />
<file src="SharpSbn\DataStructures\Interval.cs" target="src\DataStructures\Interval.cs" />
Expand Down
2 changes: 1 addition & 1 deletion SharpSbn/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
[assembly: InternalsVisibleTo("SharpSbn.Test")]
#if !PCL
[assembly: CLSCompliant(true)]
Expand Down
5 changes: 3 additions & 2 deletions SharpSbn/SharpSbn.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@
<Reference Include="System" />
</ItemGroup>
<ItemGroup Condition=" '$(IncludeGeoAPI)' == 'yes' ">
<Reference Include="GeoAPI">
<HintPath>$(SolutionDir)packages\GeoAPI.1.7.2\lib\$(geoApi)\GeoAPI.dll</HintPath>
<Reference Include="GeoAPI, Version=1.7.3.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\GeoAPI.1.7.3.1\lib\$(geoApi)\GeoAPI.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
8 changes: 3 additions & 5 deletions test/SharpSbn.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@
<Reference Include="Common.Logging">
<HintPath>..\packages\Common.Logging.2.0.0\lib\2.0\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="GeoAPI">
<HintPath>..\packages\GeoAPI.1.7.2\lib\net403-client\GeoAPI.dll</HintPath>
<Reference Include="GeoAPI, Version=1.7.3.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\GeoAPI.1.7.3.1\lib\net403-client\GeoAPI.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite">
<HintPath>..\packages\NetTopologySuite.1.13.2\lib\net403-client\NetTopologySuite.dll</HintPath>
Expand All @@ -76,9 +77,6 @@
<Reference Include="ProjNet">
<HintPath>..\packages\ProjNET4GeoAPI.1.3.0.3\lib\net403-client\ProjNet.dll</HintPath>
</Reference>
<Reference Include="SharpMap">
<HintPath>..\packages\SharpMap.1.1.0\lib\net40-client\SharpMap.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data.SQLite">
Expand Down
3 changes: 1 addition & 2 deletions test/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
<packages>
<package id="BruTile" version="0.7.4.4" targetFramework="net403" />
<package id="Common.Logging" version="2.0.0" targetFramework="net403" />
<package id="GeoAPI" version="1.7.2" targetFramework="net403" />
<package id="GeoAPI" version="1.7.3.1" targetFramework="net403" />
<package id="NetTopologySuite" version="1.13.2" targetFramework="net403" />
<package id="NetTopologySuite.IO" version="1.13.2" targetFramework="net403" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net403" requireReinstallation="True" />
<package id="NUnit" version="2.6.3" targetFramework="net403" />
<package id="ProjNET4GeoAPI" version="1.3.0.3" targetFramework="net403" requireReinstallation="True" />
<package id="SharpMap" version="1.1.0" targetFramework="net403" requireReinstallation="True" />
<package id="System.Data.SQLite.MSIL" version="1.0.86.0" targetFramework="net403" requireReinstallation="True" />
</packages>

0 comments on commit b6d15ea

Please sign in to comment.