Repository navigation
Commit 12c93dd
committed
Refactor SharpMap.SqlServerSpatial project to .NET SDK project
1 parent 478965f commit 12c93dd
3 files changed
Lines changed: 51 additions & 143 deletions
File tree
- SharpMap.SqlServerSpatialObjects
- Properties
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,117 +1,58 @@ | |||
| 1 | - <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | - <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | - <Import Project="$(MSBuildProjectDirectory)\..\SharpMap.Common.props" /> | ||
| 4 | - <PropertyGroup> | ||
| 5 | - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 6 | - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| 7 | - <ProjectGuid>{6D681045-8EF1-44EA-A19D-C7A63A6D0F76}</ProjectGuid> | ||
| 8 | - <OutputType>Library</OutputType> | ||
| 9 | - <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| 10 | - <RootNamespace>SharpMap</RootNamespace> | ||
| 11 | - <AssemblyName>SharpMap.SqlServerSpatialObjects</AssemblyName> | ||
| 12 | - <FileAlignment>512</FileAlignment> | ||
| 13 | - <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> | ||
| 14 | - <TargetFrameworkProfile> | ||
| 15 | - </TargetFrameworkProfile> | ||
| 16 | - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> | ||
| 17 | - </PropertyGroup> | ||
| 18 | - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| 19 | - <DebugSymbols>true</DebugSymbols> | ||
| 20 | - <DebugType>full</DebugType> | ||
| 21 | - <Optimize>false</Optimize> | ||
| 22 | - <OutputPath>bin\Debug\</OutputPath> | ||
| 23 | - <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| 24 | - <ErrorReport>prompt</ErrorReport> | ||
| 25 | - <WarningLevel>4</WarningLevel> | ||
| 26 | - <PlatformTarget>AnyCPU</PlatformTarget> | ||
| 27 | - <DocumentationFile>bin\Debug\SharpMap.SqlServerSpatialObjects.XML</DocumentationFile> | ||
| 28 | - <Prefer32Bit>false</Prefer32Bit> | ||
| 29 | - </PropertyGroup> | ||
| 30 | - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| 31 | - <DebugType>pdbonly</DebugType> | ||
| 32 | - <Optimize>true</Optimize> | ||
| 33 | - <OutputPath>bin\Release\</OutputPath> | ||
| 34 | - <DefineConstants>TRACE</DefineConstants> | ||
| 35 | - <ErrorReport>prompt</ErrorReport> | ||
| 36 | - <WarningLevel>4</WarningLevel> | ||
| 37 | - <PlatformTarget>AnyCPU</PlatformTarget> | ||
| 38 | - <DocumentationFile>bin\Release\SharpMap.SqlServerSpatialObjects.XML</DocumentationFile> | ||
| 39 | - <Prefer32Bit>false</Prefer32Bit> | ||
| 40 | - </PropertyGroup> | ||
| 41 | - <ItemGroup> | ||
| 42 | - <Reference Include="Common.Logging, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL"> | ||
| 43 | - <HintPath>..\packages\Common.Logging.3.4.1\lib\net40\Common.Logging.dll</HintPath> | ||
| 44 | - </Reference> | ||
| 45 | - <Reference Include="Common.Logging.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL"> | ||
| 46 | - <HintPath>..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath> | ||
| 47 | - </Reference> | ||
| 48 | - <Reference Include="GeoAPI, Version=1.7.5.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL"> | ||
| 49 | - <HintPath>..\packages\GeoAPI.Core.1.7.5\lib\net45\GeoAPI.dll</HintPath> | ||
| 50 | - </Reference> | ||
| 51 | - <Reference Include="Microsoft.CSharp" /> | ||
| 52 | - <Reference Include="Microsoft.SqlServer.Types, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"> | ||
| 53 | - <HintPath>..\packages\Microsoft.SqlServer.Types.14.0.1016.290\lib\net40\Microsoft.SqlServer.Types.dll</HintPath> | ||
| 54 | - </Reference> | ||
| 55 | - <Reference Include="System" /> | ||
| 56 | - <Reference Include="System.Data" /> | ||
| 57 | - <Reference Include="System.Data.Linq" /> | ||
| 58 | - <Reference Include="System.Xml" /> | ||
| 59 | - </ItemGroup> | ||
| 60 | - <ItemGroup> | ||
| 61 | - <Compile Include="Converters\SqlServer2008SpatialObjects\SqlGeographyConverter.cs" /> | ||
| 62 | - <Compile Include="Converters\SqlServer2008SpatialObjects\SqlGeometryConverter.cs" /> | ||
| 63 | - <Compile Include="Data\Providers\SqlServer2008Ex.cs" /> | ||
| 64 | - <Compile Include="Geometries\SpatialRelationsEx.cs" /> | ||
| 65 | - <Compile Include="Geometries\SpatialOperationsEx.cs" /> | ||
| 66 | - <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| 67 | - <Compile Include="SqlServerTypes\Loader.cs" /> | ||
| 68 | - </ItemGroup> | ||
| 69 | - <ItemGroup> | ||
| 70 | - <Content Include="ReadMe.txt" /> | ||
| 71 | - <Content Include="SqlServerTypes\readme.htm" /> | ||
| 72 | - <Content Include="SqlServerTypes\x64\msvcr120.dll"> | ||
| 73 | - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| 74 | - </Content> | ||
| 75 | - <Content Include="SqlServerTypes\x64\SqlServerSpatial140.dll"> | ||
| 76 | - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| 77 | - </Content> | ||
| 78 | - <Content Include="SqlServerTypes\x86\msvcr120.dll"> | ||
| 79 | - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| 80 | - </Content> | ||
| 81 | - <Content Include="SqlServerTypes\x86\SqlServerSpatial140.dll"> | ||
| 82 | - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| 83 | - </Content> | ||
| 84 | - </ItemGroup> | ||
| 85 | - <ItemGroup> | ||
| 86 | - <None Include="packages.config"> | ||
| 87 | - <SubType>Designer</SubType> | ||
| 88 | - </None> | ||
| 89 | - </ItemGroup> | ||
| 90 | - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| 91 | - <Target Name="BeforeBuild" Condition=" !Exists('SqlServerTypes\Loader.cs') "> | ||
| 1 | + <Project Sdk="Microsoft.NET.Sdk"> | ||
| 2 | + <Import Project="$(SolutionDir)SharpMap.Common.props" /> | ||
| 3 | + | ||
| 4 | + <PropertyGroup> | ||
| 5 | + <TargetFramework>net472</TargetFramework> | ||
| 6 | + <Product>SharpMap.SqlServerSpatialObjects</Product> | ||
| 7 | + <Copyright>Copyright 2010-$([System.DateTime]::UtcNow.Year) SharpMap - Team</Copyright> | ||
| 8 | + <PackageTags>SharpMap GIS Map GeoSpatial SqlServer</PackageTags> | ||
| 9 | + <Description>SharpMap components for interaction with SqlServer spatial objects</Description> | ||
| 10 | + <!--<EnableApiCompat>true</EnableApiCompat>--> | ||
| 11 | + <NoWarn>1701;1702;2100;2235</NoWarn> | ||
| 12 | + <RootNamespace>SharpMap</RootNamespace> | ||
| 13 | + </PropertyGroup> | ||
| 14 | + | ||
| 92 | 15 | <ItemGroup> | |
| 93 | - <SqlServerFiles Include="$(SolutionDir)packages\Microsoft.SqlServer.Types.14.0.1016.290\content\SqlServerTypes\**" /> | ||
| 16 | + <PackageReference Include="Microsoft.SqlServer.Types" Version="14.0.1016.290" GeneratePathProperty="true" /> | ||
| 94 | 17 | </ItemGroup> | |
| 18 | + | ||
| 95 | 19 | <ItemGroup> | |
| 96 | - <SqlServerFilesX86 Include="$(SolutionDir)packages\Microsoft.SqlServer.Types.14.0.1016.290\nativeBinaries\x86\**" /> | ||
| 20 | + <ProjectReference Include="..\SharpMap\SharpMap.csproj" /> | ||
| 97 | 21 | </ItemGroup> | |
| 22 | + | ||
| 98 | 23 | <ItemGroup> | |
| 99 | - <SqlServerFilesX64 Include="$(SolutionDir)packages\Microsoft.SqlServer.Types.14.0.1016.290\nativeBinaries\x64\**" /> | ||
| 24 | + <Compile Include="SqlServerTypes\Loader.cs"/> | ||
| 100 | 25 | </ItemGroup> | |
| 101 | - <Copy SourceFiles="@(SqlServerFiles)" DestinationFolder="$(MSBuildProjectDirectory)\SqlServerTypes" /> | ||
| 102 | - <Copy SourceFiles="@(SqlServerFilesX86)" DestinationFolder="$(MSBuildProjectDirectory)\SqlServerTypes\x86" /> | ||
| 103 | - <Copy SourceFiles="@(SqlServerFilesX64)" DestinationFolder="$(MSBuildProjectDirectory)\SqlServerTypes\x64" /> | ||
| 104 | - </Target> | ||
| 105 | - <Target Name="AfterBuild" Condition=" '$(Configuration)' != 'ReleaseLinux' "> | ||
| 106 | - <Message Importance="high" Text="$(MSBuildBinPath)" /> | ||
| 107 | - <Message Importance="high" Text="$(MSBuildToolsPath)" /> | ||
| 108 | - <Exec Command=""NuGet.exe" pack "$(MSBuildProjectDirectory)\$(MSBuildProjectFile)" -Symbols -version $(Version) -Properties Configuration=$(Configuration) -outputdirectory "$(PackageOutputPath)\."" /> | ||
| 109 | - </Target> | ||
| 110 | - <ItemGroup> | ||
| 111 | - <ProjectReference Include="..\SharpMap\SharpMap.csproj"> | ||
| 112 | - <Project>{C83777FC-AABB-47D9-911F-D76255D4D541}</Project> | ||
| 113 | - <Name>SharpMap</Name> | ||
| 114 | - </ProjectReference> | ||
| 115 | - </ItemGroup> | ||
| 116 | - <ItemGroup /> | ||
| 26 | + <ItemGroup> | ||
| 27 | + <Content Include="SqlServerTypes\readme.htm" /> | ||
| 28 | + <Content Include="SqlServerTypes\x64\msvcr120.dll"> | ||
| 29 | + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| 30 | + </Content> | ||
| 31 | + <Content Include="SqlServerTypes\x64\SqlServerSpatial140.dll"> | ||
| 32 | + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| 33 | + </Content> | ||
| 34 | + <Content Include="SqlServerTypes\x86\msvcr120.dll"> | ||
| 35 | + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| 36 | + </Content> | ||
| 37 | + <Content Include="SqlServerTypes\x86\SqlServerSpatial140.dll"> | ||
| 38 | + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| 39 | + </Content> | ||
| 40 | + </ItemGroup> | ||
| 41 | + | ||
| 42 | + <Target Name="RestoreSqlServerTypes" Condition=" !Exists('SqlServerTypes\Loader.cs') " BeforeTargets="BeforeBuild" > | ||
| 43 | + <Message Text="Restoring from $(PkgMicrosoft_SqlServer_Types)" Importance="high"/> | ||
| 44 | + <ItemGroup> | ||
| 45 | + <SqlServerFiles Include="$(PkgMicrosoft_SqlServer_Types)\content\SqlServerTypes\**" /> | ||
| 46 | + </ItemGroup> | ||
| 47 | + <ItemGroup> | ||
| 48 | + <SqlServerFilesX86 Include="$(PkgMicrosoft_SqlServer_Types)\nativeBinaries\x86\**" /> | ||
| 49 | + </ItemGroup> | ||
| 50 | + <ItemGroup> | ||
| 51 | + <SqlServerFilesX64 Include="$(PkgMicrosoft_SqlServer_Types)\nativeBinaries\x64\**" /> | ||
| 52 | + </ItemGroup> | ||
| 53 | + <Copy SourceFiles="@(SqlServerFiles)" DestinationFolder="$(MSBuildProjectDirectory)\SqlServerTypes" /> | ||
| 54 | + <Copy SourceFiles="@(SqlServerFilesX86)" DestinationFolder="$(MSBuildProjectDirectory)\SqlServerTypes\x86" /> | ||
| 55 | + <Copy SourceFiles="@(SqlServerFilesX64)" DestinationFolder="$(MSBuildProjectDirectory)\SqlServerTypes\x64" /> | ||
| 56 | + </Target> | ||
| 57 | + | ||
| 117 | 58 | </Project> | |
This file was deleted.
0 commit comments