Skip to content

Commit 91f0b09

Browse files
rms80rms80
authored
Merge pull request gradientspace#13 from wieslawsoltes/NetStandard
Add support for netstandard2.0 and new csproj format
2 parents b4fe2f6 + f8fed5f commit 91f0b09

File tree

2 files changed

+17
-343
lines changed

2 files changed

+17
-343
lines changed

‎Properties/AssemblyInfo.cs

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

‎geometry3Sharp.csproj

Lines changed: 17 additions & 303 deletions
Original file line numberDiff line numberDiff line change
@@ -1,309 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{0C518DDA-28FE-44CA-9AB0-F9773974F13A}</ProjectGuid>
4+
<Version>1.0.0.0</Version>
5+
<Authors>Ryan Schmidt/gradientspace</Authors>
6+
<Company>Ryan Schmidt/gradientspace</Company>
7+
<Description>C# library for 3D geometric computation, mesh algorithms, etc.</Description>
8+
<Copyright>Copyright © Ryan Schmidt/gradientspace 2016</Copyright>
9+
<PackageLicenseUrl>https://github.com/gradientspace/geometry3Sharp/blob/master/LICENSE</PackageLicenseUrl>
10+
<PackageProjectUrl>https://github.com/gradientspace/geometry3Sharp</PackageProjectUrl>
11+
<PackageTags>geometry3;graphics;math;approximation;solvers;color;convexhull;meshes;spatial;curves;solids;3d;unity</PackageTags>
12+
</PropertyGroup>
13+
14+
<PropertyGroup>
15+
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
816
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
17+
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
1018
<RootNamespace>g3</RootNamespace>
1119
<AssemblyName>geometry3</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
3320
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3421
</PropertyGroup>
35-
<ItemGroup>
36-
<Reference Include="System" />
37-
<Reference Include="System.Core" />
38-
<Reference Include="System.Xml.Linq" />
39-
<Reference Include="System.Data.DataSetExtensions" />
40-
<Reference Include="Microsoft.CSharp" />
41-
<Reference Include="System.Data" />
42-
<Reference Include="System.Net.Http" />
43-
<Reference Include="System.Xml" />
44-
</ItemGroup>
45-
<ItemGroup>
46-
<Compile Include="approximation\BiArcFit2.cs" />
47-
<Compile Include="approximation\GaussPointsFit3.cs" />
48-
<Compile Include="approximation\OrthogonalPlaneFit3.cs" />
49-
<Compile Include="color\Colorb.cs" />
50-
<Compile Include="color\Colorf.cs" />
51-
<Compile Include="color\ColorHSV.cs" />
52-
<Compile Include="color\ColorMap.cs" />
53-
<Compile Include="color\ColorMixer.cs" />
54-
<Compile Include="containment\ContMinBox2.cs" />
55-
<Compile Include="containment\ContMinCircle2.cs" />
56-
<Compile Include="containment\ConvexHull2.cs" />
57-
<Compile Include="core\CommandArgumentSet.cs" />
58-
<Compile Include="core\DijkstraGraphDistance.cs" />
59-
<Compile Include="core\DVector.cs" />
60-
<Compile Include="core\FileSystemUtils.cs" />
61-
<Compile Include="core\g3Iterators.cs" />
62-
<Compile Include="core\gParallel.cs" />
63-
<Compile Include="core\HashUtil.cs" />
64-
<Compile Include="core\HBitArray.cs" />
65-
<Compile Include="core\Indexing.cs" />
66-
<Compile Include="core\DynamicPriorityQueue.cs" />
67-
<Compile Include="core\IndexPriorityQueue.cs" />
68-
<Compile Include="core\ProfileUtil.cs" />
69-
<Compile Include="core\RefCountVector.cs" />
70-
<Compile Include="core\SafeCollections.cs" />
71-
<Compile Include="core\Snapping.cs" />
72-
<Compile Include="core\SparseList.cs" />
73-
<Compile Include="core\TagSet.cs" />
74-
<Compile Include="core\Units.cs" />
75-
<Compile Include="core\DVectorArray.cs" />
76-
<Compile Include="core\VectorArray.cs" />
77-
<Compile Include="curve\BaseCurve2.cs" />
78-
<Compile Include="curve\BSplineBasis.cs" />
79-
<Compile Include="curve\Circle2.cs" />
80-
<Compile Include="curve\CurveResampler.cs" />
81-
<Compile Include="curve\Arrangement2d.cs" />
82-
<Compile Include="curve\DGraph2Resampler.cs" />
83-
<Compile Include="curve\DGraph2Util.cs" />
84-
<Compile Include="curve\Ellipse2.cs" />
85-
<Compile Include="curve\PlanarSolid2d.cs" />
86-
<Compile Include="curve\NURBSCurve2.cs" />
87-
<Compile Include="curve\PolygonFont2d.cs" />
88-
<Compile Include="curve\SculptCurveDeformers.cs" />
89-
<Compile Include="distance\DistPoint2Box2.cs" />
90-
<Compile Include="distance\DistSegment2Segment2.cs" />
91-
<Compile Include="distance\DistLine2Segment2.cs" />
92-
<Compile Include="distance\DistLine2Line2.cs" />
93-
<Compile Include="distance\DistPoint2Circle2.cs" />
94-
<Compile Include="distance\DistPoint3Cylinder3.cs" />
95-
<Compile Include="distance\DistPoint3Circle3.cs" />
96-
<Compile Include="implicit\ImplicitField.cs" />
97-
<Compile Include="implicit\ImplicitOperators.cs" />
98-
<Compile Include="implicit\MarchingQuads.cs" />
99-
<Compile Include="intersection\IntrLine3AxisAlignedBox3.cs" />
100-
<Compile Include="intersection\IntrRay3AxisAlignedBox3.cs" />
101-
<Compile Include="intersection\IntrLine2Segment2.cs" />
102-
<Compile Include="intersection\IntrTriangle3Triangle3.cs" />
103-
<Compile Include="io\MaterialTypes.cs" />
104-
<Compile Include="io\OFFReader.cs" />
105-
<Compile Include="io\OFFWriter.cs" />
106-
<Compile Include="io\STLReader.cs" />
107-
<Compile Include="io\STLWriter.cs" />
108-
<Compile Include="io\gSerialization.cs" />
109-
<Compile Include="math\AxisAlignedBox3i.cs" />
110-
<Compile Include="math\BoundsUtil.cs" />
111-
<Compile Include="math\Frame3f.cs" />
112-
<Compile Include="math\IndexTypes.cs" />
113-
<Compile Include="math\IndexUtil.cs" />
114-
<Compile Include="math\Integrate1d.cs" />
115-
<Compile Include="math\Interval1i.cs" />
116-
<Compile Include="math\MathUtil.cs" />
117-
<Compile Include="math\Matrix2f.cs" />
118-
<Compile Include="math\Matrix2d.cs" />
119-
<Compile Include="math\Matrix3f.cs" />
120-
<Compile Include="math\MatrixUtil.cs" />
121-
<Compile Include="math\Plane3.cs" />
122-
<Compile Include="math\PrimalQuery2d.cs" />
123-
<Compile Include="math\Quaternionf.cs" />
124-
<Compile Include="math\Query2.cs" />
125-
<Compile Include="math\Query2Integer.cs" />
126-
<Compile Include="math\QueryTuple2d.cs" />
127-
<Compile Include="math\ScalarMap.cs" />
128-
<Compile Include="math\TransformSequence.cs" />
129-
<Compile Include="math\Vector2d.cs" />
130-
<Compile Include="math\Vector2f.cs" />
131-
<Compile Include="math\Vector2i.cs" />
132-
<Compile Include="math\VectorTuple.cs" />
133-
<Compile Include="mesh\DSubmesh3.cs" />
134-
<Compile Include="mesh\EdgeLoop.cs" />
135-
<Compile Include="mesh\EdgeLoopRemesher.cs" />
136-
<Compile Include="mesh\FaceGroupOptimizer.cs" />
137-
<Compile Include="mesh\FaceGroupUtil.cs" />
138-
<Compile Include="mesh\MeshIndexUtil.cs" />
139-
<Compile Include="mesh\MeshConstraintUtil.cs" />
140-
<Compile Include="mesh\MeshDecomposition.cs" />
141-
<Compile Include="mesh\MeshEditor.cs" />
142-
<Compile Include="mesh\MeshIterators.cs" />
143-
<Compile Include="mesh\MeshNormals.cs" />
144-
<Compile Include="mesh\MeshUVSet.cs" />
145-
<Compile Include="mesh\RegionRemesher.cs" />
146-
<Compile Include="mesh_generators\ArrowGenerators.cs" />
147-
<Compile Include="mesh_generators\BoxGenerators.cs" />
148-
<Compile Include="mesh_generators\CylinderGenerators.cs" />
149-
<Compile Include="mesh_generators\DiscGenerators.cs" />
150-
<Compile Include="mesh\DMesh3.cs" />
151-
<Compile Include="mesh\DMesh3Builder.cs" />
152-
<Compile Include="mesh\DMesh3_debug.cs" />
153-
<Compile Include="mesh\DMesh3_edge_operators.cs" />
154-
<Compile Include="mesh\IMesh.cs" />
155-
<Compile Include="io\MeshIO.cs" />
156-
<Compile Include="io\OBJReader.cs" />
157-
<Compile Include="io\OBJWriter.cs" />
158-
<Compile Include="io\StandardMeshReader.cs" />
159-
<Compile Include="io\StandardMeshWriter.cs" />
160-
<Compile Include="mesh_generators\MarchingCubes.cs" />
161-
<Compile Include="mesh_generators\VoxelSurfaceGenerator.cs" />
162-
<Compile Include="mesh_ops\MeshExtrudeMesh.cs" />
163-
<Compile Include="mesh_ops\MeshExtrudeFaces.cs" />
164-
<Compile Include="mesh_ops\MeshInsertUVPolyCurve.cs" />
165-
<Compile Include="mesh_ops\MeshLocalParam.cs" />
166-
<Compile Include="mesh_ops\LaplacianMeshSmoother.cs" />
167-
<Compile Include="mesh_ops\LaplacianMeshDeformer.cs" />
168-
<Compile Include="mesh\MeshConstraints.cs" />
169-
<Compile Include="mesh_generators\MeshGenerators.cs" />
170-
<Compile Include="mesh\MeshMeasurements.cs" />
171-
<Compile Include="mesh\MeshTransforms.cs" />
172-
<Compile Include="mesh_generators\PlaneGenerators.cs" />
173-
<Compile Include="mesh_ops\MeshExtrudeLoop.cs" />
174-
<Compile Include="mesh_ops\MeshICP.cs" />
175-
<Compile Include="mesh_ops\MeshIterativeSmooth.cs" />
176-
<Compile Include="mesh_ops\MeshLoopClosure.cs" />
177-
<Compile Include="mesh_ops\MeshLoopSmooth.cs" />
178-
<Compile Include="mesh_ops\MeshOps.cs" />
179-
<Compile Include="mesh_ops\RegionOperator.cs" />
180-
<Compile Include="mesh_ops\SimpleHoleFiller.cs" />
181-
<Compile Include="mesh_selection\MeshBoundaryLoops.cs" />
182-
<Compile Include="mesh_selection\MeshConnectedComponents.cs" />
183-
<Compile Include="mesh_selection\MeshFaceSelection.cs" />
184-
<Compile Include="mesh_selection\MeshFacesFromLoop.cs" />
185-
<Compile Include="mesh_selection\MeshRegionBoundaryLoops.cs" />
186-
<Compile Include="mesh_selection\MeshVertexSelection.cs" />
187-
<Compile Include="Properties\AssemblyInfo.cs" />
188-
<Compile Include="mesh\SimpleMesh.cs" />
189-
<Compile Include="core\Util.cs" />
190-
<Compile Include="math\Vector3d.cs" />
191-
<Compile Include="math\Vector3i.cs" />
192-
<Compile Include="math\Vector3f.cs" />
193-
<Compile Include="queries\MeshValidation.cs" />
194-
<Compile Include="shapes3\Cylinder3.cs" />
195-
<Compile Include="solvers\DenseMatrix.cs" />
196-
<Compile Include="solvers\DenseVector.cs" />
197-
<Compile Include="solvers\IMatrix.cs" />
198-
<Compile Include="solvers\PackedSparseMatrix.cs" />
199-
<Compile Include="solvers\SingularValueDecomposition.cs" />
200-
<Compile Include="solvers\SparseMatrix.cs" />
201-
<Compile Include="solvers\SparseSymmetricCG.cs" />
202-
<Compile Include="solvers\SymmetricEigenSolver.cs" />
203-
<Compile Include="spatial\BasicIntersectionTargets.cs" />
204-
<Compile Include="spatial\BasicProjectionTargets.cs" />
205-
<Compile Include="distance\Distance.cs" />
206-
<Compile Include="queries\MeshQueries.cs" />
207-
<Compile Include="queries\RayIntersection.cs" />
208-
<Compile Include="math\AxisAlignedBox2f.cs" />
209-
<Compile Include="math\AxisAlignedBox3d.cs" />
210-
<Compile Include="math\AxisAlignedBox3f.cs" />
211-
<Compile Include="math\Line3.cs" />
212-
<Compile Include="math\Ray3.cs" />
213-
<Compile Include="math\Segment2.cs" />
214-
<Compile Include="math\Segment3.cs" />
215-
<Compile Include="mesh_generators\GenCylGenerators.cs" />
216-
<Compile Include="mesh_generators\RevolveGenerator.cs" />
217-
<Compile Include="curve\ArcLengthParam.cs" />
218-
<Compile Include="curve\CurveGenerators.cs" />
219-
<Compile Include="curve\CurveUtils.cs" />
220-
<Compile Include="curve\DCurve3.cs" />
221-
<Compile Include="curve\ICurve.cs" />
222-
<Compile Include="curve\Polygon2d.cs" />
223-
<Compile Include="curve\SimpleCurveDeformers.cs" />
224-
<Compile Include="distance\DistLine3Ray3.cs" />
225-
<Compile Include="distance\DistRay3Ray3.cs" />
226-
<Compile Include="distance\DistRay3Segment3.cs" />
227-
<Compile Include="curve\PolyLine2f.cs" />
228-
<Compile Include="core\BufferUtil.cs" />
229-
<Compile Include="mesh\Remesher.cs" />
230-
<Compile Include="mesh\MeshUtil.cs" />
231-
<Compile Include="mesh\MeshWeights.cs" />
232-
<Compile Include="curve\Arc2.cs" />
233-
<Compile Include="curve\PolyLine2d.cs" />
234-
<Compile Include="curve\PlanarComplex.cs" />
235-
<Compile Include="curve\CurveSampler2.cs" />
236-
<Compile Include="math\AxisAlignedBox2d.cs" />
237-
<Compile Include="curve\ParametricCurveSequence2.cs" />
238-
<Compile Include="distance\DistLine3Segment3.cs" />
239-
<Compile Include="distance\DistLine3Triangle3.cs" />
240-
<Compile Include="distance\DistPoint3Triangle3.cs" />
241-
<Compile Include="distance\DistSegment3Triangle3.cs" />
242-
<Compile Include="distance\DistTriangle3Triangle3.cs" />
243-
<Compile Include="intersection\IntrRay3Triangle3.cs" />
244-
<Compile Include="math\Triangle3.cs" />
245-
<Compile Include="intersection\IntrSegment2Segment2.cs" />
246-
<Compile Include="intersection\IntrLine2Line2.cs" />
247-
<Compile Include="math\Line2.cs" />
248-
<Compile Include="intersection\Intersector1.cs" />
249-
<Compile Include="math\Interval1d.cs" />
250-
<Compile Include="curve\GeneralPolygon2d.cs" />
251-
<Compile Include="curve\EllipseArc2.cs" />
252-
<Compile Include="math\Triangle2.cs" />
253-
<Compile Include="intersection\IntrLine2Triangle2.cs" />
254-
<Compile Include="intersection\IntrSegment2Triangle2.cs" />
255-
<Compile Include="intersection\IntrTriangle2Triangle2.cs" />
256-
<Compile Include="math\Box3.cs" />
257-
<Compile Include="math\Box2.cs" />
258-
<Compile Include="intersection\IntrLine3Box3.cs" />
259-
<Compile Include="intersection\IntrSegment3Box3.cs" />
260-
<Compile Include="intersection\IntrRay3Box3.cs" />
261-
<Compile Include="shapes3\Circle3.cs" />
262-
<Compile Include="spatial\BiGrid3.cs" />
263-
<Compile Include="spatial\Bitmap3.cs" />
264-
<Compile Include="spatial\DCurveProjection.cs" />
265-
<Compile Include="spatial\DMeshAABBTree.cs" />
266-
<Compile Include="spatial\DSparseGrid3.cs" />
267-
<Compile Include="spatial\GridIndexing2.cs" />
268-
<Compile Include="spatial\GridIndexing.cs" />
269-
<Compile Include="spatial\NarrowBandLevelSet.cs" />
270-
<Compile Include="spatial\PointHashGrid.cs" />
271-
<Compile Include="spatial\Polygon2dBoxTree.cs" />
272-
<Compile Include="spatial\SegmentHashGrid.cs" />
273-
<Compile Include="spatial\SpatialFunctions.cs" />
274-
<Compile Include="spatial\SpatialInterfaces.cs" />
275-
<Compile Include="io\MeshIOUtil.cs" />
276-
<Compile Include="curve\CurveUtils2.cs" />
277-
<Compile Include="curve\PolyLine3d.cs" />
278-
<Compile Include="spatial\SegmentSet2d.cs" />
279-
<Compile Include="mesh_ops\MeshPlaneCut.cs" />
280-
<Compile Include="mesh\EdgeSpan.cs" />
281-
<Compile Include="core\DeepCopy.cs" />
282-
<Compile Include="core\g3Interfaces.cs" />
283-
<Compile Include="curve\DGraph2.cs" />
284-
<Compile Include="mesh\Reducer.cs" />
285-
<Compile Include="core\MemoryPool.cs" />
286-
<Compile Include="approximation\QuadraticFit2.cs" />
287-
<Compile Include="io\SVGWriter.cs" />
288-
<Compile Include="containment\ContBox3.cs" />
289-
<Compile Include="queries\IntersectionUtil.cs" />
290-
<Compile Include="containment\TilingUtil.cs" />
291-
<Compile Include="curve\Hexagon2.cs" />
292-
</ItemGroup>
293-
<ItemGroup>
294-
<Folder Include="interfaces\" />
295-
</ItemGroup>
296-
<ItemGroup>
297-
<None Include=".gitignore" />
298-
<None Include="LICENSE" />
299-
<None Include="README.md" />
300-
</ItemGroup>
301-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
302-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
303-
Other similar extension points exist, see Microsoft.Common.targets.
304-
<Target Name="BeforeBuild">
305-
</Target>
306-
<Target Name="AfterBuild">
307-
</Target>
308-
-->
309-
</Project>
22+
23+
</Project>

0 commit comments

Comments
 (0)