Skip to content

Commit caf7eeb

Browse files
peetwpeetw
authored
Merge pull request #100 from peetw/target-dotnet-standard
Target .NET Standard
2 parents a9e2850 + 5759bfe commit caf7eeb

File tree

84 files changed

+589
-2679
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+589
-2679
lines changed

‎NHibernate.Spatial.MsSql/NHibernate.Spatial.MsSql.csproj

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>9.0.30729</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{EAC092D9-6D47-4A30-803C-7A8583F99DFE}</ProjectGuid>
7+
<ProjectGuid>{543472AB-D41B-4796-A6C9-8E22B18F0B44}</ProjectGuid>
98
<OutputType>Library</OutputType>
109
<AppDesignerFolder>Properties</AppDesignerFolder>
1110
<RootNamespace>NHibernate.Spatial</RootNamespace>
1211
<AssemblyName>NHibernate.Spatial.MsSql</AssemblyName>
1312
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1413
<FileAlignment>512</FileAlignment>
15-
<FileUpgradeFlags>
16-
</FileUpgradeFlags>
17-
<OldToolsVersion>3.5</OldToolsVersion>
18-
<UpgradeBackupLocation />
19-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
20-
<RestorePackages>true</RestorePackages>
14+
<Deterministic>true</Deterministic>
2115
</PropertyGroup>
2216
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2317
<DebugSymbols>true</DebugSymbols>
@@ -37,50 +31,46 @@
3731
<WarningLevel>4</WarningLevel>
3832
</PropertyGroup>
3933
<ItemGroup>
40-
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f">
34+
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
4135
<HintPath>..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll</HintPath>
4236
</Reference>
4337
<Reference Include="GeoAPI, Version=1.7.5.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
4438
<HintPath>..\packages\GeoAPI.Core.1.7.5\lib\net45\GeoAPI.dll</HintPath>
45-
<Private>True</Private>
4639
</Reference>
4740
<Reference Include="GeoAPI.CoordinateSystems, Version=1.7.5.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
4841
<HintPath>..\packages\GeoAPI.CoordinateSystems.1.7.5\lib\net45\GeoAPI.CoordinateSystems.dll</HintPath>
49-
<Private>True</Private>
5042
</Reference>
5143
<Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
5244
<HintPath>..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll</HintPath>
53-
<Private>True</Private>
5445
</Reference>
55-
<Reference Include="Microsoft.SqlServer.Types, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
46+
<Reference Include="Microsoft.SqlServer.Types, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
5647
<HintPath>..\packages\Microsoft.SqlServer.Types.11.0.2\lib\net20\Microsoft.SqlServer.Types.dll</HintPath>
5748
</Reference>
58-
<Reference Include="NetTopologySuite, Version=1.15.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
59-
<HintPath>..\packages\NetTopologySuite.Core.1.15.0\lib\net45\NetTopologySuite.dll</HintPath>
60-
<Private>True</Private>
49+
<Reference Include="NetTopologySuite, Version=1.15.1.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
50+
<HintPath>..\packages\NetTopologySuite.Core.1.15.1\lib\net45\NetTopologySuite.dll</HintPath>
6151
</Reference>
62-
<Reference Include="NetTopologySuite.CoordinateSystems, Version=1.15.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
63-
<HintPath>..\packages\NetTopologySuite.CoordinateSystems.1.15.0\lib\net45\NetTopologySuite.CoordinateSystems.dll</HintPath>
64-
<Private>True</Private>
52+
<Reference Include="NetTopologySuite.CoordinateSystems, Version=1.15.1.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
53+
<HintPath>..\packages\NetTopologySuite.CoordinateSystems.1.15.1\lib\net45\NetTopologySuite.CoordinateSystems.dll</HintPath>
6554
</Reference>
6655
<Reference Include="NHibernate, Version=5.1.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
6756
<HintPath>..\packages\NHibernate.5.1.3\lib\net461\NHibernate.dll</HintPath>
68-
<Private>True</Private>
6957
</Reference>
70-
<Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b">
58+
<Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
7159
<HintPath>..\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
7260
</Reference>
73-
<Reference Include="Remotion.Linq.EagerFetching, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b">
61+
<Reference Include="Remotion.Linq.EagerFetching, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
7462
<HintPath>..\packages\Remotion.Linq.EagerFetching.2.1.0\lib\net45\Remotion.Linq.EagerFetching.dll</HintPath>
7563
</Reference>
7664
<Reference Include="System" />
7765
<Reference Include="System.Configuration" />
78-
<Reference Include="System.Core">
79-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
80-
</Reference>
81-
<Reference Include="System.Data" />
66+
<Reference Include="System.Core" />
8267
<Reference Include="System.ServiceModel" />
8368
<Reference Include="System.Transactions" />
69+
<Reference Include="System.Xml.Linq" />
70+
<Reference Include="System.Data.DataSetExtensions" />
71+
<Reference Include="Microsoft.CSharp" />
72+
<Reference Include="System.Data" />
73+
<Reference Include="System.Net.Http" />
8474
<Reference Include="System.Xml" />
8575
</ItemGroup>
8676
<ItemGroup>
@@ -91,11 +81,11 @@
9181
<Compile Include="Dialect\MsSql2008FunctionRegistration.cs" />
9282
<Compile Include="Dialect\MsSql2008GeographyDialect.cs" />
9383
<Compile Include="Dialect\MsSql2008GeometryDialect.cs" />
84+
<Compile Include="Dialect\MsSql2008SpatialDialect.cs" />
9485
<Compile Include="Dialect\MsSql2012FunctionRegistration.cs" />
9586
<Compile Include="Dialect\MsSql2012GeographyDialect.cs" />
9687
<Compile Include="Dialect\MsSql2012GeometryDialect.cs" />
9788
<Compile Include="Dialect\MsSql2012SpatialDialect.cs" />
98-
<Compile Include="Dialect\MsSql2008SpatialDialect.cs" />
9989
<Compile Include="Properties\AssemblyInfo.cs" />
10090
<Compile Include="Type\MsSql2008GeographyReader.cs" />
10191
<Compile Include="Type\MsSql2008GeographyType.cs" />
@@ -114,20 +104,12 @@
114104
</ItemGroup>
115105
<ItemGroup>
116106
<ProjectReference Include="..\NHibernate.Spatial\NHibernate.Spatial.csproj">
117-
<Project>{50868b60-ac38-47e1-bd09-b4a4aa06b6f2}</Project>
107+
<Project>{f6c61d45-b221-4aaf-9539-24192a4ff933}</Project>
118108
<Name>NHibernate.Spatial</Name>
119109
</ProjectReference>
120110
</ItemGroup>
121111
<ItemGroup>
122112
<None Include="packages.config" />
123113
</ItemGroup>
124114
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
125-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
126-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
127-
Other similar extension points exist, see Microsoft.Common.targets.
128-
<Target Name="BeforeBuild">
129-
</Target>
130-
<Target Name="AfterBuild">
131-
</Target>
132-
-->
133115
</Project>

‎NHibernate.Spatial.MsSql/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
using System.Runtime.InteropServices;
33

44
[assembly: AssemblyTitle("NHibernate.Spatial.MsSql")]
5-
[assembly: Guid("06ed08bd-d308-4d2c-a672-f4f6f72f16f4")]
5+
[assembly: Guid("543472ab-d41b-4796-a6c9-8e22b18f0b44")]

‎NHibernate.Spatial.MsSql/README.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎NHibernate.Spatial.MsSql/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<package id="GeoAPI.CoordinateSystems" version="1.7.5" targetFramework="net461" />
55
<package id="GeoAPI.Core" version="1.7.5" targetFramework="net461" />
66
<package id="Iesi.Collections" version="4.0.4" targetFramework="net461" />
7-
<package id="Microsoft.SqlServer.Types" version="11.0.2" targetFramework="net461" developmentDependency="true" />
8-
<package id="NetTopologySuite" version="1.15.0" targetFramework="net461" />
9-
<package id="NetTopologySuite.CoordinateSystems" version="1.15.0" targetFramework="net461" />
10-
<package id="NetTopologySuite.Core" version="1.15.0" targetFramework="net461" />
11-
<package id="NHibernate" version="5.1.3" targetFramework="net461" allowedVersions="[5,6)" />
7+
<package id="Microsoft.SqlServer.Types" version="11.0.2" targetFramework="net461" />
8+
<package id="NetTopologySuite" version="1.15.1" targetFramework="net461" />
9+
<package id="NetTopologySuite.CoordinateSystems" version="1.15.1" targetFramework="net461" />
10+
<package id="NetTopologySuite.Core" version="1.15.1" targetFramework="net461" />
11+
<package id="NHibernate" version="5.1.3" targetFramework="net461" />
1212
<package id="Remotion.Linq" version="2.1.2" targetFramework="net461" />
1313
<package id="Remotion.Linq.EagerFetching" version="2.1.0" targetFramework="net461" />
1414
</packages>

‎NHibernate.Spatial.MySQL/NHibernate.Spatial.MySQL.csproj

Lines changed: 9 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,16 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>9.0.30729</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{2A41BF37-ACD3-4F0B-804A-C8EC6517D51A}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
4+
<TargetFramework>netstandard2.0</TargetFramework>
115
<RootNamespace>NHibernate.Spatial</RootNamespace>
12-
<AssemblyName>NHibernate.Spatial.MySQL</AssemblyName>
13-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
<FileUpgradeFlags>
16-
</FileUpgradeFlags>
17-
<OldToolsVersion>3.5</OldToolsVersion>
18-
<UpgradeBackupLocation />
19-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
20-
<RestorePackages>true</RestorePackages>
216
</PropertyGroup>
22-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
23-
<DebugSymbols>true</DebugSymbols>
24-
<DebugType>full</DebugType>
25-
<Optimize>false</Optimize>
26-
<OutputPath>bin\Debug\</OutputPath>
27-
<DefineConstants>DEBUG;TRACE</DefineConstants>
28-
<ErrorReport>prompt</ErrorReport>
29-
<WarningLevel>4</WarningLevel>
30-
</PropertyGroup>
31-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
32-
<DebugType>pdbonly</DebugType>
33-
<Optimize>true</Optimize>
34-
<OutputPath>bin\Release\</OutputPath>
35-
<DefineConstants>TRACE</DefineConstants>
36-
<ErrorReport>prompt</ErrorReport>
37-
<WarningLevel>4</WarningLevel>
38-
</PropertyGroup>
39-
<ItemGroup>
40-
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f">
41-
<HintPath>..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll</HintPath>
42-
</Reference>
43-
<Reference Include="GeoAPI, Version=1.7.5.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
44-
<HintPath>..\packages\GeoAPI.Core.1.7.5\lib\net45\GeoAPI.dll</HintPath>
45-
<Private>True</Private>
46-
</Reference>
47-
<Reference Include="GeoAPI.CoordinateSystems, Version=1.7.5.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
48-
<HintPath>..\packages\GeoAPI.CoordinateSystems.1.7.5\lib\net45\GeoAPI.CoordinateSystems.dll</HintPath>
49-
<Private>True</Private>
50-
</Reference>
51-
<Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll</HintPath>
53-
<Private>True</Private>
54-
</Reference>
55-
<Reference Include="Microsoft.CSharp" />
56-
<Reference Include="MySql.Data, Version=6.10.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
57-
<HintPath>..\packages\MySql.Data.6.10.7\lib\net452\MySql.Data.dll</HintPath>
58-
<Private>True</Private>
59-
</Reference>
60-
<Reference Include="NetTopologySuite, Version=1.15.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
61-
<HintPath>..\packages\NetTopologySuite.Core.1.15.0\lib\net45\NetTopologySuite.dll</HintPath>
62-
<Private>True</Private>
63-
</Reference>
64-
<Reference Include="NetTopologySuite.CoordinateSystems, Version=1.15.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
65-
<HintPath>..\packages\NetTopologySuite.CoordinateSystems.1.15.0\lib\net45\NetTopologySuite.CoordinateSystems.dll</HintPath>
66-
<Private>True</Private>
67-
</Reference>
68-
<Reference Include="NHibernate, Version=5.1.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
69-
<HintPath>..\packages\NHibernate.5.1.3\lib\net461\NHibernate.dll</HintPath>
70-
<Private>True</Private>
71-
</Reference>
72-
<Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b">
73-
<HintPath>..\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
74-
</Reference>
75-
<Reference Include="Remotion.Linq.EagerFetching, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b">
76-
<HintPath>..\packages\Remotion.Linq.EagerFetching.2.1.0\lib\net45\Remotion.Linq.EagerFetching.dll</HintPath>
77-
</Reference>
78-
<Reference Include="System" />
79-
<Reference Include="System.ComponentModel" />
80-
<Reference Include="System.ComponentModel.DataAnnotations" />
81-
<Reference Include="System.Configuration" />
82-
<Reference Include="System.Configuration.Install" />
83-
<Reference Include="System.Core">
84-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
85-
</Reference>
86-
<Reference Include="System.Data" />
87-
<Reference Include="System.Drawing" />
88-
<Reference Include="System.Drawing.Design" />
89-
<Reference Include="System.Management" />
90-
<Reference Include="System.ServiceModel" />
91-
<Reference Include="System.Transactions" />
92-
<Reference Include="System.Xml" />
93-
</ItemGroup>
94-
<ItemGroup>
95-
<Compile Include="..\SharedAssemblyInfo.cs">
96-
<Link>Properties\SharedAssemblyInfo.cs</Link>
97-
</Compile>
98-
<Compile Include="Dialect\MySQL57SpatialDialect.cs" />
99-
<Compile Include="Dialect\MySQLSpatialDialect.cs" />
100-
<Compile Include="Properties\AssemblyInfo.cs" />
101-
<Compile Include="Type\MySQL57GeometryType.cs" />
102-
<Compile Include="Type\MySQL57GeometryAdapterType.cs" />
103-
<Compile Include="Type\MySQLGeometryStringType.cs" />
104-
<Compile Include="Type\MySQLGeometryType.cs" />
105-
<Compile Include="Type\MySQLReader.cs" />
106-
<Compile Include="Type\MySQLWriter.cs" />
107-
</ItemGroup>
7+
1088
<ItemGroup>
109-
<ProjectReference Include="..\NHibernate.Spatial\NHibernate.Spatial.csproj">
110-
<Project>{50868B60-AC38-47E1-BD09-B4A4AA06B6F2}</Project>
111-
<Name>NHibernate.Spatial</Name>
112-
</ProjectReference>
9+
<PackageReference Include="MySql.Data" Version="8.0.13" />
11310
</ItemGroup>
11+
11412
<ItemGroup>
115-
<None Include="packages.config">
116-
<SubType>Designer</SubType>
117-
</None>
13+
<ProjectReference Include="..\NHibernate.Spatial\NHibernate.Spatial.csproj" />
11814
</ItemGroup>
119-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
120-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
121-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
122-
Other similar extension points exist, see Microsoft.Common.targets.
123-
<Target Name="BeforeBuild">
124-
</Target>
125-
<Target Name="AfterBuild">
126-
</Target>
127-
-->
128-
</Project>
15+
16+
</Project>

‎NHibernate.Spatial.MySQL/NHibernate.Spatial.MySQL.nuspec

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎NHibernate.Spatial.MySQL/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎NHibernate.Spatial.MySQL/README.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎NHibernate.Spatial.MySQL/packages.config

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)