From 82c10527ae2257f08e8439c182095f27c683c6b8 Mon Sep 17 00:00:00 2001 From: Matteo Cominetti Date: Mon, 7 Aug 2017 18:06:13 +0100 Subject: [PATCH] Created 2018 project configuration and updated installer --- BCFier.sln | 24 +++++++- Bcfier.Revit/Bcfier.Revit.csproj | 61 +++++++++++++++++++- Bcfier.Revit/Entry/CmdMain.cs | 13 +++-- Bcfier.Win/Bcfier.Win.csproj | 18 ++++++ Bcfier.XbimXplorer/Bcfier.XbimXplorer.csproj | 20 +++++++ Bcfier/Bcfier.csproj | 18 ++++++ InnoSetup/BCFier.iss | 10 +++- 7 files changed, 156 insertions(+), 8 deletions(-) diff --git a/BCFier.sln b/BCFier.sln index 35f1fde3..71bfb611 100644 --- a/BCFier.sln +++ b/BCFier.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.4 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bcfier", "Bcfier\Bcfier.csproj", "{503CE2C1-09D7-4F15-BB42-86196EE01ED4}" EndProject @@ -19,10 +19,12 @@ Global Debug-2015|Any CPU = Debug-2015|Any CPU Debug-2016|Any CPU = Debug-2016|Any CPU Debug-2017|Any CPU = Debug-2017|Any CPU + Debug-2018|Any CPU = Debug-2018|Any CPU Release|Any CPU = Release|Any CPU Release-2015|Any CPU = Release-2015|Any CPU Release-2016|Any CPU = Release-2016|Any CPU Release-2017|Any CPU = Release-2017|Any CPU + Release-2018|Any CPU = Release-2018|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -33,6 +35,8 @@ Global {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Debug-2016|Any CPU.Build.0 = Debug|Any CPU {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Debug-2017|Any CPU.ActiveCfg = Debug|Any CPU {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Debug-2017|Any CPU.Build.0 = Debug|Any CPU + {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Debug-2018|Any CPU.ActiveCfg = Debug|Any CPU + {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Debug-2018|Any CPU.Build.0 = Debug|Any CPU {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Release|Any CPU.Build.0 = Release|Any CPU {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Release-2015|Any CPU.ActiveCfg = Release|Any CPU @@ -41,6 +45,8 @@ Global {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Release-2016|Any CPU.Build.0 = Release|Any CPU {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Release-2017|Any CPU.ActiveCfg = Release|Any CPU {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Release-2017|Any CPU.Build.0 = Release|Any CPU + {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Release-2018|Any CPU.ActiveCfg = Release|Any CPU + {503CE2C1-09D7-4F15-BB42-86196EE01ED4}.Release-2018|Any CPU.Build.0 = Release|Any CPU {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Debug-2015|Any CPU.ActiveCfg = Debug-2015|Any CPU {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Debug-2015|Any CPU.Build.0 = Debug-2015|Any CPU @@ -48,6 +54,8 @@ Global {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Debug-2016|Any CPU.Build.0 = Debug-2016|Any CPU {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Debug-2017|Any CPU.ActiveCfg = Debug-2017|Any CPU {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Debug-2017|Any CPU.Build.0 = Debug-2017|Any CPU + {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Debug-2018|Any CPU.ActiveCfg = Debug-2018|Any CPU + {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Debug-2018|Any CPU.Build.0 = Debug-2018|Any CPU {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Release|Any CPU.ActiveCfg = Release|Any CPU {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Release|Any CPU.Build.0 = Release|Any CPU {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Release-2015|Any CPU.ActiveCfg = Release-2015|Any CPU @@ -56,6 +64,8 @@ Global {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Release-2016|Any CPU.Build.0 = Release-2016|Any CPU {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Release-2017|Any CPU.ActiveCfg = Release-2017|Any CPU {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Release-2017|Any CPU.Build.0 = Release-2017|Any CPU + {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Release-2018|Any CPU.ActiveCfg = Release-2018|Any CPU + {2D132990-5674-42DF-93BF-55BA8FDC6A23}.Release-2018|Any CPU.Build.0 = Release-2018|Any CPU {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Debug-2015|Any CPU.ActiveCfg = Debug|Any CPU @@ -64,6 +74,8 @@ Global {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Debug-2016|Any CPU.Build.0 = Debug|Any CPU {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Debug-2017|Any CPU.ActiveCfg = Debug|Any CPU {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Debug-2017|Any CPU.Build.0 = Debug|Any CPU + {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Debug-2018|Any CPU.ActiveCfg = Debug|Any CPU + {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Debug-2018|Any CPU.Build.0 = Debug|Any CPU {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Release|Any CPU.ActiveCfg = Release|Any CPU {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Release|Any CPU.Build.0 = Release|Any CPU {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Release-2015|Any CPU.ActiveCfg = Release|Any CPU @@ -72,6 +84,8 @@ Global {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Release-2016|Any CPU.Build.0 = Release|Any CPU {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Release-2017|Any CPU.ActiveCfg = Release|Any CPU {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Release-2017|Any CPU.Build.0 = Release|Any CPU + {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Release-2018|Any CPU.ActiveCfg = Release|Any CPU + {3C03085B-63AD-4890-AC2C-A4DE31AF1A6B}.Release-2018|Any CPU.Build.0 = Release|Any CPU {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Debug-2015|Any CPU.ActiveCfg = Debug-2015|Any CPU @@ -80,6 +94,7 @@ Global {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Debug-2016|Any CPU.Build.0 = Debug-2016|Any CPU {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Debug-2017|Any CPU.ActiveCfg = Debug-2017|Any CPU {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Debug-2017|Any CPU.Build.0 = Debug-2017|Any CPU + {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Debug-2018|Any CPU.ActiveCfg = Debug-2017|Any CPU {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Release|Any CPU.ActiveCfg = Release|Any CPU {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Release|Any CPU.Build.0 = Release|Any CPU {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Release-2015|Any CPU.ActiveCfg = Release-2015|Any CPU @@ -88,6 +103,7 @@ Global {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Release-2016|Any CPU.Build.0 = Release-2016|Any CPU {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Release-2017|Any CPU.ActiveCfg = Release-2017|Any CPU {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Release-2017|Any CPU.Build.0 = Release-2017|Any CPU + {CAF05B60-6A81-489D-B966-7B94F0D69AC7}.Release-2018|Any CPU.ActiveCfg = Release-2017|Any CPU {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Debug|Any CPU.Build.0 = Debug|Any CPU {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Debug-2015|Any CPU.ActiveCfg = Debug|Any CPU @@ -96,6 +112,8 @@ Global {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Debug-2016|Any CPU.Build.0 = Debug|Any CPU {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Debug-2017|Any CPU.ActiveCfg = Debug|Any CPU {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Debug-2017|Any CPU.Build.0 = Debug|Any CPU + {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Debug-2018|Any CPU.ActiveCfg = Debug|Any CPU + {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Debug-2018|Any CPU.Build.0 = Debug|Any CPU {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Release|Any CPU.ActiveCfg = Release|Any CPU {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Release|Any CPU.Build.0 = Release|Any CPU {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Release-2015|Any CPU.ActiveCfg = Release|Any CPU @@ -104,6 +122,8 @@ Global {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Release-2016|Any CPU.Build.0 = Release|Any CPU {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Release-2017|Any CPU.ActiveCfg = Release|Any CPU {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Release-2017|Any CPU.Build.0 = Release|Any CPU + {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Release-2018|Any CPU.ActiveCfg = Release|Any CPU + {4CD7CA76-A40E-4DF4-831D-36B64818CC69}.Release-2018|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Bcfier.Revit/Bcfier.Revit.csproj b/Bcfier.Revit/Bcfier.Revit.csproj index cd703775..a85c8238 100644 --- a/Bcfier.Revit/Bcfier.Revit.csproj +++ b/Bcfier.Revit/Bcfier.Revit.csproj @@ -141,6 +141,39 @@ false v4.6 + + + + true + bin\Debug-2018\ + TRACE;DEBUG;Version2018 + full + x64 + prompt + MinimumRecommendedRules.ruleset + 2018 + $(AssemblyName) + false + Program + C:\Program Files\Autodesk\Revit 2018\Revit.exe + v4.6 + + + bin\Release-2018\ + TRACE;RELEASE;Version2018 + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + 2018 + $(AssemblyName) + 0 + + None + + false + v4.6 @@ -184,6 +217,19 @@ C:\Program Files\Autodesk\Revit 2017\RevitAPIIFC.dll False + + + + C:\Program Files\Autodesk\Revit 2018\RevitAPI.dll + False + + + C:\Program Files\Autodesk\Revit 2018\RevitAPIUI.dll + False + + + C:\Program Files\Autodesk\Revit 2018\RevitAPIIFC.dll + False @@ -224,6 +270,19 @@ C:\Program Files\Autodesk\Revit 2017\RevitAPIIFC.dll False + + + + C:\Program Files\Autodesk\Revit 2018\RevitAPI.dll + False + + + C:\Program Files\Autodesk\Revit 2018\RevitAPIUI.dll + False + + + C:\Program Files\Autodesk\Revit 2018\RevitAPIIFC.dll + False @@ -316,7 +375,7 @@ - + diff --git a/Bcfier.Revit/Entry/CmdMain.cs b/Bcfier.Revit/Entry/CmdMain.cs index a781b81b..e4c4e3e1 100644 --- a/Bcfier.Revit/Entry/CmdMain.cs +++ b/Bcfier.Revit/Entry/CmdMain.cs @@ -15,18 +15,23 @@ namespace Bcfier.Revit.Entry [Regeneration(RegenerationOption.Manual)] public class CmdMain : IExternalCommand { -#if Version2017 +#if Version2018 - public const string RevitVersion = "2017"; + public const string RevitVersion = "2018"; -#elif Version2015 +#elif Version2017 - public const string RevitVersion = "2015"; + public const string RevitVersion = "2017"; #elif Version2016 public const string RevitVersion = "2016"; +#elif Version2015 + + public const string RevitVersion = "2015"; + + #endif internal static CmdMain ThisCmd = null; diff --git a/Bcfier.Win/Bcfier.Win.csproj b/Bcfier.Win/Bcfier.Win.csproj index 81e09720..14c081f8 100644 --- a/Bcfier.Win/Bcfier.Win.csproj +++ b/Bcfier.Win/Bcfier.Win.csproj @@ -112,6 +112,24 @@ prompt MinimumRecommendedRules.ruleset + + bin\Release-2018\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\Debug-2018\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/Bcfier.XbimXplorer/Bcfier.XbimXplorer.csproj b/Bcfier.XbimXplorer/Bcfier.XbimXplorer.csproj index 8a773e70..0466ef5e 100644 --- a/Bcfier.XbimXplorer/Bcfier.XbimXplorer.csproj +++ b/Bcfier.XbimXplorer/Bcfier.XbimXplorer.csproj @@ -36,6 +36,26 @@ prompt 4 + + bin\Release-2018\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\Debug-2018\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + ..\packages\ManagedEsent.1.9.4\lib\net40\Esent.Interop.dll diff --git a/Bcfier/Bcfier.csproj b/Bcfier/Bcfier.csproj index b0b29b82..dc0d53fe 100644 --- a/Bcfier/Bcfier.csproj +++ b/Bcfier/Bcfier.csproj @@ -100,6 +100,24 @@ prompt MinimumRecommendedRules.ruleset + + bin\Release-2018\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\Debug-2018\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + ..\packages\gong-wpf-dragdrop.1.1.0\lib\net45\GongSolutions.Wpf.DragDrop.dll diff --git a/InnoSetup/BCFier.iss b/InnoSetup/BCFier.iss index eb7f5f77..7cf97d28 100644 --- a/InnoSetup/BCFier.iss +++ b/InnoSetup/BCFier.iss @@ -14,6 +14,8 @@ #define RevitAddin16 RevitAddinFolder+"\2016\" #define RevitFolder17 RevitAddinFolder+"\2017\"+RevitAppName #define RevitAddin17 RevitAddinFolder+"\2017\" +#define RevitFolder18 RevitAddinFolder+"\2018\"+RevitAppName +#define RevitAddin18 RevitAddinFolder+"\2018\" #define WinAppName "Bcfier.Win" @@ -50,6 +52,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ Name: revit15; Description: Addin for Autodesk Revit 2015; Types: full Name: revit16; Description: Addin for Autodesk Revit 2016; Types: full Name: revit17; Description: Addin for Autodesk Revit 2017; Types: full +Name: revit18; Description: Addin for Autodesk Revit 2018; Types: full Name: standalone; Description: BCFier for Windows (standalone viewer); Types: full @@ -77,6 +80,11 @@ Source: "{#Repository}\{#RevitAppName}\bin\Release-2017\{#RevitAppName}.dll"; De Source: "{#Repository}\{#RevitAppName}\bin\Release-2017\{#RevitAppName}.addin"; DestDir: "{#RevitAddin17}"; Flags: ignoreversion; Components: revit17 Source: "{#Repository}\{#RevitAppName}\bin\Release-2017\Bcfier.dll"; DestDir: "{#RevitFolder17}"; Flags: ignoreversion; Components: revit17 +;REVIT 2018 +Source: "{#Repository}\{#RevitAppName}\bin\Release-2018\{#RevitAppName}.dll"; DestDir: "{#RevitFolder18}"; Flags: ignoreversion; Components: revit18 +Source: "{#Repository}\{#RevitAppName}\bin\Release-2018\{#RevitAppName}.addin"; DestDir: "{#RevitAddin18}"; Flags: ignoreversion; Components: revit18 +Source: "{#Repository}\{#RevitAppName}\bin\Release-2018\Bcfier.dll"; DestDir: "{#RevitFolder18}"; Flags: ignoreversion; Components: revit18 + [Icons] @@ -145,7 +153,7 @@ begin result := success and (install = 1) and (serviceCount >= service); end; - +//Revit 2017/18 need 4.6, should update? function InitializeSetup(): Boolean; var ErrCode: integer;