Skip to content

Commit 7fbf78e

Browse files
QilongTangQilongTang
authored
.Net 47 Build change for Revit 2019 (#2265)
* Update to build with Visual Studio 2017 (#2263) Added ability to build DynamoRevit using Visual Studio 2017. Added new 2017 sln Dotsettings file. Update transform_all to better generalize finding location fo Texttransform.exe. Updated Icons Resource generation to generalize location of ResGen.exe * Update for IronPython
1 parent fda8ac5 commit 7fbf78e

9 files changed

Lines changed: 183 additions & 29 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ ipch/
8787
*.sdf
8888
*.cachefile
8989

90+
# Visual Studio cache directory
91+
.vs
92+
9093
# Visual Studio profiler
9194
*.psess
9295
*.vsp

‎src/Config/packages-template.aget‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"nuget": {
33
"references": {
4+
"DynamicLanguageRuntime" : "1.2.1",
45
"DynamoVisualProgramming.Core" : "LatestBeta",
56
"DynamoVisualProgramming.DynamoCoreNodes" : "LatestBeta",
67
"DynamoVisualProgramming.DynamoServices" : "LatestBeta",
@@ -9,7 +10,7 @@
910
"DynamoVisualProgramming.ZeroTouchLibrary" : "LatestBeta",
1011
"Greg" : "1.0.6176.18754",
1112
"GregRevitAuth" : "1.0.5907.17451",
12-
"IronPython" : "2.7.2",
13+
"IronPython" : "2.7.8.1",
1314
"Newtonsoft.Json" : "8.0.3",
1415
"NUnit" : "2.6.3",
1516
"Prism" : "4.1.0",

‎src/Config/user_local.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
<DYNAMOTESTAPI Condition=" '$(DYNAMOTESTAPI)' == '' ">$(SolutionDir)..\bin\$(Platform)\$(Configuration)</DYNAMOTESTAPI>
77
<OutputPath Condition=" '$(OutputPath)' == '' ">$(SolutionDir)..\bin\AnyCPU\$(Configuration)\$(REVIT_VERSION)</OutputPath>
88
<TestOutputPath Condition=" '$(TestOutputPath)' == '' ">$(OutputPath)</TestOutputPath>
9+
<REVITAPI Condition=" '$(REVITAPI)' == '' ">$(SolutionDir)..\..\Revit\$(Configuration)x64</REVITAPI>
910
</PropertyGroup>
1011
</Project>

‎src/DynamoRevit.2017.sln‎

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28010.2050
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamoRevit", "DynamoRevit\DynamoRevit.csproj", "{FD56AE51-739E-4893-8DE4-925D60C7097C}"
7+
ProjectSection(ProjectDependencies) = postProject
8+
{133FC760-5699-46D9-BEA6-E816B5F01016} = {133FC760-5699-46D9-BEA6-E816B5F01016}
9+
EndProjectSection
10+
EndProject
11+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{FA7BE306-A3B0-45FA-9D87-0C69E6932C13}"
12+
EndProject
13+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitNodes", "Libraries\RevitNodes\RevitNodes.csproj", "{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}"
14+
ProjectSection(ProjectDependencies) = postProject
15+
{133FC760-5699-46D9-BEA6-E816B5F01016} = {133FC760-5699-46D9-BEA6-E816B5F01016}
16+
EndProjectSection
17+
EndProject
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitNodesUI", "Libraries\RevitNodesUI\RevitNodesUI.csproj", "{75940ACC-3708-4526-8D91-7E3365BAF682}"
19+
EndProject
20+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitServices", "Libraries\RevitServices\RevitServices.csproj", "{E4701F9E-41AB-4044-8166-85D924FEB632}"
21+
ProjectSection(ProjectDependencies) = postProject
22+
{133FC760-5699-46D9-BEA6-E816B5F01016} = {133FC760-5699-46D9-BEA6-E816B5F01016}
23+
EndProjectSection
24+
EndProject
25+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F4D44BC0-32CF-4E58-AD2A-F19CE1450B00}"
26+
EndProject
27+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{0E492D35-2310-4849-9694-A2A53C09F21B}"
28+
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitNodesTests", "..\test\Libraries\RevitNodesTests\RevitNodesTests.csproj", "{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}"
30+
EndProject
31+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitServicesTests", "..\test\Libraries\RevitServicesTests\RevitServicesTests.csproj", "{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}"
32+
EndProject
33+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Migrations", "Libraries\Migrations\Migrations.csproj", "{06B9E5B0-7C50-4351-9D88-E159DC25755F}"
34+
ProjectSection(ProjectDependencies) = postProject
35+
{133FC760-5699-46D9-BEA6-E816B5F01016} = {133FC760-5699-46D9-BEA6-E816B5F01016}
36+
EndProjectSection
37+
EndProject
38+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Legacy", "Legacy", "{398542E6-659A-48C8-86EB-33164D227C90}"
39+
EndProject
40+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamoRevitVersionSelector", "Legacy\DynamoRevitVersionSelector\DynamoRevitVersionSelector.csproj", "{53D05530-CF64-4883-8F86-B2B819934F83}"
41+
ProjectSection(ProjectDependencies) = postProject
42+
{133FC760-5699-46D9-BEA6-E816B5F01016} = {133FC760-5699-46D9-BEA6-E816B5F01016}
43+
EndProjectSection
44+
EndProject
45+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitTestServices", "..\test\Libraries\RevitTestServices\RevitTestServices.csproj", "{589F14D7-2937-479C-834A-D44197CB1930}"
46+
ProjectSection(ProjectDependencies) = postProject
47+
{133FC760-5699-46D9-BEA6-E816B5F01016} = {133FC760-5699-46D9-BEA6-E816B5F01016}
48+
EndProjectSection
49+
EndProject
50+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyInfoGenerator", "AssemblySharedInfoGenerator\AssemblyInfoGenerator.csproj", "{133FC760-5699-46D9-BEA6-E816B5F01016}"
51+
EndProject
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitSystemTests", "..\test\Libraries\RevitIntegrationTests\RevitSystemTests.csproj", "{9ADADC68-36A3-4A21-9B54-298154A88720}"
53+
EndProject
54+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4466E6F6-F644-43AB-96B3-5ECE1622E711}"
55+
ProjectSection(SolutionItems) = preProject
56+
Config.xml = Config.xml
57+
EndProjectSection
58+
EndProject
59+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamoRevitIcons", "DynamoRevitIcons\DynamoRevitIcons.csproj", "{A31E274C-524A-40CA-85FF-595D3DB53777}"
60+
EndProject
61+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{821DE75A-8C7C-4747-B838-BA0354B15592}"
62+
EndProject
63+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamoAddinGenerator", "Tools\DynamoAddinGenerator\DynamoAddinGenerator.csproj", "{92A46535-D870-4E1A-AED0-7492789E9C4A}"
64+
EndProject
65+
Global
66+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
67+
Debug|Any CPU = Debug|Any CPU
68+
Release|Any CPU = Release|Any CPU
69+
EndGlobalSection
70+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
71+
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72+
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Debug|Any CPU.Build.0 = Debug|Any CPU
73+
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Release|Any CPU.ActiveCfg = Release|Any CPU
74+
{FD56AE51-739E-4893-8DE4-925D60C7097C}.Release|Any CPU.Build.0 = Release|Any CPU
75+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
77+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
78+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2}.Release|Any CPU.Build.0 = Release|Any CPU
79+
{75940ACC-3708-4526-8D91-7E3365BAF682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80+
{75940ACC-3708-4526-8D91-7E3365BAF682}.Debug|Any CPU.Build.0 = Debug|Any CPU
81+
{75940ACC-3708-4526-8D91-7E3365BAF682}.Release|Any CPU.ActiveCfg = Release|Any CPU
82+
{75940ACC-3708-4526-8D91-7E3365BAF682}.Release|Any CPU.Build.0 = Release|Any CPU
83+
{E4701F9E-41AB-4044-8166-85D924FEB632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84+
{E4701F9E-41AB-4044-8166-85D924FEB632}.Debug|Any CPU.Build.0 = Debug|Any CPU
85+
{E4701F9E-41AB-4044-8166-85D924FEB632}.Release|Any CPU.ActiveCfg = Release|Any CPU
86+
{E4701F9E-41AB-4044-8166-85D924FEB632}.Release|Any CPU.Build.0 = Release|Any CPU
87+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Debug|Any CPU.Build.0 = Debug|Any CPU
89+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Release|Any CPU.ActiveCfg = Release|Any CPU
90+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66}.Release|Any CPU.Build.0 = Release|Any CPU
91+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
92+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Debug|Any CPU.Build.0 = Debug|Any CPU
93+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Release|Any CPU.ActiveCfg = Release|Any CPU
94+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870}.Release|Any CPU.Build.0 = Release|Any CPU
95+
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
96+
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Debug|Any CPU.Build.0 = Debug|Any CPU
97+
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|Any CPU.ActiveCfg = Release|Any CPU
98+
{06B9E5B0-7C50-4351-9D88-E159DC25755F}.Release|Any CPU.Build.0 = Release|Any CPU
99+
{53D05530-CF64-4883-8F86-B2B819934F83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
100+
{53D05530-CF64-4883-8F86-B2B819934F83}.Debug|Any CPU.Build.0 = Debug|Any CPU
101+
{53D05530-CF64-4883-8F86-B2B819934F83}.Release|Any CPU.ActiveCfg = Release|Any CPU
102+
{53D05530-CF64-4883-8F86-B2B819934F83}.Release|Any CPU.Build.0 = Release|Any CPU
103+
{589F14D7-2937-479C-834A-D44197CB1930}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
104+
{589F14D7-2937-479C-834A-D44197CB1930}.Debug|Any CPU.Build.0 = Debug|Any CPU
105+
{589F14D7-2937-479C-834A-D44197CB1930}.Release|Any CPU.ActiveCfg = Release|Any CPU
106+
{589F14D7-2937-479C-834A-D44197CB1930}.Release|Any CPU.Build.0 = Release|Any CPU
107+
{133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
108+
{133FC760-5699-46D9-BEA6-E816B5F01016}.Debug|Any CPU.Build.0 = Debug|Any CPU
109+
{133FC760-5699-46D9-BEA6-E816B5F01016}.Release|Any CPU.ActiveCfg = Release|Any CPU
110+
{133FC760-5699-46D9-BEA6-E816B5F01016}.Release|Any CPU.Build.0 = Release|Any CPU
111+
{9ADADC68-36A3-4A21-9B54-298154A88720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112+
{9ADADC68-36A3-4A21-9B54-298154A88720}.Debug|Any CPU.Build.0 = Debug|Any CPU
113+
{9ADADC68-36A3-4A21-9B54-298154A88720}.Release|Any CPU.ActiveCfg = Release|Any CPU
114+
{9ADADC68-36A3-4A21-9B54-298154A88720}.Release|Any CPU.Build.0 = Release|Any CPU
115+
{A31E274C-524A-40CA-85FF-595D3DB53777}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
116+
{A31E274C-524A-40CA-85FF-595D3DB53777}.Debug|Any CPU.Build.0 = Debug|Any CPU
117+
{A31E274C-524A-40CA-85FF-595D3DB53777}.Release|Any CPU.ActiveCfg = Release|Any CPU
118+
{A31E274C-524A-40CA-85FF-595D3DB53777}.Release|Any CPU.Build.0 = Release|Any CPU
119+
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
120+
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
121+
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
122+
{92A46535-D870-4E1A-AED0-7492789E9C4A}.Release|Any CPU.Build.0 = Release|Any CPU
123+
EndGlobalSection
124+
GlobalSection(SolutionProperties) = preSolution
125+
HideSolutionNode = FALSE
126+
EndGlobalSection
127+
GlobalSection(NestedProjects) = preSolution
128+
{0BC2A611-BD0E-4FCC-A1DE-81F14ED369B2} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
129+
{75940ACC-3708-4526-8D91-7E3365BAF682} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
130+
{E4701F9E-41AB-4044-8166-85D924FEB632} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
131+
{0E492D35-2310-4849-9694-A2A53C09F21B} = {F4D44BC0-32CF-4E58-AD2A-F19CE1450B00}
132+
{9E79DC8D-25B1-491F-B094-EA39DE1BBC66} = {0E492D35-2310-4849-9694-A2A53C09F21B}
133+
{AD0499ED-50D3-46F4-9FC9-3F71D88C4870} = {0E492D35-2310-4849-9694-A2A53C09F21B}
134+
{06B9E5B0-7C50-4351-9D88-E159DC25755F} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
135+
{398542E6-659A-48C8-86EB-33164D227C90} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
136+
{53D05530-CF64-4883-8F86-B2B819934F83} = {398542E6-659A-48C8-86EB-33164D227C90}
137+
{589F14D7-2937-479C-834A-D44197CB1930} = {0E492D35-2310-4849-9694-A2A53C09F21B}
138+
{9ADADC68-36A3-4A21-9B54-298154A88720} = {0E492D35-2310-4849-9694-A2A53C09F21B}
139+
{92A46535-D870-4E1A-AED0-7492789E9C4A} = {821DE75A-8C7C-4747-B838-BA0354B15592}
140+
EndGlobalSection
141+
EndGlobal

‎src/DynamoRevit.2017.sln.DotSettings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ARGB/@EntryIndexedValue">ARGB</s:String>
3+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CSV/@EntryIndexedValue">CSV</s:String></wpf:ResourceDictionary>

‎src/DynamoRevit/DynamoRevit.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,16 @@
7070
<Private>False</Private>
7171
</Reference>
7272
<Reference Include="Microsoft.CSharp" />
73-
<Reference Include="Microsoft.Dynamic" />
73+
<Reference Include="Microsoft.Dynamic">
74+
<HintPath>$(PACKAGESPATH)\DynamicLanguageRuntime\lib\net45\Microsoft.Dynamic.dll</HintPath>
75+
<Private>False</Private>
76+
</Reference>
7477
<Reference Include="Microsoft.Practices.Prism">
7578
<HintPath>$(PACKAGESPATH)\Prism\lib\NET40\Microsoft.Practices.Prism.dll</HintPath>
7679
<Private>False</Private>
7780
</Reference>
7881
<Reference Include="Microsoft.Scripting">
79-
<HintPath>$(PACKAGESPATH)\IronPython\lib\Net40\Microsoft.Scripting.dll</HintPath>
82+
<HintPath>$(PACKAGESPATH)\DynamicLanguageRuntime\lib\net45\Microsoft.Scripting.dll</HintPath>
8083
<Private>False</Private>
8184
</Reference>
8285
<Reference Include="Newtonsoft.Json">

‎src/DynamoRevitIcons/DynamoRevitIcons.csproj‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportGroup Label="PropertySheets">
44
<Import Project="$(SolutionDir)Config/CS.props" />
55
</ImportGroup>
@@ -11,7 +11,6 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<RootNamespace>DynamoRevitIcons</RootNamespace>
1313
<AssemblyName>DynamoRevitIcons</AssemblyName>
14-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1514
<FileAlignment>512</FileAlignment>
1615
</PropertyGroup>
1716
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,11 +50,19 @@
5150
<AL TargetType="library" EmbedResources="$(ProjectDir)SimpleRaaSImages.resources" OutputAssembly="$(OutputPath)SimpleRaaS.customization.dll" />
5251
<GenerateResource UseSourcePath="true" Sources="$(ProjectDir)DynamoRaaSImages.resx" OutputResources="$(ProjectDir)DynamoRaaSImages.resources" References="$(FrameworkAssembliesPath)System.Drawing.dll" />
5352
<AL TargetType="library" EmbedResources="$(ProjectDir)DynamoRaaSImages.resources" OutputAssembly="$(OutputPath)DynamoRaaS.customization.dll" />
53+
<GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)RevitNodesImages.resx" OutputResources="$(ProjectDir)RevitNodesImages.resources" References="$(FrameworkAssembliesPath)System.Drawing.dll" />
54+
<AL TargetType="library" EmbedResources="$(ProjectDir)RevitNodesImages.resources" FileVersion="1.0.0.0" ProductName="Dynamo For Revit 2019" ProductVersion="1.0.0.0" Copyright="Copyright © Autodesk, Inc 2017-2018" OutputAssembly="$(OutputPath)RevitNodes.customization.dll" />
55+
<GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)DSRevitNodesUIImages.resx" OutputResources="$(ProjectDir)DSRevitNodesUIImages.resources" References="$(FrameworkAssembliesPath)System.Drawing.dll" />
56+
<AL TargetType="library" EmbedResources="$(ProjectDir)DSRevitNodesUIImages.resources" FileVersion="1.0.0.0" ProductName="Dynamo For Revit 2019" ProductVersion="1.0.0.0" Copyright="Copyright © Autodesk, Inc 2017-2018" OutputAssembly="$(OutputPath)DSRevitNodesUI.customization.dll" />
57+
<GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)SimpleRaaSImages.resx" OutputResources="$(ProjectDir)SimpleRaaSImages.resources" References="$(FrameworkAssembliesPath)System.Drawing.dll" />
58+
<AL TargetType="library" EmbedResources="$(ProjectDir)SimpleRaaSImages.resources" FileVersion="1.0.0.0" ProductName="Dynamo For Revit 2019" ProductVersion="1.0.0.0" Copyright="Copyright © Autodesk, Inc 2017-2018" OutputAssembly="$(OutputPath)SimpleRaaS.customization.dll" />
59+
<GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)DynamoRaaSImages.resx" OutputResources="$(ProjectDir)DynamoRaaSImages.resources" References="$(FrameworkAssembliesPath)System.Drawing.dll" />
60+
<AL TargetType="library" EmbedResources="$(ProjectDir)DynamoRaaSImages.resources" FileVersion="1.0.0.0" ProductName="Dynamo For Revit 2019" ProductVersion="1.0.0.0" Copyright="Copyright © Autodesk, Inc 2017-2018" OutputAssembly="$(OutputPath)DynamoRaaS.customization.dll" />
5461
</Target>
5562
<Target Name="AfterBuild">
5663
<ItemGroup>
5764
<DeleteFiles Include="$(TargetDir)$(ProjectName).*" />
5865
</ItemGroup>
5966
<Delete Files="@(DeleteFiles)" />
6067
</Target>
61-
</Project>
68+
</Project>

‎src/build.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project
22
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
3-
ToolsVersion="4.0"
3+
ToolsVersion="15.0"
44
DefaultTargets="Build">
55
<PropertyGroup>
6-
<Solution>DynamoRevit.2013.sln</Solution>
6+
<Solution>DynamoRevit.2017.sln</Solution>
77
<Configuration>Release</Configuration>
8-
<DynamoFolderPath>$(MSBuildProjectDirectory)\..\..\Dynamo</DynamoFolderPath>
8+
<DynamoFolderPath>$(MSBuildProjectDirectory)\..\..\Dynamo</DynamoFolderPath>
99
</PropertyGroup>
1010

1111
<Import Project="./Config/user_local.props" />
1212

1313
<ItemGroup>
1414
<ProjectToBuild Include="$(Solution)" >
15-
<Properties>Configuration=$(Configuration);DefineConstants=$(Constants);Platform=Any CPU;VisualStudioVersion=12.0</Properties>
15+
<Properties>Configuration=$(Configuration);DefineConstants=$(Constants);Platform=Any CPU;VisualStudioVersion=15.0</Properties>
1616
</ProjectToBuild>
1717
</ItemGroup>
1818

@@ -24,4 +24,4 @@
2424
<MSBuild Projects="@(ProjectToBuild)" Targets="Rebuild"/>
2525
</Target>
2626

27-
</Project>
27+
</Project>

‎src/transform_all.bat‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,21 @@ dir *.tt /b > t4list.txt
1717
echo the following T4 templates will be transformed:
1818
type t4list.txt
1919

20-
:: clear the environment variable
20+
:: Use texttransform.exe from the IDE if it is present, otherwise, use legacy locations.
21+
22+
:: clear text transform path to undefine it
2123
set TEXTTRANSFORMPATH=
2224

23-
IF EXIST "%COMMONPROGRAMFILES(x86)%\microsoft shared\TextTemplating\11.0\TextTransform.exe" (
24-
set TEXTTRANSFORMPATH="%COMMONPROGRAMFILES(x86)%\microsoft shared\TextTemplating\11.0\TextTransform.exe"
25-
)
26-
IF EXIST "%COMMONPROGRAMFILES(x86)%\microsoft shared\TextTemplating\12.0\TextTransform.exe" (
27-
set TEXTTRANSFORMPATH="%COMMONPROGRAMFILES(x86)%\microsoft shared\TextTemplating\12.0\TextTransform.exe"
28-
)
29-
IF EXIST "%COMMONPROGRAMFILES(x86)%\microsoft shared\TextTemplating\14.0\TextTransform.exe" (
30-
set TEXTTRANSFORMPATH="%COMMONPROGRAMFILES(x86)%\microsoft shared\TextTemplating\14.0\TextTransform.exe"
25+
:: use latest vswhere utility to locate in IDE, where it resides now.
26+
IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
27+
for /f "usebackq tokens=1* delims=: " %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -all`) do (
28+
if /i "%%i" == "installationPath" set TEXTTRANSFORMPATH="%%j\Common7\IDE\TextTransform.exe"
29+
)
3130
)
32-
IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\Common7\IDE\TextTransform.exe" (
33-
set TEXTTRANSFORMPATH="%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\Common7\IDE\TextTransform.exe"
34-
)
35-
IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\TextTransform.exe" (
36-
set TEXTTRANSFORMPATH="%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\TextTransform.exe"
37-
)
38-
IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\IDE\TextTransform.exe" (
39-
set TEXTTRANSFORMPATH="%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\IDE\TextTransform.exe"
31+
32+
:: not found in IDE, use legacy
33+
IF NOT DEFINED TEXTTRANSFORMPATH (
34+
set TEXTTRANSFORMPATH="%COMMONPROGRAMFILES(x86)%\microsoft shared\TextTemplating\%VisualStudioVersion%\TextTransform.exe"
4035
)
4136

4237
:: transform all the templates
@@ -52,4 +47,4 @@ echo %TEXTTRANSFORMPATH% -out !file_name! %%d
5247
del t4list.txt
5348
popd
5449

55-
echo transformation complete
50+
echo transformation complete

0 commit comments

Comments
 (0)