R25 supprot

chuongmep · Apr 2, 2024 · 89e346c · 89e346c
1 parent 7571b51
commit 89e346c
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 256 deletions.
diff --git a/AddInManager.sln b/AddInManager.sln
@@ -25,13 +25,13 @@ Global
 		Debug R23|Any CPU = Debug R23|Any CPU
 		Debug R24|Any CPU = Debug R24|Any CPU
 		Installer|Any CPU = Installer|Any CPU
-		Release R18|Any CPU = Release R18|Any CPU
 		Release R19|Any CPU = Release R19|Any CPU
 		Release R20|Any CPU = Release R20|Any CPU
 		Release R21|Any CPU = Release R21|Any CPU
 		Release R22|Any CPU = Release R22|Any CPU
 		Release R23|Any CPU = Release R23|Any CPU
 		Release R24|Any CPU = Release R24|Any CPU
+		Release R25|Any CPU = Release R25|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Debug R22|Any CPU.ActiveCfg = Debug R22|Any CPU
@@ -41,8 +41,6 @@ Global
 		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Debug R24|Any CPU.ActiveCfg = Debug R24|Any CPU
 		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Debug R24|Any CPU.Build.0 = Debug R24|Any CPU
 		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Installer|Any CPU.ActiveCfg = Release R22|Any CPU
-		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Release R18|Any CPU.ActiveCfg = Release R18|Any CPU
-		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Release R18|Any CPU.Build.0 = Release R18|Any CPU
 		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Release R19|Any CPU.ActiveCfg = Release R19|Any CPU
 		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Release R19|Any CPU.Build.0 = Release R19|Any CPU
 		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Release R20|Any CPU.ActiveCfg = Release R20|Any CPU
@@ -55,41 +53,43 @@ Global
 		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Release R23|Any CPU.Build.0 = Release R23|Any CPU
 		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Release R24|Any CPU.ActiveCfg = Release R24|Any CPU
 		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Release R24|Any CPU.Build.0 = Release R24|Any CPU
+		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Release R25|Any CPU.ActiveCfg = Release R25|Any CPU
+		{C872CDA2-93F5-4681-BD2F-207EACF83D2E}.Release R25|Any CPU.Build.0 = Release R25|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Debug R22|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Debug R23|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Debug R24|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Installer|Any CPU.ActiveCfg = Release|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Installer|Any CPU.Build.0 = Release|Any CPU
-		{E3C87D34-638C-47A0-A73A-D967B119458D}.Release R18|Any CPU.ActiveCfg = Release|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Release R19|Any CPU.ActiveCfg = Release|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Release R20|Any CPU.ActiveCfg = Release|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Release R21|Any CPU.ActiveCfg = Release|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Release R22|Any CPU.ActiveCfg = Release|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Release R23|Any CPU.ActiveCfg = Release|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Release R24|Any CPU.ActiveCfg = Release|Any CPU
+		{E3C87D34-638C-47A0-A73A-D967B119458D}.Release R25|Any CPU.ActiveCfg = Release|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug R22|Any CPU.ActiveCfg = Debug|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug R23|Any CPU.ActiveCfg = Debug|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug R24|Any CPU.ActiveCfg = Debug|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Installer|Any CPU.ActiveCfg = Release|Any CPU
-		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Release R18|Any CPU.ActiveCfg = Release|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Release R19|Any CPU.ActiveCfg = Release|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Release R20|Any CPU.ActiveCfg = Release|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Release R21|Any CPU.ActiveCfg = Release|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Release R22|Any CPU.ActiveCfg = Release|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Release R23|Any CPU.ActiveCfg = Release|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Release R24|Any CPU.ActiveCfg = Release|Any CPU
+		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Release R25|Any CPU.ActiveCfg = Release|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug R22|Any CPU.ActiveCfg = Debug R22|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug R23|Any CPU.ActiveCfg = Debug R23|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug R24|Any CPU.ActiveCfg = Debug R24|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Installer|Any CPU.ActiveCfg = Debug R21|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Installer|Any CPU.Build.0 = Debug R21|Any CPU
-		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Release R18|Any CPU.ActiveCfg = Release R18|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Release R19|Any CPU.ActiveCfg = Release R19|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Release R20|Any CPU.ActiveCfg = Release R20|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Release R21|Any CPU.ActiveCfg = Release R21|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Release R22|Any CPU.ActiveCfg = Release R22|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Release R23|Any CPU.ActiveCfg = Release R23|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Release R24|Any CPU.ActiveCfg = Release R24|Any CPU
+		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Release R25|Any CPU.ActiveCfg = Release R25|Any CPU
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Debug R22|Any CPU.ActiveCfg = Debug R22|Any CPU
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Debug R22|Any CPU.Build.0 = Debug R22|Any CPU
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Installer|Any CPU.ActiveCfg = Debug R22|Any CPU
@@ -98,8 +98,6 @@ Global
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Debug R23|Any CPU.Build.0 = Debug R23|Any CPU
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Debug R24|Any CPU.ActiveCfg = Debug R24|Any CPU
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Debug R24|Any CPU.Build.0 = Debug R24|Any CPU
-		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Release R18|Any CPU.ActiveCfg = Release R18|Any CPU
-		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Release R18|Any CPU.Build.0 = Release R18|Any CPU
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Release R19|Any CPU.ActiveCfg = Release R19|Any CPU
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Release R19|Any CPU.Build.0 = Release R19|Any CPU
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Release R20|Any CPU.ActiveCfg = Release R20|Any CPU
@@ -112,6 +110,8 @@ Global
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Release R23|Any CPU.Build.0 = Release R23|Any CPU
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Release R24|Any CPU.ActiveCfg = Release R24|Any CPU
 		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Release R24|Any CPU.Build.0 = Release R24|Any CPU
+		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Release R25|Any CPU.ActiveCfg = Release R25|Any CPU
+		{21460D85-C4AD-49D5-963F-CF13C4AE99EB}.Release R25|Any CPU.Build.0 = Release R25|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/AddInManager/Command/AddInManagerCommand.cs b/AddInManager/Command/AddInManagerCommand.cs
@@ -11,10 +11,9 @@ public class AddInManagerManual : IExternalCommand
 {
     public Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
     {
-        Debug.Listeners.Clear();
         Trace.Listeners.Clear();
         CodeListener codeListener = new CodeListener();
-        Debug.Listeners.Add(codeListener);
+        Trace.Listeners.Add(codeListener);
         StaticUtil.RegenOption = RegenerationOption.Manual;
         StaticUtil.TransactMode = TransactionMode.Manual;
         Result result = AddinManagerBase.Instance.ExecuteCommand(commandData, ref message, elements, false);

diff --git a/AddInManager/RevitAddinManager.csproj b/AddInManager/RevitAddinManager.csproj
@@ -5,9 +5,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ImplicitUsings>true</ImplicitUsings>
     <UseWindowsForms>false</UseWindowsForms>
-    <TargetFramework>net48</TargetFramework>
     <Configurations>Debug R22;Debug R23;Debug R24</Configurations>
-    <Configurations>$(Configurations);Release R18;Release R19;Release R20;Release R21;Release R22;Release R23;Release R24</Configurations>
+    <Configurations>$(Configurations);Release R25;Release R19;Release R20;Release R21;Release R22;Release R23;Release R24</Configurations>
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.Contains('Debug'))">
     <DebugSymbols>true</DebugSymbols>
@@ -19,33 +18,40 @@
     <DebugType>none</DebugType>
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="$(Configuration.Contains('R18'))">
-    <RevitVersion>2018</RevitVersion>
-    <DefineConstants>$(DefineConstants);R18</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.Contains('R19'))">
     <RevitVersion>2019</RevitVersion>
     <DefineConstants>$(DefineConstants);R19</DefineConstants>
+    <TargetFramework>net48</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.Contains('R20'))">
     <RevitVersion>2020</RevitVersion>
     <DefineConstants>$(DefineConstants);R20</DefineConstants>
+    <TargetFramework>net48</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.Contains('R21'))">
     <RevitVersion>2021</RevitVersion>
     <DefineConstants>$(DefineConstants);R21</DefineConstants>
+    <TargetFramework>net48</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.Contains('R22'))">
     <RevitVersion>2022</RevitVersion>
     <DefineConstants>$(DefineConstants);R22</DefineConstants>
+    <TargetFramework>net48</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.Contains('R23'))">
     <RevitVersion>2023</RevitVersion>
     <DefineConstants>$(DefineConstants);R23</DefineConstants>
+    <TargetFramework>net48</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.Contains('R24'))">
     <RevitVersion>2024</RevitVersion>
     <DefineConstants>$(DefineConstants);R24</DefineConstants>
+    <TargetFramework>net48</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(Configuration.Contains('R25'))">
+    <RevitVersion>2025</RevitVersion>
+    <DefineConstants>$(DefineConstants);R25</DefineConstants>
+    <TargetFramework>net8.0-windows</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <Version>$(RevitVersion)</Version>
@@ -70,6 +76,9 @@
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup Condition="$(Configuration.Contains('R25'))">
+    <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
+  </ItemGroup>
 
   <ItemGroup>
     <Resource Include="Resources\dev.ico" />

diff --git a/AddInManager/View/FrmDockablePanel.xaml.cs b/AddInManager/View/FrmDockablePanel.xaml.cs
@@ -15,7 +15,7 @@ public void SetupDockablePane(DockablePaneProviderData data)
         data.InitialState = new DockablePaneState
         {
             DockPosition = DockPosition.Right,
-#if R14 || R15 || R16 || R17 || R18 || R19
+#if R19
 #else
             MinimumWidth = 250,
             MinimumHeight = 250,

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
-
+- 2024-04-02 **1.5.3**
+  - Support Revit 2025 Release
 - 2023-09-20 **1.5.2**
     - Improvement search bar.
     - Fix Bug Popup resolve load assembly manual with same domain conflict with another add-in.

diff --git a/Installer/Installer.cs b/Installer/Installer.cs
@@ -14,7 +14,7 @@
 const string projectName = "RevitAddinManager";
 const string outputName = "RevitAddinManager";
 const string outputDir = "output";
-const string version = "1.5.2";
+const string version = "1.5.3";
 
 var fileName = new StringBuilder().Append(outputName).Append("-").Append(version);
 var project = new Project

diff --git a/RevitElementBipChecker/Model/ParameterData.cs b/RevitElementBipChecker/Model/ParameterData.cs
@@ -20,9 +20,15 @@ public ParameterData(Parameter parameter,Document doc,bool isinstance=true)
             this.BuiltInParameter = (parameter.Definition as InternalDefinition)?.BuiltInParameter.ToString();
             this.Name = parameter.Definition.Name;
             this.Id = parameter.Id.ToString();
+#if R19 || R20 || R21 || R22  || R23 || R24
             this.ParameterGroup = parameter.Definition.ParameterGroup.ToString();
+             this.GroupName = LabelUtils.GetLabelFor(parameter.Definition.ParameterGroup);
+#else
+            this.ParameterGroup = parameter.Definition.GetGroupTypeId().ToString();
+            this.GroupName = LabelUtils.GetLabelForGroup(parameter.Definition.GetGroupTypeId());
+#endif
             this.ParameterType = parameter.GetParameterType();
-            this.GroupName = LabelUtils.GetLabelFor(parameter.Definition.ParameterGroup);
+
             this.Type = parameter.GetParameterType();
             this.Unit = parameter.GetParameterUnit();
             this.ReadWrite = parameter.IsReadWrite();

diff --git a/RevitElementBipChecker/Model/PraUtils.cs b/RevitElementBipChecker/Model/PraUtils.cs
@@ -71,7 +71,7 @@ public static string RealString(double a)
         /// <returns></returns>
         public static string GetParameterType(this Autodesk.Revit.DB.Parameter parameter)
         {
-#if R18 || R19 || R20 || R21
+#if R19 || R20 || R21 || R22
             ParameterType pt = parameter.Definition.ParameterType; // returns 'Invalid' for 'ElementId'
             string s = ParameterType.Invalid == pt ? "" : "/" + pt;
 #else
@@ -90,7 +90,7 @@ public static string GetParameterUnit(this Autodesk.Revit.DB.Parameter parameter
         {
             try
             {
-#if R18 || R19 || R20
+#if R19 || R20
                 DisplayUnitType unitType = parameter.DisplayUnitType;
                 return LabelUtils.GetLabelFor(unitType);
 

diff --git a/RevitElementBipChecker/Resources.Designer.cs b/RevitElementBipChecker/Resources.Designer.cs