From 7ce89a36209ab6e2c40f2763ded931ad95ef0bb6 Mon Sep 17 00:00:00 2001
From: Felix Obermaier <felix.obermaier@netcologne.de>
Date: Mon, 15 Mar 2021 15:21:49 +0100
Subject: [PATCH] Fix EF6 Project

---
 src/SharpMap.BusinessObjects.EF6/App.config   | 22 -------
 .../SharpMap.BusinessObjects.EF6.csproj       | 59 ++++++++++++++-----
 .../SqlServerTypes/Loader.cs                  | 45 --------------
 .../SqlServerTypes/readme.htm                 | 39 ------------
 .../packages.config                           | 14 -----
 5 files changed, 44 insertions(+), 135 deletions(-)
 delete mode 100644 src/SharpMap.BusinessObjects.EF6/App.config
 delete mode 100644 src/SharpMap.BusinessObjects.EF6/SqlServerTypes/Loader.cs
 delete mode 100644 src/SharpMap.BusinessObjects.EF6/SqlServerTypes/readme.htm
 delete mode 100644 src/SharpMap.BusinessObjects.EF6/packages.config

diff --git a/src/SharpMap.BusinessObjects.EF6/App.config b/src/SharpMap.BusinessObjects.EF6/App.config
deleted file mode 100644
index f542715..0000000
--- a/src/SharpMap.BusinessObjects.EF6/App.config
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
-  </configSections>
-  <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
-    <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
-    </providers>
-  </entityFramework>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.0.86.0" newVersion="1.0.86.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/src/SharpMap.BusinessObjects.EF6/SharpMap.BusinessObjects.EF6.csproj b/src/SharpMap.BusinessObjects.EF6/SharpMap.BusinessObjects.EF6.csproj
index 1d71c69..06250ae 100644
--- a/src/SharpMap.BusinessObjects.EF6/SharpMap.BusinessObjects.EF6.csproj
+++ b/src/SharpMap.BusinessObjects.EF6/SharpMap.BusinessObjects.EF6.csproj
@@ -1,20 +1,49 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <Product>SharpMap.BusinessObjects.EF6</Product>
-    <PackageTags>SharpMap GIS Map GeoSpatial Business EF6</PackageTags>
-    <RootNamespace>SharpMap</RootNamespace>
-    <Description>EF6 business objects to work with SharpMap</Description>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net472</TargetFramework>
+		<Product>SharpMap.BusinessObjects.EF6</Product>
+		<PackageTags>SharpMap GIS Map GeoSpatial Business EF6</PackageTags>
+		<RootNamespace>SharpMap</RootNamespace>
+		<Description>EF6 business objects to work with SharpMap</Description>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="6.0.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="EntityFramework" Version="6.0.0" />
+		<PackageReference Include="Microsoft.SqlServer.Types" Version="14.0.1016.290"  GeneratePathProperty="true" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\SharpMap.BusinessObjects\SharpMap.BusinessObjects.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\SharpMap.BusinessObjects\SharpMap.BusinessObjects.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Compile Include="$(PkgMicrosoft_SqlServer_Types)\content\SqlServerTypes\Loader.cs">
+			<Link>SqlServerTypes\Loader.cs</Link>
+		</Compile>
+	</ItemGroup>
+
+	<ItemGroup>
+		<Content Include="$(PkgMicrosoft_SqlServer_Types)\content\SqlServerTypes\readme.htm">
+			<Link>SqlServerTypes\readme.htm</Link>
+		</Content>
+		<Content Include="$(PkgMicrosoft_SqlServer_Types)\nativeBinaries\x64\msvcr120.dll">
+			<Link>SqlServerTypes\x64\msvcr120.dll</Link>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Include="$(PkgMicrosoft_SqlServer_Types)\nativeBinaries\x64\SqlServerSpatial140.dll">
+			<Link>SqlServerTypes\x64\SqlServerSpatial140.dll</Link>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Include="$(PkgMicrosoft_SqlServer_Types)\nativeBinaries\x86\msvcr120.dll">
+			<Link>SqlServerTypes\x86\msvcr120.dll</Link>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Include="$(PkgMicrosoft_SqlServer_Types)\nativeBinaries\x86\SqlServerSpatial140.dll">
+			<Link>SqlServerTypes\x86\SqlServerSpatial140.dll</Link>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
 
 </Project>
diff --git a/src/SharpMap.BusinessObjects.EF6/SqlServerTypes/Loader.cs b/src/SharpMap.BusinessObjects.EF6/SqlServerTypes/Loader.cs
deleted file mode 100644
index 0dc61f6..0000000
--- a/src/SharpMap.BusinessObjects.EF6/SqlServerTypes/Loader.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-
-namespace SqlServerTypes
-{
-    /// <summary>
-    /// Utility methods related to CLR Types for SQL Server 
-    /// </summary>
-    internal class Utilities
-    {
-        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        private static extern IntPtr LoadLibrary(string libname);
-
-        /// <summary>
-        /// Loads the required native assemblies for the current architecture (x86 or x64)
-        /// </summary>
-        /// <param name="rootApplicationPath">
-        /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications
-        /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications.
-        /// </param>
-        public static void LoadNativeAssemblies(string rootApplicationPath)
-        {
-            var nativeBinaryPath = IntPtr.Size > 4
-                ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\")
-                : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\");
-
-            LoadNativeAssembly(nativeBinaryPath, "msvcr100.dll");
-            LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial110.dll");
-        }
-
-        private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName)
-        {
-            var path = Path.Combine(nativeBinaryPath, assemblyName);
-            var ptr = LoadLibrary(path);
-            if (ptr == IntPtr.Zero)
-            {
-                throw new Exception(string.Format(
-                    "Error loading {0} (ErrorCode: {1})",
-                    assemblyName,
-                    Marshal.GetLastWin32Error()));
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/SharpMap.BusinessObjects.EF6/SqlServerTypes/readme.htm b/src/SharpMap.BusinessObjects.EF6/SqlServerTypes/readme.htm
deleted file mode 100644
index 0f9eade..0000000
--- a/src/SharpMap.BusinessObjects.EF6/SqlServerTypes/readme.htm
+++ /dev/null
@@ -1,39 +0,0 @@
-<html lang="en-US">
-<head>
-    <meta charset="utf-8" />
-    <title>Microsoft.SqlServer.Types</title>
-    <style>
-        body {
-            background: #fff;
-            color: #505050;
-            margin: 20px;
-        }
-
-        #main {
-            background: #efefef;
-            padding: 5px 30px;
-        }
-    </style>
-</head>
-<body>
-    <div id="main">
-        <h1>Action required to load native assemblies</h1>
-        <p>
-            To deploy an application that uses spatial data types to a machine that does not have 'System CLR Types for SQL Server' installed you also need to deploy the native assembly SqlServerSpatial110.dll. Both x86 (32 bit) and x64 (64 bit) versions of this assembly have been added to your project under the SqlServerTypes\x86 and SqlServerTypes\x64 subdirectories. The native assembly msvcr100.dll is also included in case the C++ runtime is not installed.
-        </p>
-        <p>
-            You need to add code to load the correct one of these assemblies at runtime (depending on the current architecture).
-        </p>
-        <h2>ASP.NET applications</h2>
-        <p>
-            For ASP.NET applications, add the following line of code to the Application_Start method in Global.asax.cs:
-            <pre>    SqlServerTypes.Utilities.LoadNativeAssemblies(Server.MapPath("~/bin"));</pre>
-        </p>
-        <h2>Desktop applications</h2>
-        <p>
-            For desktop applications, add the following line of code to run before any spatial operations are performed:
-            <pre>    SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);</pre>
-        </p>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/SharpMap.BusinessObjects.EF6/packages.config b/src/SharpMap.BusinessObjects.EF6/packages.config
deleted file mode 100644
index a195f81..0000000
--- a/src/SharpMap.BusinessObjects.EF6/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="BruTile" version="0.7.4.4" targetFramework="net40-client" />
-  <package id="Common.Logging" version="2.0.0" targetFramework="net40-client" />
-  <package id="EntityFramework" version="6.0.2" targetFramework="net40" />
-  <package id="GeoAPI" version="1.7.2" targetFramework="net40-client" />
-  <package id="Microsoft.SqlServer.Types" version="11.0.1" targetFramework="net40" />
-  <package id="NetTopologySuite" version="1.13.2" targetFramework="net40-client" />
-  <package id="NetTopologySuite.IO" version="1.13.2" targetFramework="net40-client" />
-  <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40-client" />
-  <package id="ProjNET4GeoAPI" version="1.3.0.3" targetFramework="net40-client" />
-  <package id="SharpMap" version="1.1.0" targetFramework="net40-client" />
-  <package id="System.Data.SQLite.MSIL" version="1.0.86.0" targetFramework="net40-client" />
-</packages>
\ No newline at end of file