Skip to content

Commit e043871

Browse files
RossNordbyRossNordby
committed
Fixed oops noticed by mellinoe and moved BEPUutilities/BEPUphysics/BEPUik to netstandard2.0. Bumped version to 1.5.1.
1 parent 487dad6 commit e043871

File tree

18 files changed

+81
-1014
lines changed

18 files changed

+81
-1014
lines changed

‎BEPUik/BEPUik.csproj

+17-124
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,22 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.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>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{2D5A0344-623A-4BFA-AAB6-8AC64E2A4129}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>BEPUik</RootNamespace>
12-
<AssemblyName>BEPUik</AssemblyName>
13-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
<TargetFrameworkProfile />
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<Platforms>AnyCPU;x64;x86</Platforms>
6+
<PackageLicenseUrl>https://github.com/bepu/bepuphysics1/blob/master/LICENSE.md</PackageLicenseUrl>
7+
<PackageProjectUrl>https://github.com/bepu/bepuphysics1</PackageProjectUrl>
8+
<PackageIconUrl>https://raw.githubusercontent.com/bepu/bepuphysics1/master/Documentation/images/readme/bepuphysicslogo256.png</PackageIconUrl>
9+
<RepositoryUrl>https://github.com/bepu/bepuphysics1.git</RepositoryUrl>
10+
<PackageTags>ik;inverse kinematics;3d;real time</PackageTags>
11+
<Description>Simulation based inverse kinematics solver.</Description>
12+
<Version>1.5.1</Version>
13+
<Authors>Ross Nordby</Authors>
14+
<Company>Bepu Entertainment LLC</Company>
15+
<Copyright>© Bepu Entertainment LLC</Copyright>
1616
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
18-
<DebugType>pdbonly</DebugType>
19-
<Optimize>true</Optimize>
20-
<OutputPath>bin\Release\</OutputPath>
21-
<DefineConstants>TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
<DocumentationFile>bin\Release\BEPUik.XML</DocumentationFile>
25-
<Prefer32Bit>false</Prefer32Bit>
26-
</PropertyGroup>
27-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
28-
<OutputPath>bin\Debug\</OutputPath>
29-
<DefineConstants>DEBUG;TRACE</DefineConstants>
30-
<DocumentationFile>bin\Debug\BEPUik.XML</DocumentationFile>
31-
<Optimize>false</Optimize>
32-
<DebugType>pdbonly</DebugType>
33-
<PlatformTarget>AnyCPU</PlatformTarget>
34-
<ErrorReport>prompt</ErrorReport>
35-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
36-
</PropertyGroup>
37-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
38-
<OutputPath>bin\x64\Release\</OutputPath>
39-
<DefineConstants>TRACE</DefineConstants>
40-
<DocumentationFile>bin\x64\Release\BEPUik.XML</DocumentationFile>
41-
<Optimize>true</Optimize>
42-
<DebugType>pdbonly</DebugType>
43-
<PlatformTarget>x64</PlatformTarget>
44-
<ErrorReport>prompt</ErrorReport>
45-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
46-
</PropertyGroup>
47-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
48-
<OutputPath>bin\x64\Debug\</OutputPath>
49-
<DefineConstants>DEBUG;TRACE</DefineConstants>
50-
<DocumentationFile>bin\x64\Debug\BEPUik.XML</DocumentationFile>
51-
<DebugType>pdbonly</DebugType>
52-
<PlatformTarget>x64</PlatformTarget>
53-
<ErrorReport>prompt</ErrorReport>
54-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
55-
</PropertyGroup>
56-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
57-
<OutputPath>bin\x86\Release\</OutputPath>
58-
<DefineConstants>TRACE</DefineConstants>
59-
<DocumentationFile>bin\x86\Release\BEPUik.XML</DocumentationFile>
60-
<Optimize>true</Optimize>
61-
<DebugType>pdbonly</DebugType>
62-
<PlatformTarget>x86</PlatformTarget>
63-
<ErrorReport>prompt</ErrorReport>
64-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
65-
</PropertyGroup>
66-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
67-
<OutputPath>bin\x86\Debug\</OutputPath>
68-
<DefineConstants>DEBUG;TRACE</DefineConstants>
69-
<DocumentationFile>bin\x86\Debug\BEPUik.XML</DocumentationFile>
70-
<DebugType>pdbonly</DebugType>
71-
<PlatformTarget>x86</PlatformTarget>
72-
<ErrorReport>prompt</ErrorReport>
73-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
74-
</PropertyGroup>
75-
<ItemGroup>
76-
<Compile Include="ActiveSet.cs" />
77-
<Compile Include="Bone.cs" />
78-
<Compile Include="Control.cs" />
79-
<Compile Include="AngularPlaneControl.cs" />
80-
<Compile Include="IKTwistJoint.cs">
81-
<SubType>Code</SubType>
82-
</Compile>
83-
<Compile Include="SingleBoneAngularPlaneConstraint.cs" />
84-
<Compile Include="RevoluteControl.cs" />
85-
<Compile Include="SingleBoneRevoluteConstraint.cs" />
86-
<Compile Include="DragControl.cs" />
87-
<Compile Include="IKAngularJoint.cs" />
88-
<Compile Include="IKBallSocketJoint.cs" />
89-
<Compile Include="IKConstraint.cs" />
90-
<Compile Include="IKDistanceJoint.cs" />
91-
<Compile Include="IKDistanceLimit.cs" />
92-
<Compile Include="IKJoint.cs" />
93-
<Compile Include="IKLimit.cs" />
94-
<Compile Include="IKLinearAxisLimit.cs">
95-
<SubType>Code</SubType>
96-
</Compile>
97-
<Compile Include="IKPointOnLineJoint.cs" />
98-
<Compile Include="IKPointOnPlaneJoint.cs" />
99-
<Compile Include="IKRevoluteJoint.cs" />
100-
<Compile Include="IKSolver.cs" />
101-
<Compile Include="IKSwingLimit.cs" />
102-
<Compile Include="IKSwivelHingeJoint.cs" />
103-
<Compile Include="IKTwistLimit.cs" />
104-
<Compile Include="SingleBoneAngularMotor.cs" />
105-
<Compile Include="SingleBoneConstraint.cs">
106-
<SubType>Code</SubType>
107-
</Compile>
108-
<Compile Include="SingleBoneLinearMotor.cs" />
109-
<Compile Include="StateControl.cs" />
110-
<Compile Include="Properties\AssemblyInfo.cs" />
111-
</ItemGroup>
112-
<ItemGroup>
113-
<ProjectReference Include="..\BEPUutilities\BEPUutilities.csproj">
114-
<Project>{34853DEA-43A6-4F2F-A379-D1EE04D256D2}</Project>
115-
<Name>BEPUutilities</Name>
116-
</ProjectReference>
117-
</ItemGroup>
17+
11818
<ItemGroup>
119-
<Reference Include="System" />
19+
<ProjectReference Include="..\BEPUutilities\BEPUutilities.csproj" />
12020
</ItemGroup>
121-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
122-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
123-
Other similar extension points exist, see Microsoft.Common.targets.
124-
<Target Name="BeforeBuild">
125-
</Target>
126-
<Target Name="AfterBuild">
127-
</Target>
128-
-->
21+
12922
</Project>

‎BEPUik/Properties/AssemblyInfo.cs

-36
This file was deleted.

‎BEPUphysics.sln

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27428.2015
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BEPUutilities", "BEPUutilities\BEPUutilities.csproj", "{34853DEA-43A6-4F2F-A379-D1EE04D256D2}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BEPUutilities", "BEPUutilities\BEPUutilities.csproj", "{34853DEA-43A6-4F2F-A379-D1EE04D256D2}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BEPUphysics", "BEPUphysics\BEPUphysics.csproj", "{C0D52C9F-14B8-4008-8DDC-109C27561A5C}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BEPUphysics", "BEPUphysics\BEPUphysics.csproj", "{C0D52C9F-14B8-4008-8DDC-109C27561A5C}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BEPUik", "BEPUik\BEPUik.csproj", "{2D5A0344-623A-4BFA-AAB6-8AC64E2A4129}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BEPUik", "BEPUik\BEPUik.csproj", "{2D5A0344-623A-4BFA-AAB6-8AC64E2A4129}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -59,4 +59,7 @@ Global
5959
GlobalSection(SolutionProperties) = preSolution
6060
HideSolutionNode = FALSE
6161
EndGlobalSection
62+
GlobalSection(ExtensibilityGlobals) = postSolution
63+
SolutionGuid = {B8626FEB-BD01-4331-96D0-DB0FB96F2BC1}
64+
EndGlobalSection
6265
EndGlobal

0 commit comments

Comments
 (0)