Updated to GDAL 1.11.1

Teva15 · May 8, 2016 · f19dc75 · f19dc75
1 parent 3f51f39
commit f19dc75
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 22 deletions.
diff --git a/Trunk/DotSpatial.Data.Rasters.GdalExtension/DotSpatial.Data.Rasters.GdalExtension.csproj b/Trunk/DotSpatial.Data.Rasters.GdalExtension/DotSpatial.Data.Rasters.GdalExtension.csproj
@@ -38,6 +38,7 @@
     <SccProvider>SAK</SccProvider>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\dotSpatial\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <NuGetPackageImportStamp>a025a30f</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,21 +71,21 @@
     <AssemblyOriginatorKeyFile>DotSpatial.Data.Rasters.GdalExtension.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="gdalconst_csharp, Version=1.0.4704.32537, Culture=neutral, PublicKeyToken=db5a52b08dc5b321, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\GDAL.1.9.2\lib\net40\gdalconst_csharp.dll</HintPath>
+    <Reference Include="gdalconst_csharp, Version=1.0.5387.28601, Culture=neutral, PublicKeyToken=db5a52b08dc5b321, processorArchitecture=MSIL">
+      <HintPath>..\packages\GDAL.1.11.1\lib\net40\gdalconst_csharp.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="gdal_csharp, Version=1.0.4704.32537, Culture=neutral, PublicKeyToken=db5a52b08dc5b321, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\GDAL.1.9.2\lib\net40\gdal_csharp.dll</HintPath>
+    <Reference Include="gdal_csharp, Version=1.0.5387.28601, Culture=neutral, PublicKeyToken=db5a52b08dc5b321, processorArchitecture=MSIL">
+      <HintPath>..\packages\GDAL.1.11.1\lib\net40\gdal_csharp.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="ogr_csharp, Version=1.0.4704.32537, Culture=neutral, PublicKeyToken=db5a52b08dc5b321, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\GDAL.1.9.2\lib\net40\ogr_csharp.dll</HintPath>
+    <Reference Include="ogr_csharp, Version=1.0.5387.28600, Culture=neutral, PublicKeyToken=db5a52b08dc5b321, processorArchitecture=MSIL">
+      <HintPath>..\packages\GDAL.1.11.1\lib\net40\ogr_csharp.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="osr_csharp, Version=1.0.4704.32536, Culture=neutral, PublicKeyToken=db5a52b08dc5b321, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\GDAL.1.9.2\lib\net40\osr_csharp.dll</HintPath>
+    <Reference Include="osr_csharp, Version=1.0.5387.28600, Culture=neutral, PublicKeyToken=db5a52b08dc5b321, processorArchitecture=MSIL">
+      <HintPath>..\packages\GDAL.1.11.1\lib\net40\osr_csharp.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -178,4 +179,13 @@
   <PropertyGroup>
     <PostBuildEvent>call "$(SolutionDir)GdalPostBuild.bat" "$(TargetDir)" "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
+  <Import Project="..\packages\GDAL.Native.1.11.1\build\net40\GDAL.Native.targets" Condition="Exists('..\packages\GDAL.Native.1.11.1\build\net40\GDAL.Native.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('..\packages\GDAL.Native.1.11.1\build\net40\GDAL.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GDAL.Native.1.11.1\build\net40\GDAL.Native.targets'))" />
+    <Error Condition="!Exists('..\packages\GDAL.Plugins.1.11.1\build\net40\GDAL.Plugins.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GDAL.Plugins.1.11.1\build\net40\GDAL.Plugins.targets'))" />
+  </Target>
+  <Import Project="..\packages\GDAL.Plugins.1.11.1\build\net40\GDAL.Plugins.targets" Condition="Exists('..\packages\GDAL.Plugins.1.11.1\build\net40\GDAL.Plugins.targets')" />
 </Project>
diff --git a/Trunk/DotSpatial.Data.Rasters.GdalExtension/GdalConfiguration.cs b/Trunk/DotSpatial.Data.Rasters.GdalExtension/GdalConfiguration.cs
@@ -35,7 +35,7 @@
 
 namespace DotSpatial.Data.Rasters.GdalExtension
 {
-    public static class GdalConfiguration
+    public static partial class GdalConfiguration
     {
         private static volatile bool _configuredOgr;
         private static volatile bool _configuredGdal;

diff --git a/Trunk/DotSpatial.Data.Rasters.GdalExtension/packages.config b/Trunk/DotSpatial.Data.Rasters.GdalExtension/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GDAL" version="1.9.2" targetFramework="net40-Client" />
-  <package id="GDAL.Native" version="1.9.2" targetFramework="net40-Client" />
-  <package id="GDAL.Plugins" version="1.9.2" targetFramework="net40-Client" />
+  <package id="GDAL" version="1.11.1" targetFramework="net40-Client" />
+  <package id="GDAL.Native" version="1.11.1" targetFramework="net40-Client" />
+  <package id="GDAL.Plugins" version="1.11.1" targetFramework="net40-Client" />
 </packages>
diff --git a/...indowProjectFileCompatibility/DotSpatial.Plugins.MapWindowProjectFileCompatibility.csproj b/...indowProjectFileCompatibility/DotSpatial.Plugins.MapWindowProjectFileCompatibility.csproj
@@ -38,9 +38,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll</HintPath>
+    <Reference Include="Ionic.Zip, Version=1.9.8.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetZip.1.9.8\lib\net20\Ionic.Zip.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Trunk/DotSpatial.Plugins.MapWindowProjectFileCompatibility/packages.config b/Trunk/DotSpatial.Plugins.MapWindowProjectFileCompatibility/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DotNetZip" version="1.9.1.8" targetFramework="net40-Client" />
+  <package id="DotNetZip" version="1.9.8" targetFramework="net40-Client" />
 </packages>
diff --git a/Trunk/GdalPostBuild.bat b/Trunk/GdalPostBuild.bat
@@ -1,7 +1,7 @@
 :: Post-build bat, which copies GDAL native libraries into output directory
 if not exist %1gdal md %1gdal
-xcopy /s /y %2packages\GDAL.Native.1.9.2\gdal\*.* %1gdal
-xcopy /s /y %2packages\GDAL.Plugins.1.9.2\gdal\*.* %1gdal
+xcopy /s /y %2packages\GDAL.Native.1.11.1\gdal\*.* %1gdal
+xcopy /s /y %2packages\GDAL.Plugins.1.11.1\gdal\*.* %1gdal
 cd %1gdal 
 del /s /q gdal_GEOR.dll
 del /s /q ogr_OCI.dll