[mapguide-commits] r8513 - in trunk/Tools/Maestro: Maestro Maestro/packages MaestroAPITestRunner MaestroAPITests OSGeo.MapGuide.MaestroAPI OSGeo.MapGuide.MaestroAPI/CoordinateSystem OSGeo.MapGuide.MaestroAPI/Internal OSGeo.MapGuide.MaestroAPI.Http OSGeo.MapGuide.MaestroAPI.Local OSGeo.MapGuide.MaestroAPI.Native OSGeo.MapGuide.MaestroAPI.Tests Thirdparty
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Jan 21 02:31:43 PST 2015
Author: jng
Date: 2015-01-21 02:31:43 -0800 (Wed, 21 Jan 2015)
New Revision: 8513
Added:
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config
Removed:
trunk/Tools/Maestro/Thirdparty/NTS/
Modified:
trunk/Tools/Maestro/Maestro/Maestro.csproj
trunk/Tools/Maestro/Maestro/packages/
trunk/Tools/Maestro/Maestro/packages/repositories.config
trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj
trunk/Tools/Maestro/MaestroAPITestRunner/packages.config
trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
trunk/Tools/Maestro/MaestroAPITests/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/MeterBasedCoordinateSystem.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
Log:
#2528: Remove NetTopologySuite.Merged in Thirdparty and replace with a NuGet version of NetTopologySuite
Modified: trunk/Tools/Maestro/Maestro/Maestro.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro/Maestro.csproj 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/Maestro/Maestro.csproj 2015-01-21 10:31:43 UTC (rev 8513)
@@ -81,12 +81,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>packages\IronPython.2.7.5\lib\Net45\IronPython.Modules.dll</HintPath>
</Reference>
- <Reference Include="IronPython.SQLite">
- <HintPath>packages\IronPython.2.7.5\lib\Net45\IronPython.SQLite.dll</HintPath>
- </Reference>
- <Reference Include="IronPython.Wpf">
- <HintPath>packages\IronPython.2.7.5\lib\Net45\IronPython.Wpf.dll</HintPath>
- </Reference>
<Reference Include="Maestro.Editors, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SDK\bin\Maestro.Editors.dll</HintPath>
@@ -111,17 +105,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.Scripting.AspNet">
- <HintPath>packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.AspNet.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.Scripting.Metadata, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.Metadata.dll</HintPath>
</Reference>
- <Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
- </Reference>
<Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
Property changes on: trunk/Tools/Maestro/Maestro/packages
___________________________________________________________________
Modified: svn:ignore
- DockPanelSuite.2.9.0.0
fleesharp.0.9.27-pre
IronPython.2.7.4
IronPython.StdLib.2.7.4
NUnit.2.6.3
SharpZipLib.0.86.0
TreeViewAdv.1.7.0.0
mapguide-api-base-x86.2.5.2.7949
mg-desktop-net40-x86.2.5.2.7949
mg-desktop-viewer-net40-x86.2.5.2.7949
RestSharp.105.0.1
Moq.4.2.1409.1722
NUnit.2.6.2
IronPython.2.7.5
IronPython.StdLib.2.7.5
Irony.0.9.0
mapguide-api-base-x86.2.6.0.8316
mg-desktop-viewer-x86.2.6.0.8316
mg-desktop-x86.2.6.0.8316
+ DockPanelSuite.2.9.0.0
fleesharp.0.9.27-pre
IronPython.2.7.4
IronPython.StdLib.2.7.4
NUnit.2.6.3
SharpZipLib.0.86.0
TreeViewAdv.1.7.0.0
mapguide-api-base-x86.2.5.2.7949
mg-desktop-net40-x86.2.5.2.7949
mg-desktop-viewer-net40-x86.2.5.2.7949
RestSharp.105.0.1
Moq.4.2.1409.1722
NUnit.2.6.2
IronPython.2.7.5
IronPython.StdLib.2.7.5
Irony.0.9.0
mapguide-api-base-x86.2.6.0.8316
mg-desktop-viewer-x86.2.6.0.8316
mg-desktop-x86.2.6.0.8316
GeoAPI.1.7.3
NetTopologySuite.1.13.3.2
ProjNET4GeoAPI.1.3.0.4
Modified: trunk/Tools/Maestro/Maestro/packages/repositories.config
===================================================================
--- trunk/Tools/Maestro/Maestro/packages/repositories.config 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/Maestro/packages/repositories.config 2015-01-21 10:31:43 UTC (rev 8513)
@@ -11,8 +11,11 @@
<repository path="..\..\MaestroAPITests\packages.config" />
<repository path="..\..\MpuCalc\packages.config" />
<repository path="..\..\OSGeo.FDO.Expressions\packages.config" />
+ <repository path="..\..\OSGeo.MapGuide.MaestroAPI.Http\packages.config" />
<repository path="..\..\OSGeo.MapGuide.MaestroAPI.Local\packages.config" />
+ <repository path="..\..\OSGeo.MapGuide.MaestroAPI.Native\packages.config" />
<repository path="..\..\OSGeo.MapGuide.MaestroAPI.Tests\packages.config" />
+ <repository path="..\..\OSGeo.MapGuide.MaestroAPI\packages.config" />
<repository path="..\..\OSGeo.MapGuide.ObjectModel.Tests\packages.config" />
<repository path="..\packages.config" />
</repositories>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner64.csproj 2015-01-21 10:31:43 UTC (rev 8513)
@@ -61,8 +61,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Ciloci.Flee">
- <HintPath>..\Maestro\packages\fleesharp.0.9.27-pre\lib\net40\Ciloci.Flee.dll</HintPath>
+ <Reference Include="GeoAPI, Version=1.7.3.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\Maestro\packages\GeoAPI.1.7.3\lib\net45-client\GeoAPI.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.Merged">
<HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/packages.config 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/packages.config 2015-01-21 10:31:43 UTC (rev 8513)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="fleesharp" version="0.9.27-pre" targetFramework="net40" />
+ <package id="GeoAPI" version="1.7.3" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2015-01-21 10:31:43 UTC (rev 8513)
@@ -60,9 +60,8 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="NetTopologySuite.Merged">
- <HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="GeoAPI">
+ <HintPath>..\Maestro\packages\GeoAPI.1.7.3\lib\net45-client\GeoAPI.dll</HintPath>
</Reference>
<Reference Include="NMock2, Version=2.0.0.44, Culture=neutral, PublicKeyToken=37d3be0adc87c2b7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Modified: trunk/Tools/Maestro/MaestroAPITests/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/packages.config 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/MaestroAPITests/packages.config 2015-01-21 10:31:43 UTC (rev 8513)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="GeoAPI" version="1.7.3" targetFramework="net45" />
<package id="NUnit" version="2.6.3" targetFramework="net40" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs 2015-01-21 10:31:43 UTC (rev 8513)
@@ -23,7 +23,7 @@
using GeoAPI.CoordinateSystems;
using GeoAPI.CoordinateSystems.Transformations;
using GeoAPI.Geometries;
-using GisSharpBlog.NetTopologySuite.Geometries;
+using NetTopologySuite.Geometries;
using ProjNet.CoordinateSystems;
using ProjNet.CoordinateSystems.Transformations;
using System;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs 2015-01-21 10:31:43 UTC (rev 8513)
@@ -22,7 +22,7 @@
using GeoAPI.CoordinateSystems;
using GeoAPI.Geometries;
-using GisSharpBlog.NetTopologySuite.Geometries;
+using NetTopologySuite.Geometries;
using OSGeo.MapGuide.ObjectModels;
using ProjNet.CoordinateSystems;
using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/MeterBasedCoordinateSystem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/MeterBasedCoordinateSystem.cs 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/MeterBasedCoordinateSystem.cs 2015-01-21 10:31:43 UTC (rev 8513)
@@ -21,7 +21,7 @@
#endregion Disclaimer / License
using GeoAPI.Geometries;
-using GisSharpBlog.NetTopologySuite.Geometries;
+using NetTopologySuite.Geometries;
using System;
using System.Drawing;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs 2015-01-21 10:31:43 UTC (rev 8513)
@@ -21,9 +21,9 @@
#endregion Disclaimer / License
using GeoAPI.Geometries;
-using GisSharpBlog.NetTopologySuite.Geometries;
-using GisSharpBlog.NetTopologySuite.IO;
-using GisSharpBlog.NetTopologySuite.Utilities;
+using NetTopologySuite.Geometries;
+using NetTopologySuite.IO;
+using NetTopologySuite.Utilities;
using RTools_NTS.Util;
using System;
using System.Collections;
@@ -120,12 +120,12 @@
/// stream, or an empty array if "EMPTY" is the next element returned by
/// the stream.
/// </returns>
- private ICoordinate[] GetCoordinates(IList tokens, Boolean skipExtraParenthesis)
+ private Coordinate[] GetCoordinates(IList tokens, Boolean skipExtraParenthesis)
{
string nextToken = GetNextEmptyOrOpener(tokens);
if (nextToken.Equals("EMPTY")) //NOXLATE
- return new ICoordinate[] { };
- List<ICoordinate> coordinates = new List<ICoordinate>();
+ return new Coordinate[] { };
+ var coordinates = new List<Coordinate>();
coordinates.Add(GetPreciseCoordinate(tokens, skipExtraParenthesis));
nextToken = GetNextCloserOrComma(tokens);
while (nextToken.Equals(",")) //NOXLATE
@@ -142,9 +142,9 @@
/// <param name="tokens"></param>
/// <param name="skipExtraParenthesis"></param>
/// <returns></returns>
- private ICoordinate GetPreciseCoordinate(IList tokens, Boolean skipExtraParenthesis)
+ private Coordinate GetPreciseCoordinate(IList tokens, Boolean skipExtraParenthesis)
{
- ICoordinate coord = new Coordinate();
+ Coordinate coord = new Coordinate();
Boolean extraParenthesisFound = false;
if (skipExtraParenthesis)
{
@@ -159,7 +159,7 @@
if (IsNumberNext(tokens))
coord.Z = GetNextNumber(tokens);
if (IsNumberNext(tokens))
- coord.M = GetNextNumber(tokens);
+ ((ICoordinate)coord).M = GetNextNumber(tokens);
if (skipExtraParenthesis &&
extraParenthesisFound &&
@@ -168,7 +168,7 @@
index++;
}
- precisionModel.MakePrecise(coord);
+ precisionModel.MakePrecise((Coordinate)coord);
return coord;
}
@@ -396,8 +396,8 @@
{
string nextToken = GetNextEmptyOrOpener(tokens);
if (nextToken.Equals("EMPTY")) //NOXLATE
- return geometryFactory.CreatePoint((ICoordinate)null);
- IPoint point = geometryFactory.CreatePoint(GetPreciseCoordinate(tokens, false));
+ return geometryFactory.CreatePoint((Coordinate)null);
+ IPoint point = geometryFactory.CreatePoint((Coordinate)GetPreciseCoordinate(tokens, false));
GetNextCloser(tokens);
return point;
}
@@ -456,7 +456,7 @@
/// <c>Point</c>s created using this <c>WKTReader</c>
/// s <c>GeometryFactory</c>.
/// </returns>
- private IPoint[] ToPoints(ICoordinate[] coordinates)
+ private IPoint[] ToPoints(Coordinate[] coordinates)
{
List<IPoint> points = new List<IPoint>();
for (int i = 0; i < coordinates.Length; i++)
@@ -480,7 +480,7 @@
string nextToken = GetNextEmptyOrOpener(tokens);
if (nextToken.Equals("EMPTY")) //NOXLATE
return geometryFactory.CreatePolygon(
- geometryFactory.CreateLinearRing(new ICoordinate[] { }), new ILinearRing[] { });
+ geometryFactory.CreateLinearRing(new Coordinate[] { }), new ILinearRing[] { });
List<ILinearRing> holes = new List<ILinearRing>();
ILinearRing shell = ReadLinearRingText(tokens);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2015-01-21 10:31:43 UTC (rev 8513)
@@ -61,10 +61,18 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
+ <Reference Include="GeoAPI">
+ <HintPath>..\Maestro\packages\GeoAPI.1.7.3\lib\net45-client\GeoAPI.dll</HintPath>
</Reference>
+ <Reference Include="NetTopologySuite">
+ <HintPath>..\Maestro\packages\NetTopologySuite.1.13.3.2\lib\net45\NetTopologySuite.dll</HintPath>
+ </Reference>
+ <Reference Include="PowerCollections">
+ <HintPath>..\Maestro\packages\NetTopologySuite.1.13.3.2\lib\net45\PowerCollections.dll</HintPath>
+ </Reference>
+ <Reference Include="ProjNet">
+ <HintPath>..\Maestro\packages\ProjNET4GeoAPI.1.3.0.4\lib\net45-client\ProjNet.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -236,6 +244,7 @@
<Compile Include="XmlValidator.cs" />
</ItemGroup>
<ItemGroup>
+ <None Include="packages.config" />
<None Include="Schemas\ApplicationDefinition-1.0.0.xsd">
</None>
<None Include="Schemas\ApplicationDefinitionInfo-1.0.0.xsd">
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config 2015-01-21 10:31:43 UTC (rev 8513)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="GeoAPI" version="1.7.3" targetFramework="net45" />
+ <package id="NetTopologySuite" version="1.13.3.2" targetFramework="net45" />
+ <package id="ProjNET4GeoAPI" version="1.3.0.4" targetFramework="net45" />
+</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj 2015-01-21 10:31:43 UTC (rev 8513)
@@ -60,10 +60,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+ <Reference Include="GeoAPI, Version=1.7.3.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
- <Private>False</Private>
+ <HintPath>..\Maestro\packages\GeoAPI.1.7.3\lib\net45-client\GeoAPI.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
@@ -141,6 +140,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <None Include="packages.config" />
<None Include="Resources\TextWatermark.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/packages.config (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/packages.config 2015-01-21 10:31:43 UTC (rev 8513)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="GeoAPI" version="1.7.3" targetFramework="net45" />
+</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/OSGeo.MapGuide.MaestroAPI.Local.csproj 2015-01-21 10:31:43 UTC (rev 8513)
@@ -59,10 +59,8 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="GeoAPI">
+ <HintPath>..\Maestro\packages\GeoAPI.1.7.3\lib\net45-client\GeoAPI.dll</HintPath>
</Reference>
<Reference Include="OSGeo.MapGuide.Desktop">
<HintPath>..\Maestro\packages\mg-desktop-x86.2.6.0.8316\lib\net40\OSGeo.MapGuide.Desktop.dll</HintPath>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config 2015-01-21 10:31:43 UTC (rev 8513)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="GeoAPI" version="1.7.3" targetFramework="net45" />
<package id="mapguide-api-base-x86" version="2.6.0.8316" targetFramework="net45" />
<package id="mg-desktop-x86" version="2.6.0.8316" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj 2015-01-21 10:31:43 UTC (rev 8513)
@@ -37,6 +37,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -62,10 +64,8 @@
<RunPostBuildEvent>Always</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
- <Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="GeoAPI">
+ <HintPath>..\Maestro\packages\GeoAPI.1.7.3\lib\net45-client\GeoAPI.dll</HintPath>
</Reference>
<Reference Include="OSGeo.MapGuide.Foundation, Version=1.0.0.1, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
@@ -149,11 +149,21 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /Y /I "$(ProjectDir)*.cs" "$(SolutionDir)..\SDK\LocalNativeProvider\Src\"
xcopy /Y /I "$(ProjectDir)Commands\*.cs" "$(SolutionDir)..\SDK\LocalNativeProvider\Src\Commands\"</PostBuildEvent>
</PropertyGroup>
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+ </Target>
<!-- 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">
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/packages.config (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/packages.config 2015-01-21 10:31:43 UTC (rev 8513)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="GeoAPI" version="1.7.3" targetFramework="net45" />
+</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj 2015-01-21 10:31:43 UTC (rev 8513)
@@ -36,13 +36,12 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="GeoAPI">
+ <HintPath>..\Maestro\packages\GeoAPI.1.7.3\lib\net45-client\GeoAPI.dll</HintPath>
+ </Reference>
<Reference Include="Moq">
<HintPath>..\Maestro\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
</Reference>
- <Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\Thirdparty\NTS\NetTopologySuite.Merged.dll</HintPath>
- </Reference>
<Reference Include="nunit.framework">
<HintPath>..\Maestro\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config 2015-01-20 14:26:46 UTC (rev 8512)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/packages.config 2015-01-21 10:31:43 UTC (rev 8513)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="GeoAPI" version="1.7.3" targetFramework="net45" />
<package id="Moq" version="4.2.1409.1722" targetFramework="net40-Client" />
<package id="NUnit" version="2.6.3" targetFramework="net40-Client" />
</packages>
\ No newline at end of file
More information about the mapguide-commits
mailing list