Skip to content

Commit 9ff0b7a

Browse files
sepp87sepp87
committed
Changed Dynamo dependencies to NuGet Packages
and corrected an exception message
1 parent 0496249 commit 9ff0b7a

File tree

78 files changed

+108636
-23
lines changed

Some content is hidden

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

78 files changed

+108636
-23
lines changed

‎Dynamoid/Dynamoid.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static IEnumerable<Point> ConnectCircleAndCircle(Circle circleStart, Circ
6262
switch (result)
6363
{
6464
case -1:
65-
throw new Exception("Circle and Line are intersecting.");
65+
throw new Exception("Circle and Circle are intersecting.");
6666
case 1:
6767
throw new Exception("Connecting clothoid becomes too long.");
6868
}

‎Dynamoid/Dynamoid.csproj

+64-22
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Dynamoid</RootNamespace>
1111
<AssemblyName>Dynamoid</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -31,42 +32,80 @@
3132
<WarningLevel>4</WarningLevel>
3233
</PropertyGroup>
3334
<ItemGroup>
34-
<Reference Include="DSCoreNodes">
35-
<HintPath>C:\Program Files\Dynamo\Dynamo Core\2\DSCoreNodes.dll</HintPath>
36-
<Private>False</Private>
35+
<Reference Include="Analysis, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.6.1.8786\lib\net47\Analysis.dll</HintPath>
3737
</Reference>
38-
<Reference Include="DynamoCore">
39-
<HintPath>C:\Program Files\Dynamo\Dynamo Core\2\DynamoCore.dll</HintPath>
40-
<Private>False</Private>
38+
<Reference Include="DesignScriptBuiltin, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\DynamoVisualProgramming.Core.2.6.1.8786\lib\net47\DesignScriptBuiltin.dll</HintPath>
4140
</Reference>
42-
<Reference Include="DynamoServices">
43-
<HintPath>C:\Program Files\Dynamo\Dynamo Core\2\DynamoServices.dll</HintPath>
44-
<Private>False</Private>
41+
<Reference Include="DSCoreNodes, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.6.1.8786\lib\net47\DSCoreNodes.dll</HintPath>
4543
</Reference>
46-
<Reference Include="DynamoUtilities">
47-
<HintPath>C:\Program Files\Dynamo\Dynamo Core\2\DynamoUtilities.dll</HintPath>
48-
<Private>False</Private>
44+
<Reference Include="DSIronPython, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\DynamoVisualProgramming.Core.2.6.1.8786\lib\net47\DSIronPython.dll</HintPath>
4946
</Reference>
50-
<Reference Include="ProtoCore">
51-
<HintPath>C:\Program Files\Dynamo\Dynamo Core\2\ProtoCore.dll</HintPath>
52-
<Private>False</Private>
47+
<Reference Include="DynamoApplications, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\DynamoVisualProgramming.Core.2.6.1.8786\lib\net47\DynamoApplications.dll</HintPath>
5349
</Reference>
54-
<Reference Include="ProtoGeometry">
55-
<HintPath>C:\Program Files\Dynamo\Dynamo Core\2\ProtoGeometry.dll</HintPath>
56-
<Private>False</Private>
50+
<Reference Include="DynamoCore, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\DynamoVisualProgramming.Core.2.6.1.8786\lib\net47\DynamoCore.dll</HintPath>
5752
</Reference>
58-
<Reference Include="ProtoScript">
59-
<HintPath>C:\Program Files\Dynamo\Dynamo Core\2\ProtoScript.dll</HintPath>
60-
<Private>False</Private>
53+
<Reference Include="DynamoInstallDetective, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\DynamoVisualProgramming.Core.2.6.1.8786\lib\net47\DynamoInstallDetective.dll</HintPath>
55+
</Reference>
56+
<Reference Include="DynamoServices, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
57+
<HintPath>..\packages\DynamoVisualProgramming.DynamoServices.2.6.1.8786\lib\net47\DynamoServices.dll</HintPath>
58+
</Reference>
59+
<Reference Include="DynamoShapeManager, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
60+
<HintPath>..\packages\DynamoVisualProgramming.Core.2.6.1.8786\lib\net47\DynamoShapeManager.dll</HintPath>
61+
</Reference>
62+
<Reference Include="DynamoUnits, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
63+
<HintPath>..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.6.1.8786\lib\net47\DynamoUnits.dll</HintPath>
64+
</Reference>
65+
<Reference Include="DynamoUtilities, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
66+
<HintPath>..\packages\DynamoVisualProgramming.Core.2.6.1.8786\lib\net47\DynamoUtilities.dll</HintPath>
67+
</Reference>
68+
<Reference Include="GeometryColor, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
69+
<HintPath>..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.6.1.8786\lib\net47\GeometryColor.dll</HintPath>
70+
</Reference>
71+
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Prism.4.1.0.0\lib\NET40\Microsoft.Expression.Interactions.dll</HintPath>
73+
</Reference>
74+
<Reference Include="Microsoft.Practices.Prism, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Prism.4.1.0.0\lib\NET40\Microsoft.Practices.Prism.dll</HintPath>
76+
</Reference>
77+
<Reference Include="Microsoft.Practices.Prism.Interactivity, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Prism.4.1.0.0\lib\NET40\Microsoft.Practices.Prism.Interactivity.dll</HintPath>
79+
</Reference>
80+
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
82+
</Reference>
83+
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
84+
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
85+
</Reference>
86+
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
87+
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
88+
</Reference>
89+
<Reference Include="ProtoCore, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
90+
<HintPath>..\packages\DynamoVisualProgramming.Core.2.6.1.8786\lib\net47\ProtoCore.dll</HintPath>
91+
</Reference>
92+
<Reference Include="ProtoGeometry, Version=2.6.0.8195, Culture=neutral, processorArchitecture=MSIL">
93+
<HintPath>..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.6.1.8786\lib\net47\ProtoGeometry.dll</HintPath>
6194
</Reference>
6295
<Reference Include="System" />
6396
<Reference Include="System.Core" />
97+
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98+
<HintPath>..\packages\Prism.4.1.0.0\lib\NET40\System.Windows.Interactivity.dll</HintPath>
99+
</Reference>
64100
<Reference Include="System.Xml.Linq" />
65101
<Reference Include="System.Data.DataSetExtensions" />
66102
<Reference Include="Microsoft.CSharp" />
67103
<Reference Include="System.Data" />
68104
<Reference Include="System.Net.Http" />
69105
<Reference Include="System.Xml" />
106+
<Reference Include="VMDataBridge, Version=2.6.1.8786, Culture=neutral, processorArchitecture=MSIL">
107+
<HintPath>..\packages\DynamoVisualProgramming.Core.2.6.1.8786\lib\net47\VMDataBridge.dll</HintPath>
108+
</Reference>
70109
</ItemGroup>
71110
<ItemGroup>
72111
<Compile Include="Dynamoid.cs" />
@@ -78,5 +117,8 @@
78117
<Name>Clothoid</Name>
79118
</ProjectReference>
80119
</ItemGroup>
120+
<ItemGroup>
121+
<None Include="packages.config" />
122+
</ItemGroup>
81123
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
82124
</Project>

‎Dynamoid/packages.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="CommonServiceLocator" version="1.0" targetFramework="net472" />
4+
<package id="DynamoVisualProgramming.Core" version="2.6.1.8786" targetFramework="net472" />
5+
<package id="DynamoVisualProgramming.DynamoCoreNodes" version="2.6.1.8786" targetFramework="net472" />
6+
<package id="DynamoVisualProgramming.DynamoServices" version="2.6.1.8786" targetFramework="net472" />
7+
<package id="DynamoVisualProgramming.ZeroTouchLibrary" version="2.6.1.8786" targetFramework="net472" />
8+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net472" />
9+
<package id="NUnit" version="2.6.3" targetFramework="net472" />
10+
<package id="Prism" version="4.1.0.0" targetFramework="net472" />
11+
</packages>

‎packages/CommonServiceLocator.1.0/.signature.p7s

9.3 KB
Binary file not shown.

‎packages/CommonServiceLocator.1.0/CommonServiceLocator.1.0.nupkg

45.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)