Skip to content

Commit 914cd0c

Browse files
ZiyunShangZiyunShang
authored
Rc2.6.1 revit master (#2629)
* Revert "Update to Dynamo Core 2.8 (#2608)" This reverts commit 65e2e52. * Update for RC2.6.1_RevitMaster
1 parent 8e05336 commit 914cd0c

File tree

17 files changed

+84
-109
lines changed

17 files changed

+84
-109
lines changed

‎.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.19
1+
0.2.19.1

‎CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
## 0.2.19
1+
## 0.2.19.1
22
* Fix a bug - filter out unavailable Parameters from Material.
33
* Add some view 3d properties - View.Outline, View.Origin, View.Scale, View.CropBox, View.SetCropBox, View.CropBoxActive, View.SetCropBoxActive, View.CropBoxVisible, View.SetCropBoxVisible, View.ViewDirection, View.RightDirection.
44
* Add some view properties - View.Discipline, View.SetDiscipline, View.DisplayStyle, View.SetDisplayStyle, View.SketchPlane, View.SetSketchPlane.
55
* Add some view properties - View.CanViewBeDuplicated, View.Partsvisibility, View.SetPartsVisibility
66
* Add some new nodes - View.GetCategoryOverrides, View.IsCategoryHidden, Element.OverridesInView, Element.IsHiddeninView
7-
* Update DynamoCore to 2.8.0 for Dynamo CPython3 engine.
87
* Add some View Nodes - View.HideCategoriesTemporary, View.HideElementsTemporary, View.IsolateCategoriesTemporary, View.IsolateElementsTemporary.
98
* Improve DuplicateSheet Node - add "duplicateWithContents" option, add default suffix value when prefix & suffix are both empty.
109
* Improve DuplicateSheet Node - Set Sheet information when duplicating; Improve View Temporary Nodes.

‎Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
stage ('Starting DynamoRevit build job') {
22
def branchToBuild = env.BRANCH_NAME
3-
build job: '../DynamoRevitUtils/master', parameters: [[$class: 'StringParameterValue', name: 'BranchDynamoRevit', value: branchToBuild ]]
3+
build job: '../DynamoRevitUtils/RC2.6.1_RevitMaster', parameters: [[$class: 'StringParameterValue', name: 'BranchDynamoRevit', value: branchToBuild ]]
44
}

‎src/AssemblySharedInfoGenerator/AssemblySharedInfo.tt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ using System.Runtime.InteropServices;
6868
[assembly: AssemblyFileVersion("<#= this.MajorVersion #>.<#= this.MinorVersion #>.<#= this.BuildNumber #>.<#= this.RevisionNumber #>")]
6969
<#+
7070
int MajorVersion = 2;
71-
int MinorVersion = 8;
72-
int BuildNumber = 0;
73-
int RevisionNumber = ((int)(DateTime.UtcNow - new DateTime(2020,1,1)).TotalDays)*10+((int)DateTime.UtcNow.Hour)/3;
71+
int MinorVersion = 6;
72+
int BuildNumber = 1;
73+
int RevisionNumber = ((int)(DateTime.UtcNow - new DateTime(2018,1,1)).TotalDays)*10+((int)DateTime.UtcNow.Hour)/3;
7474
#>

‎src/Config/packages.aget

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
{
22
"nuget": {
33
"references": {
4-
"DynamicLanguageRuntime": "1.2.2",
5-
"DynamoVisualProgramming.Core": "2.8.0-beta2195",
6-
"DynamoVisualProgramming.DynamoCoreNodes": "2.8.0-beta2195",
7-
"DynamoVisualProgramming.DynamoServices": "2.8.0-beta2195",
8-
"DynamoVisualProgramming.Tests": "2.8.0-beta2195",
9-
"DynamoVisualProgramming.WpfUILibrary": "2.8.0-beta2195",
10-
"DynamoVisualProgramming.ZeroTouchLibrary": "2.8.0-beta2195",
11-
"DynamoVisualProgramming.DynamoSamples": "2.8.0-beta2195",
12-
"Greg": "2.0.7507.22529",
13-
"GregRevitAuth": "1.0.7057.20655",
14-
"IronPython": "2.7.9",
15-
"pythonnet_py38_win": "2.5.1",
16-
"Newtonsoft.Json": "8.0.3",
17-
"NUnit": "2.6.3",
18-
"Prism": "4.1.0",
19-
"RestSharp": "105.2.3",
20-
"Unofficial.Ionic.Zip": "1.9.1.8"
4+
"DynamicLanguageRuntime" : "1.2.2",
5+
"DynamoVisualProgramming.Core" : "2.6.0.8481",
6+
"DynamoVisualProgramming.DynamoCoreNodes" : "2.6.0.8481",
7+
"DynamoVisualProgramming.DynamoServices" : "2.6.0.8481",
8+
"DynamoVisualProgramming.Tests" : "2.6.0.8481",
9+
"DynamoVisualProgramming.WpfUILibrary" : "2.6.0.8481",
10+
"DynamoVisualProgramming.ZeroTouchLibrary" : "2.6.0.8481",
11+
"DynamoVisualProgramming.DynamoSamples" : "2.6.0.8481",
12+
"Greg" : "1.2.7177.24952",
13+
"GregRevitAuth" : "1.0.7057.20655",
14+
"IronPython" : "2.7.9",
15+
"Newtonsoft.Json" : "8.0.3",
16+
"NUnit" : "2.6.3",
17+
"Prism" : "4.1.0",
18+
"RestSharp" : "105.2.3",
19+
"Unofficial.Ionic.Zip" : "1.9.1.8"
2120
}
2221
}
2322
}

‎src/DynamoRevit/DynamoRevit.csproj

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,16 @@
4949
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
5050
</PropertyGroup>
5151
<ItemGroup>
52-
<Reference Include="DSCPython">
53-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DSCPython.dll</HintPath>
54-
<Private>False</Private>
55-
</Reference>
5652
<Reference Include="DynamoApplications">
57-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DynamoApplications.dll</HintPath>
53+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DynamoApplications.dll</HintPath>
5854
<Private>False</Private>
5955
</Reference>
6056
<Reference Include="DynamoServices">
61-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoServices\lib\net48\DynamoServices.dll</HintPath>
57+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoServices\lib\net47\DynamoServices.dll</HintPath>
6258
<Private>False</Private>
6359
</Reference>
6460
<Reference Include="Greg">
65-
<HintPath>$(PACKAGESPATH)\Greg\lib\net48\Greg.dll</HintPath>
61+
<HintPath>$(PACKAGESPATH)\Greg\lib\net47\Greg.dll</HintPath>
6662
<Private>False</Private>
6763
</Reference>
6864
<Reference Include="GregRevitAuth">
@@ -97,11 +93,7 @@
9793
<RequiredTargetFramework>3.0</RequiredTargetFramework>
9894
</Reference>
9995
<Reference Include="ProtoGeometry">
100-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.ZeroTouchLibrary\lib\net48\ProtoGeometry.dll</HintPath>
101-
<Private>False</Private>
102-
</Reference>
103-
<Reference Include="Python.Runtime">
104-
<HintPath>$(PACKAGESPATH)\pythonnet\lib\net40\Python.Runtime.dll</HintPath>
96+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.ZeroTouchLibrary\lib\net47\ProtoGeometry.dll</HintPath>
10597
<Private>False</Private>
10698
</Reference>
10799
<Reference Include="RestSharp">
@@ -166,31 +158,31 @@
166158
</ItemGroup>
167159
<ItemGroup>
168160
<Reference Include="ProtoCore">
169-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\ProtoCore.dll</HintPath>
161+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\ProtoCore.dll</HintPath>
170162
<Private>False</Private>
171163
</Reference>
172164
<Reference Include="DSIronPython">
173-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DSIronPython.dll</HintPath>
165+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DSIronPython.dll</HintPath>
174166
<Private>False</Private>
175167
</Reference>
176168
<Reference Include="DynamoCoreWpf">
177-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.WpfUILibrary\lib\net48\DynamoCoreWpf.dll</HintPath>
169+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.WpfUILibrary\lib\net47\DynamoCoreWpf.dll</HintPath>
178170
<Private>False</Private>
179171
</Reference>
180172
<Reference Include="DynamoCore">
181-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DynamoCore.dll</HintPath>
173+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DynamoCore.dll</HintPath>
182174
<Private>False</Private>
183175
</Reference>
184176
<Reference Include="DynamoUtilities">
185-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DynamoUtilities.dll</HintPath>
177+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DynamoUtilities.dll</HintPath>
186178
<Private>False</Private>
187179
</Reference>
188180
<Reference Include="DynamoShapeManager">
189-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DynamoShapeManager.dll</HintPath>
181+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DynamoShapeManager.dll</HintPath>
190182
<Private>False</Private>
191183
</Reference>
192184
<Reference Include="DynamoInstallDetective">
193-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DynamoInstallDetective.dll</HintPath>
185+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DynamoInstallDetective.dll</HintPath>
194186
<Private>False</Private>
195187
</Reference>
196188
</ItemGroup>

‎src/DynamoRevit/Models/RevitDynamoModel.cs

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using Autodesk.Revit.DB.Events;
99
using Autodesk.Revit.UI;
1010
using Autodesk.Revit.UI.Events;
11-
using DSCPython;
1211
using DSIronPython;
1312
using Dynamo.Graph.Nodes;
1413
using Dynamo.Graph.Nodes.ZeroTouch;
@@ -390,29 +389,16 @@ private void SetupPython()
390389
(a, b, c, d, e) => ElementBinder.IsEnabled = false;
391390
IronPythonEvaluator.EvaluationEnd += (a, b, c, d, e) => ElementBinder.IsEnabled = true;
392391

393-
var marshaler = new DataMarshaler();
394-
marshaler.RegisterMarshaler(
395-
(Revit.Elements.Element element) => element.InternalElement);
396-
marshaler.RegisterMarshaler((Category element) => element.InternalCategory);
397-
Func<object, object> unwrap = marshaler.Marshal;
398392
// register UnwrapElement method in ironpython
399393
IronPythonEvaluator.EvaluationBegin += (a, b, scope, d, e) =>
400394
{
401-
scope.SetVariable("UnwrapElement", unwrap);
402-
};
403-
404-
CPythonEvaluator.OutputMarshaler.RegisterMarshaler(
405-
(Element element) => element.ToDSType(true));
395+
var marshaler = new DataMarshaler();
396+
marshaler.RegisterMarshaler(
397+
(Revit.Elements.Element element) => element.InternalElement);
398+
marshaler.RegisterMarshaler((Category element) => element.InternalCategory);
406399

407-
// Turn off element binding during cpython script execution
408-
CPythonEvaluator.EvaluationBegin +=
409-
(a, b, c, d) => ElementBinder.IsEnabled = false;
410-
CPythonEvaluator.EvaluationEnd += (a, b, c, d) => ElementBinder.IsEnabled = true;
411-
412-
// register UnwrapElement method in cpython
413-
CPythonEvaluator.EvaluationBegin += (a, scope, c, d) =>
414-
{
415-
scope.Set("UnwrapElement", unwrap);
400+
Func<object, object> unwrap = marshaler.Marshal;
401+
scope.SetVariable("UnwrapElement", unwrap);
416402
};
417403

418404
setupPython = true;

‎src/DynamoRevit/RevitPathResolver.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ internal RevitPathResolver(string userDataFolder, string commonDataFolder)
3838
"DSCoreNodes.dll",
3939
"DSOffice.dll",
4040
"DSIronPython.dll",
41-
"DSCPython.dll",
4241
"FunctionObject.ds",
4342
"BuiltIn.ds",
4443
"DynamoConversions.dll",

‎src/Libraries/Migrations/Migrations.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</PropertyGroup>
3737
<ItemGroup>
3838
<Reference Include="DynamoServices">
39-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoServices\lib\net48\DynamoServices.dll</HintPath>
39+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoServices\lib\net47\DynamoServices.dll</HintPath>
4040
<Private>False</Private>
4141
</Reference>
4242
<Reference Include="System" />
@@ -62,11 +62,11 @@
6262
</ItemGroup>
6363
<ItemGroup>
6464
<Reference Include="DynamoCore">
65-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DynamoCore.dll</HintPath>
65+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DynamoCore.dll</HintPath>
6666
<Private>False</Private>
6767
</Reference>
6868
<Reference Include="DynamoUnits">
69-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.ZeroTouchLibrary\lib\net48\DynamoUnits.dll</HintPath>
69+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.ZeroTouchLibrary\lib\net47\DynamoUnits.dll</HintPath>
7070
<Private>False</Private>
7171
</Reference>
7272
</ItemGroup>

‎src/Libraries/RevitNodes/RevitNodes.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</PropertyGroup>
4343
<ItemGroup>
4444
<Reference Include="DynamoServices">
45-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoServices\lib\net48\DynamoServices.dll</HintPath>
45+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoServices\lib\net47\DynamoServices.dll</HintPath>
4646
<Private>False</Private>
4747
</Reference>
4848
<Reference Include="PresentationCore" />
@@ -55,7 +55,7 @@
5555
<Private>False</Private>
5656
</Reference>
5757
<Reference Include="ProtoGeometry">
58-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.ZeroTouchLibrary\lib\net48\ProtoGeometry.dll</HintPath>
58+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.ZeroTouchLibrary\lib\net47\ProtoGeometry.dll</HintPath>
5959
<Private>False</Private>
6060
</Reference>
6161
<Reference Include="System" />
@@ -218,19 +218,19 @@
218218
</ItemGroup>
219219
<ItemGroup>
220220
<Reference Include="DynamoCore">
221-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DynamoCore.dll</HintPath>
221+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DynamoCore.dll</HintPath>
222222
<Private>False</Private>
223223
</Reference>
224224
<Reference Include="Analysis">
225-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoCoreNodes\lib\net48\Analysis.dll</HintPath>
225+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoCoreNodes\lib\net47\Analysis.dll</HintPath>
226226
<Private>False</Private>
227227
</Reference>
228228
<Reference Include="DSCoreNodes">
229-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoCoreNodes\lib\net48\DSCoreNodes.dll</HintPath>
229+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoCoreNodes\lib\net47\DSCoreNodes.dll</HintPath>
230230
<Private>False</Private>
231231
</Reference>
232232
<Reference Include="DynamoUnits">
233-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.ZeroTouchLibrary\lib\net48\DynamoUnits.dll</HintPath>
233+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.ZeroTouchLibrary\lib\net47\DynamoUnits.dll</HintPath>
234234
<Private>False</Private>
235235
</Reference>
236236
<ProjectReference Include="..\RevitServices\RevitServices.csproj">

‎src/Libraries/RevitNodesUI/RevitNodesUI.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</PropertyGroup>
3737
<ItemGroup>
3838
<Reference Include="DynamoUtilities">
39-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DynamoUtilities.dll</HintPath>
39+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DynamoUtilities.dll</HintPath>
4040
<Private>False</Private>
4141
</Reference>
4242
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -46,11 +46,11 @@
4646
<Reference Include="PresentationCore" />
4747
<Reference Include="PresentationFramework" />
4848
<Reference Include="ProtoGeometry">
49-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.ZeroTouchLibrary\lib\net48\ProtoGeometry.dll</HintPath>
49+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.ZeroTouchLibrary\lib\net47\ProtoGeometry.dll</HintPath>
5050
<Private>False</Private>
5151
</Reference>
5252
<Reference Include="DynamoServices">
53-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoServices\lib\net48\DynamoServices.dll</HintPath>
53+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoServices\lib\net47\DynamoServices.dll</HintPath>
5454
<Private>False</Private>
5555
</Reference>
5656
<Reference Include="RevitAPI">
@@ -102,31 +102,31 @@
102102
</ItemGroup>
103103
<ItemGroup>
104104
<Reference Include="DynamoCoreWpf">
105-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.WpfUILibrary\lib\net48\DynamoCoreWpf.dll</HintPath>
105+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.WpfUILibrary\lib\net47\DynamoCoreWpf.dll</HintPath>
106106
<Private>False</Private>
107107
</Reference>
108108
<Reference Include="ProtoCore">
109-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\ProtoCore.dll</HintPath>
109+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\ProtoCore.dll</HintPath>
110110
<Private>False</Private>
111111
</Reference>
112112
<Reference Include="CoreNodeModelsWpf">
113-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.WpfUILibrary\lib\net48\CoreNodeModelsWpf.dll</HintPath>
113+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.WpfUILibrary\lib\net47\CoreNodeModelsWpf.dll</HintPath>
114114
<Private>False</Private>
115115
</Reference>
116116
<Reference Include="CoreNodeModels">
117-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.WpfUILibrary\lib\net48\CoreNodeModels.dll</HintPath>
117+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.WpfUILibrary\lib\net47\CoreNodeModels.dll</HintPath>
118118
<Private>False</Private>
119119
</Reference>
120120
<Reference Include="DynamoCore">
121-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DynamoCore.dll</HintPath>
121+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DynamoCore.dll</HintPath>
122122
<Private>False</Private>
123123
</Reference>
124124
<Reference Include="DSCoreNodes">
125-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoCoreNodes\lib\net48\DSCoreNodes.dll</HintPath>
125+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoCoreNodes\lib\net47\DSCoreNodes.dll</HintPath>
126126
<Private>False</Private>
127127
</Reference>
128128
<Reference Include="DynamoUnits">
129-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.ZeroTouchLibrary\lib\net48\DynamoUnits.dll</HintPath>
129+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.ZeroTouchLibrary\lib\net47\DynamoUnits.dll</HintPath>
130130
<Private>False</Private>
131131
</Reference>
132132
<Reference Include="Microsoft.Practices.Prism">

‎src/Libraries/RevitServices/RevitServices.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ limitations under the License.
5151
</PropertyGroup>
5252
<ItemGroup>
5353
<Reference Include="DynamoServices">
54-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoServices\lib\net48\DynamoServices.dll</HintPath>
54+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.DynamoServices\lib\net47\DynamoServices.dll</HintPath>
5555
<Private>False</Private>
5656
</Reference>
5757
<Reference Include="Microsoft.Practices.Prism">
@@ -93,11 +93,11 @@ limitations under the License.
9393
</ItemGroup>
9494
<ItemGroup>
9595
<Reference Include="DynamoCore">
96-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DynamoCore.dll</HintPath>
96+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DynamoCore.dll</HintPath>
9797
<Private>False</Private>
9898
</Reference>
9999
<Reference Include="ProtoCore">
100-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\ProtoCore.dll</HintPath>
100+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\ProtoCore.dll</HintPath>
101101
<Private>False</Private>
102102
</Reference>
103103
</ItemGroup>

‎src/Tools/DynamoAddInGenerator/DynamoAddInGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="DynamoInstallDetective">
40-
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net48\DynamoInstallDetective.dll</HintPath>
40+
<HintPath>$(PACKAGESPATH)\DynamoVisualProgramming.Core\lib\net47\DynamoInstallDetective.dll</HintPath>
4141
</Reference>
4242
<Reference Include="RevitAddinUtility">
4343
<HintPath>$(ProjectDir)\RevitAddinUtility.dll</HintPath>

‎src/restorepackages.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ set NugetConfig=%ConfigDir%\dynamo-nuget.config
2727

2828
REM 2. download 3rdParty packages by Aget.exe
2929
echo Running Python script from %AgetFile% using dynamo-nuget.config file
30-
set PythonAget="%AgetFile%" -os win -config release -iset intel64 -toolchain v140 -linkage shared -packagesDir "%DynamoPackages%" -nuget "%NugetExe%" -framework net48 -nugetConfig "%NugetConfig%"
30+
set PythonAget="%AgetFile%" -os win -config release -iset intel64 -toolchain v140 -linkage shared -packagesDir "%DynamoPackages%" -nuget "%NugetExe%" -framework net47 -nugetConfig "%NugetConfig%"
3131

3232
call :TrackTime "[Aget] Downloading NuGet packages from the NuGet Gallery and the Artifactory server, might take a while if running for the first time."
3333
echo If any package is not found in the NuGet Gallery, redirect to look up in the Artifactory server...

0 commit comments

Comments
 (0)