diff --git a/ScheMe/ScheMe.csproj b/ScheMe/ScheMe.csproj index 7860c74..ce6c2c7 100644 --- a/ScheMe/ScheMe.csproj +++ b/ScheMe/ScheMe.csproj @@ -69,10 +69,6 @@ ..\packages\Microsoft.ReportViewer.2015.Runtime.12.0.2.2402\lib\Microsoft.ReportViewer.WebForms.DLL True - - ..\packages\Microsoft.SqlServer.Types.11.0.2\lib\net20\Microsoft.SqlServer.Types.dll - True - True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -109,22 +105,6 @@ - - SqlServerTypes\x64\msvcr100.dll - PreserveNewest - - - SqlServerTypes\x64\SqlServerSpatial110.dll - PreserveNewest - - - SqlServerTypes\x86\msvcr100.dll - PreserveNewest - - - SqlServerTypes\x86\SqlServerSpatial110.dll - PreserveNewest - @@ -382,7 +362,6 @@ - @@ -504,7 +483,6 @@ True Settings.settings - UserAdmin.aspx ASPXCodeBehind diff --git a/ScheMe/SqlServerTypes/Loader.cs b/ScheMe/SqlServerTypes/Loader.cs deleted file mode 100644 index 0dc61f6..0000000 --- a/ScheMe/SqlServerTypes/Loader.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.IO; -using System.Runtime.InteropServices; - -namespace SqlServerTypes -{ - /// - /// Utility methods related to CLR Types for SQL Server - /// - internal class Utilities - { - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - private static extern IntPtr LoadLibrary(string libname); - - /// - /// Loads the required native assemblies for the current architecture (x86 or x64) - /// - /// - /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications - /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. - /// - 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/ScheMe/SqlServerTypes/readme.htm b/ScheMe/SqlServerTypes/readme.htm deleted file mode 100644 index 0f9eade..0000000 --- a/ScheMe/SqlServerTypes/readme.htm +++ /dev/null @@ -1,39 +0,0 @@ - - - - Microsoft.SqlServer.Types - - - -
-

Action required to load native assemblies

-

- 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. -

-

- You need to add code to load the correct one of these assemblies at runtime (depending on the current architecture). -

-

ASP.NET applications

-

- For ASP.NET applications, add the following line of code to the Application_Start method in Global.asax.cs: -

    SqlServerTypes.Utilities.LoadNativeAssemblies(Server.MapPath("~/bin"));
-

-

Desktop applications

-

- For desktop applications, add the following line of code to run before any spatial operations are performed: -

    SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
-

-
- - \ No newline at end of file diff --git a/ScheMe/bin/Microsoft.SqlServer.Types.dll b/ScheMe/bin/Microsoft.SqlServer.Types.dll deleted file mode 100644 index 7843044..0000000 Binary files a/ScheMe/bin/Microsoft.SqlServer.Types.dll and /dev/null differ diff --git a/ScheMe/bin/ScheMe.dll b/ScheMe/bin/ScheMe.dll index 6d00482..692dad9 100644 Binary files a/ScheMe/bin/ScheMe.dll and b/ScheMe/bin/ScheMe.dll differ diff --git a/ScheMe/bin/ScheMe.dll.config b/ScheMe/bin/ScheMe.dll.config index e6cd53c..5372398 100644 --- a/ScheMe/bin/ScheMe.dll.config +++ b/ScheMe/bin/ScheMe.dll.config @@ -41,7 +41,7 @@ - + diff --git a/ScheMe/bin/ScheMe_Data.dll b/ScheMe/bin/ScheMe_Data.dll index ad29be9..1a10b10 100644 Binary files a/ScheMe/bin/ScheMe_Data.dll and b/ScheMe/bin/ScheMe_Data.dll differ diff --git a/ScheMe/bin/SqlServerTypes/x64/SqlServerSpatial110.dll b/ScheMe/bin/SqlServerTypes/x64/SqlServerSpatial110.dll deleted file mode 100644 index 8bb3895..0000000 Binary files a/ScheMe/bin/SqlServerTypes/x64/SqlServerSpatial110.dll and /dev/null differ diff --git a/ScheMe/bin/SqlServerTypes/x64/msvcr100.dll b/ScheMe/bin/SqlServerTypes/x64/msvcr100.dll deleted file mode 100644 index 0318fb0..0000000 Binary files a/ScheMe/bin/SqlServerTypes/x64/msvcr100.dll and /dev/null differ diff --git a/ScheMe/bin/SqlServerTypes/x86/SqlServerSpatial110.dll b/ScheMe/bin/SqlServerTypes/x86/SqlServerSpatial110.dll deleted file mode 100644 index 42034fe..0000000 Binary files a/ScheMe/bin/SqlServerTypes/x86/SqlServerSpatial110.dll and /dev/null differ diff --git a/ScheMe/bin/SqlServerTypes/x86/msvcr100.dll b/ScheMe/bin/SqlServerTypes/x86/msvcr100.dll deleted file mode 100644 index fd91c89..0000000 Binary files a/ScheMe/bin/SqlServerTypes/x86/msvcr100.dll and /dev/null differ diff --git a/ScheMe/bin/SteamWare.dll b/ScheMe/bin/SteamWare.dll index 8100f93..4cd426f 100644 Binary files a/ScheMe/bin/SteamWare.dll and b/ScheMe/bin/SteamWare.dll differ diff --git a/ScheMe/packages.config b/ScheMe/packages.config index 5fd4451..071de73 100644 --- a/ScheMe/packages.config +++ b/ScheMe/packages.config @@ -11,7 +11,7 @@ - + diff --git a/ScheMe_Data/bin/Debug/ScheMe_Data.dll b/ScheMe_Data/bin/Debug/ScheMe_Data.dll index ad29be9..1a10b10 100644 Binary files a/ScheMe_Data/bin/Debug/ScheMe_Data.dll and b/ScheMe_Data/bin/Debug/ScheMe_Data.dll differ diff --git a/ScheMe_Data/bin/Debug/SteamWare.dll b/ScheMe_Data/bin/Debug/SteamWare.dll index 8100f93..4cd426f 100644 Binary files a/ScheMe_Data/bin/Debug/SteamWare.dll and b/ScheMe_Data/bin/Debug/SteamWare.dll differ diff --git a/packages/Microsoft.SqlServer.Types.11.0.2/Microsoft.SqlServer.Types.11.0.2.nupkg b/packages/Microsoft.SqlServer.Types.11.0.2/Microsoft.SqlServer.Types.11.0.2.nupkg deleted file mode 100644 index 6530c1d..0000000 Binary files a/packages/Microsoft.SqlServer.Types.11.0.2/Microsoft.SqlServer.Types.11.0.2.nupkg and /dev/null differ diff --git a/packages/Microsoft.SqlServer.Types.11.0.2/content/SqlServerTypes/Loader.cs b/packages/Microsoft.SqlServer.Types.11.0.2/content/SqlServerTypes/Loader.cs deleted file mode 100644 index 0dc61f6..0000000 --- a/packages/Microsoft.SqlServer.Types.11.0.2/content/SqlServerTypes/Loader.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.IO; -using System.Runtime.InteropServices; - -namespace SqlServerTypes -{ - /// - /// Utility methods related to CLR Types for SQL Server - /// - internal class Utilities - { - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - private static extern IntPtr LoadLibrary(string libname); - - /// - /// Loads the required native assemblies for the current architecture (x86 or x64) - /// - /// - /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications - /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. - /// - 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/packages/Microsoft.SqlServer.Types.11.0.2/content/SqlServerTypes/readme.htm b/packages/Microsoft.SqlServer.Types.11.0.2/content/SqlServerTypes/readme.htm deleted file mode 100644 index 0f9eade..0000000 --- a/packages/Microsoft.SqlServer.Types.11.0.2/content/SqlServerTypes/readme.htm +++ /dev/null @@ -1,39 +0,0 @@ - - - - Microsoft.SqlServer.Types - - - -
-

Action required to load native assemblies

-

- 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. -

-

- You need to add code to load the correct one of these assemblies at runtime (depending on the current architecture). -

-

ASP.NET applications

-

- For ASP.NET applications, add the following line of code to the Application_Start method in Global.asax.cs: -

    SqlServerTypes.Utilities.LoadNativeAssemblies(Server.MapPath("~/bin"));
-

-

Desktop applications

-

- For desktop applications, add the following line of code to run before any spatial operations are performed: -

    SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
-

-
- - \ No newline at end of file diff --git a/packages/Microsoft.SqlServer.Types.11.0.2/lib/net20/Microsoft.SqlServer.Types.dll b/packages/Microsoft.SqlServer.Types.11.0.2/lib/net20/Microsoft.SqlServer.Types.dll deleted file mode 100644 index 7843044..0000000 Binary files a/packages/Microsoft.SqlServer.Types.11.0.2/lib/net20/Microsoft.SqlServer.Types.dll and /dev/null differ diff --git a/packages/Microsoft.SqlServer.Types.11.0.2/nativeBinaries/x64/SqlServerSpatial110.dll b/packages/Microsoft.SqlServer.Types.11.0.2/nativeBinaries/x64/SqlServerSpatial110.dll deleted file mode 100644 index 8bb3895..0000000 Binary files a/packages/Microsoft.SqlServer.Types.11.0.2/nativeBinaries/x64/SqlServerSpatial110.dll and /dev/null differ diff --git a/packages/Microsoft.SqlServer.Types.11.0.2/nativeBinaries/x64/msvcr100.dll b/packages/Microsoft.SqlServer.Types.11.0.2/nativeBinaries/x64/msvcr100.dll deleted file mode 100644 index 0318fb0..0000000 Binary files a/packages/Microsoft.SqlServer.Types.11.0.2/nativeBinaries/x64/msvcr100.dll and /dev/null differ diff --git a/packages/Microsoft.SqlServer.Types.11.0.2/nativeBinaries/x86/SqlServerSpatial110.dll b/packages/Microsoft.SqlServer.Types.11.0.2/nativeBinaries/x86/SqlServerSpatial110.dll deleted file mode 100644 index 42034fe..0000000 Binary files a/packages/Microsoft.SqlServer.Types.11.0.2/nativeBinaries/x86/SqlServerSpatial110.dll and /dev/null differ diff --git a/packages/Microsoft.SqlServer.Types.11.0.2/nativeBinaries/x86/msvcr100.dll b/packages/Microsoft.SqlServer.Types.11.0.2/nativeBinaries/x86/msvcr100.dll deleted file mode 100644 index fd91c89..0000000 Binary files a/packages/Microsoft.SqlServer.Types.11.0.2/nativeBinaries/x86/msvcr100.dll and /dev/null differ diff --git a/packages/Microsoft.SqlServer.Types.11.0.2/tools/install.ps1 b/packages/Microsoft.SqlServer.Types.11.0.2/tools/install.ps1 deleted file mode 100644 index 50b78a7..0000000 --- a/packages/Microsoft.SqlServer.Types.11.0.2/tools/install.ps1 +++ /dev/null @@ -1,52 +0,0 @@ -param($installPath, $toolsPath, $package, $project) - -$packagePath = (New-Object system.IO.DirectoryInfo $toolsPath).Parent.FullName -$cppBinaryPathx86 = Join-Path $packagePath "nativeBinaries\x86\msvcr100.dll" -$cppBinaryPathx64 = Join-Path $packagePath "nativeBinaries\x64\msvcr100.dll" -$sqlBinaryPathx86 = Join-Path $packagePath "nativeBinaries\x86\SqlServerSpatial110.dll" -$sqlBinaryPathx64 = Join-Path $packagePath "nativeBinaries\x64\SqlServerSpatial110.dll" - -$sqlServerTypes = $project.ProjectItems.Item("SqlServerTypes") - -$folderx86 = $sqlServerTypes.ProjectItems | where Name -eq "x86" -if (!$folderx86) -{ - $folderx86 = $sqlServerTypes.ProjectItems.AddFolder("x86") -} - -$folderx64 = $sqlServerTypes.ProjectItems | where Name -eq "x64" -if (!$folderx64) -{ - $folderx64 = $sqlServerTypes.ProjectItems.AddFolder("x64") -} - -$cppLinkx86 = $folderx86.ProjectItems | where Name -eq "msvcr100.dll" -if (!$cppLinkx86) -{ - $cppLinkx86 = $folderx86.ProjectItems.AddFromFile($cppBinaryPathx86) - $cppLinkx86.Properties.Item("CopyToOutputDirectory").Value = 2 -} - -$sqlLinkx86 = $folderx86.ProjectItems | where Name -eq "SqlServerSpatial110.dll" -if (!$sqlLinkx86) -{ - $sqlLinkx86 = $folderx86.ProjectItems.AddFromFile($sqlBinaryPathx86) - $sqlLinkx86.Properties.Item("CopyToOutputDirectory").Value = 2 -} - -$cppLinkx64 = $folderx64.ProjectItems | where Name -eq "msvcr100.dll" -if (!$cppLinkx64) -{ - $cppLinkx64 = $folderx64.ProjectItems.AddFromFile($cppBinaryPathx64) - $cppLinkx64.Properties.Item("CopyToOutputDirectory").Value = 2 -} - -$sqlLinkx64 = $folderx64.ProjectItems | where Name -eq "SqlServerSpatial110.dll" -if (!$sqlLinkx64) -{ - $sqlLinkx64 = $folderx64.ProjectItems.AddFromFile($sqlBinaryPathx64) - $sqlLinkx64.Properties.Item("CopyToOutputDirectory").Value = 2 -} - -$readmefile = Join-Path (Split-Path $project.FileName) "SqlServerTypes\readme.htm" -$dte.ItemOperations.Navigate($readmefile) \ No newline at end of file diff --git a/packages/Microsoft.SqlServer.Types.11.0.2/tools/uninstall.ps1 b/packages/Microsoft.SqlServer.Types.11.0.2/tools/uninstall.ps1 deleted file mode 100644 index 45c6e25..0000000 --- a/packages/Microsoft.SqlServer.Types.11.0.2/tools/uninstall.ps1 +++ /dev/null @@ -1,52 +0,0 @@ -param($installPath, $toolsPath, $package, $project) - -$sqlServerTypes = $project.ProjectItems | where Name -eq "SqlServerTypes" -if($sqlServerTypes) -{ - $folderx86 = $sqlServerTypes.ProjectItems | where Name -eq "x86" - if ($folderx86) - { - $cppFilex86 = $folderx86.ProjectItems | where Name -eq "msvcr100.dll" - if($cppFilex86) - { - $cppFilex86.Delete(); - } - - $sqlFilex86 = $folderx86.ProjectItems | where Name -eq "SqlServerSpatial110.dll" - if($sqlFilex86) - { - $sqlFilex86.Delete(); - } - - if($folderx86.ProjectItems.Count -eq 0) - { - $folderx86.Delete() - } - } - - $folderx64 = $sqlServerTypes.ProjectItems | where Name -eq "x64" - if ($folderx64) - { - $cppFilex64 = $folderx64.ProjectItems | where Name -eq "msvcr100.dll" - if($cppFilex64) - { - $cppFilex64.Delete(); - } - - $sqlFilex64 = $folderx64.ProjectItems | where Name -eq "SqlServerSpatial110.dll" - if($sqlFilex64) - { - $sqlFilex64.Delete(); - } - - if($folderx64.ProjectItems.Count -eq 0) - { - $folderx64.Delete() - } - } - - if($sqlServerTypes.ProjectItems.Count -eq 0) - { - $sqlServerTypes.Delete() - } -} \ No newline at end of file diff --git a/packages/Microsoft.SqlServer.Types.Unofficial.12.0.2000.8/Microsoft.SqlServer.Types.Unofficial.12.0.2000.8.nupkg b/packages/Microsoft.SqlServer.Types.Unofficial.12.0.2000.8/Microsoft.SqlServer.Types.Unofficial.12.0.2000.8.nupkg new file mode 100644 index 0000000..1323777 Binary files /dev/null and b/packages/Microsoft.SqlServer.Types.Unofficial.12.0.2000.8/Microsoft.SqlServer.Types.Unofficial.12.0.2000.8.nupkg differ diff --git a/packages/Microsoft.SqlServer.Types.Unofficial.12.0.2000.8/lib/net40/Microsoft.SqlServer.Types.dll b/packages/Microsoft.SqlServer.Types.Unofficial.12.0.2000.8/lib/net40/Microsoft.SqlServer.Types.dll new file mode 100644 index 0000000..25f9092 Binary files /dev/null and b/packages/Microsoft.SqlServer.Types.Unofficial.12.0.2000.8/lib/net40/Microsoft.SqlServer.Types.dll differ