Clean up project files

peetw · Feb 2, 2024 · 4ac3034 · 4ac3034
1 parent 0f10f83
commit 4ac3034
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 64 deletions.
diff --git a/NHibernate.Spatial.MsSql/NHibernate.Spatial.MsSql.csproj b/NHibernate.Spatial.MsSql/NHibernate.Spatial.MsSql.csproj
@@ -11,9 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.3" />
     <PackageReference Include="NetTopologySuite.IO.SqlServerBytes" Version="2.1.0" />
   </ItemGroup>
@@ -22,4 +19,4 @@
     <ProjectReference Include="..\NHibernate.Spatial\NHibernate.Spatial.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/NHibernate.Spatial.MySQL/NHibernate.Spatial.MySQL.csproj b/NHibernate.Spatial.MySQL/NHibernate.Spatial.MySQL.csproj
@@ -16,9 +16,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="MySql.Data" Version="8.0.30" />
   </ItemGroup>
 

diff --git a/NHibernate.Spatial.PostGis/NHibernate.Spatial.PostGis.csproj b/NHibernate.Spatial.PostGis/NHibernate.Spatial.PostGis.csproj
@@ -9,17 +9,6 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="Metadata\GeometryColumn.PostGis20Dialect.hbm.xml" />
-    <None Remove="Metadata\GeometryColumn.PostGis30Dialect.hbm.xml" />
-    <None Remove="Metadata\SpatialReferenceSystem.PostGis20Dialect.hbm.xml" />
-    <None Remove="Metadata\SpatialReferenceSystem.PostGis30Dialect.hbm.xml" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="Metadata\GeometryColumn.PostGis30Dialect.hbm.xml" />
     <EmbeddedResource Include="Metadata\GeometryColumn.PostGis20Dialect.hbm.xml" />
@@ -28,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="Npgsql.NetTopologySuite" Version="4.1.12" />
     <PackageReference Include="NetTopologySuite.IO.PostGis" Version="2.1.0" />
   </ItemGroup>

diff --git a/NHibernate.Spatial/NHibernate.Spatial.csproj b/NHibernate.Spatial/NHibernate.Spatial.csproj
@@ -10,9 +10,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="NetTopologySuite" Version="2.5.0" />
     <PackageReference Include="NHibernate" Version="5.3.12" />
   </ItemGroup>

diff --git a/Tests.NHibernate.Spatial.MsSql2012/Tests.NHibernate.Spatial.MsSql2012.csproj b/Tests.NHibernate.Spatial.MsSql2012/Tests.NHibernate.Spatial.MsSql2012.csproj
@@ -2,9 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-
     <IsPackable>false</IsPackable>
-
     <RootNamespace>Tests.NHibernate.Spatial</RootNamespace>
   </PropertyGroup>
 

diff --git a/Tests.NHibernate.Spatial.MySQL57/Tests.NHibernate.Spatial.MySQL57.csproj b/Tests.NHibernate.Spatial.MySQL57/Tests.NHibernate.Spatial.MySQL57.csproj
@@ -2,9 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-
     <IsPackable>false</IsPackable>
-
     <RootNamespace>Tests.NHibernate.Spatial</RootNamespace>
   </PropertyGroup>
 
@@ -25,4 +23,4 @@
     </None>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/Tests.NHibernate.Spatial.MySQL80/Tests.NHibernate.Spatial.MySQL80.csproj b/Tests.NHibernate.Spatial.MySQL80/Tests.NHibernate.Spatial.MySQL80.csproj
@@ -2,9 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-
     <IsPackable>false</IsPackable>
-
     <RootNamespace>Tests.NHibernate.Spatial</RootNamespace>
   </PropertyGroup>
 

diff --git a/Tests.NHibernate.Spatial.PostGis20/Tests.NHibernate.Spatial.PostGis20.csproj b/Tests.NHibernate.Spatial.PostGis20/Tests.NHibernate.Spatial.PostGis20.csproj
@@ -2,18 +2,10 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-
     <IsPackable>false</IsPackable>
-
     <RootNamespace>Tests.NHibernate.Spatial</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="Models\PolygonM.hbm.xml" />
-    <None Remove="Models\PolygonZ.hbm.xml" />
-    <None Remove="Models\PolygonZM.hbm.xml" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="Models\PolygonM.hbm.xml" />
     <EmbeddedResource Include="Models\PolygonZM.hbm.xml" />
@@ -37,4 +29,4 @@
     </None>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/Tests.NHibernate.Spatial.PostGis30/Tests.NHibernate.Spatial.PostGis30.csproj b/Tests.NHibernate.Spatial.PostGis30/Tests.NHibernate.Spatial.PostGis30.csproj
@@ -2,9 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-
     <IsPackable>false</IsPackable>
-
     <RootNamespace>Tests.NHibernate.Spatial</RootNamespace>
   </PropertyGroup>
 
@@ -26,4 +24,4 @@
     </None>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/Tests.NHibernate.Spatial.SpatiaLite/Tests.NHibernate.Spatial.SpatiaLite.csproj b/Tests.NHibernate.Spatial.SpatiaLite/Tests.NHibernate.Spatial.SpatiaLite.csproj
@@ -2,9 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-
     <IsPackable>false</IsPackable>
-
     <RootNamespace>Tests.NHibernate.Spatial</RootNamespace>
   </PropertyGroup>
 

diff --git a/Tests.NHibernate.Spatial/Tests.NHibernate.Spatial.csproj b/Tests.NHibernate.Spatial/Tests.NHibernate.Spatial.csproj
@@ -4,28 +4,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="Model\County.hbm.xml" />
-    <None Remove="Model\Simple.hbm.xml" />
-    <None Remove="NtsTestCases\Model\NtsTestCase.hbm.xml" />
-    <None Remove="OgcSfSql11Compliance\Model\Bridge.hbm.xml" />
-    <None Remove="OgcSfSql11Compliance\Model\Building.hbm.xml" />
-    <None Remove="OgcSfSql11Compliance\Model\DividedRoute.hbm.xml" />
-    <None Remove="OgcSfSql11Compliance\Model\Forest.hbm.xml" />
-    <None Remove="OgcSfSql11Compliance\Model\Lake.hbm.xml" />
-    <None Remove="OgcSfSql11Compliance\Model\MapNeatline.hbm.xml" />
-    <None Remove="OgcSfSql11Compliance\Model\NamedPlace.hbm.xml" />
-    <None Remove="OgcSfSql11Compliance\Model\Pond.hbm.xml" />
-    <None Remove="OgcSfSql11Compliance\Model\RoadSegment.hbm.xml" />
-    <None Remove="OgcSfSql11Compliance\Model\Stream.hbm.xml" />
-    <None Remove="RandomGeometries\Model\LineStringEntity.hbm.xml" />
-    <None Remove="RandomGeometries\Model\MultiLineStringEntity.hbm.xml" />
-    <None Remove="RandomGeometries\Model\MultiPointEntity.hbm.xml" />
-    <None Remove="RandomGeometries\Model\MultiPolygonEntity.hbm.xml" />
-    <None Remove="RandomGeometries\Model\PointEntity.hbm.xml" />
-    <None Remove="RandomGeometries\Model\PolygonEntity.hbm.xml" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="Model\County.hbm.xml" />
     <EmbeddedResource Include="Model\Simple.hbm.xml" />