Merge pull request #607 from Autodesk/babio/23_2_5_update

IFC Extension 23.2.5 update
Autodesk · Mar 3, 2023 · 2dff5ea · 2dff5ea
2 parents 1fcf093 + 6e8caea
commit 2dff5ea
Show file tree

Hide file tree

Showing 17 changed files with 68 additions and 34 deletions.
diff --git a/Install/Program Files to Install/Autodesk.SteelConnections.ASIFC.dll b/Install/Program Files to Install/Autodesk.SteelConnections.ASIFC.dll
diff --git a/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm b/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm
@@ -237,7 +237,24 @@ <h3>Support Information</h3>
 <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
 
 <div class="versionset">
-    <div class="version">23.2.4.0</div><div class="versioninfo-bullet">
+    <div class="version">23.2.5.0</div><div class="versioninfo-bullet">
+		<br><p>
+         General:
+			<ul>
+				<li>This is the official release of IFC Extension 23.2.5
+			</ul>	
+       </p>
+	   <br>
+		<p>
+         Improvement:
+			<ul>
+ 			   <li> Improved upgrading of IFC user configuration when upgrading a Revit document to a higher version of Revit.
+			</ul>	
+		</p>
+	</div>
+	<br>
+
+	<div class="version">23.2.4.0</div><div class="versioninfo-bullet">
       <br><p>
          Bugfix:
             <ul>

diff --git a/Install/Program Files to Install/bundle/PackageContents.xml b/Install/Program Files to Install/bundle/PackageContents.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ApplicationPackage SchemaVersion="1.0" AutodeskProduct="Revit" ProductType="Application" Name="IFC Exporter for Revit" AppVersion="23.2.4.0" Description="This application seamlessly replaces the built-in IFC export capabilities of Revit 2023. " Author="Autodesk" Icon=".\Contents\Resources\IFCExporter.png" AppNameSpace="appstore.exchange.autodesk.com" OnlineDocumentation="http://www.autodesk.com" HelpFile=".\Contents\Resources\ADSKIFCExporterHelp.htm" ProductCode="{40527B9C-60B8-407E-BF56-7AAA67F07ACA}" UpgradeCode="{A27E008E-2278-4F84-BB3B-59C605168900}" SupportedLocales="Enu">
+<ApplicationPackage SchemaVersion="1.0" AutodeskProduct="Revit" ProductType="Application" Name="IFC Exporter for Revit" AppVersion="23.2.5.0" Description="This application seamlessly replaces the built-in IFC export capabilities of Revit 2023. " Author="Autodesk" Icon=".\Contents\Resources\IFCExporter.png" AppNameSpace="appstore.exchange.autodesk.com" OnlineDocumentation="http://www.autodesk.com" HelpFile=".\Contents\Resources\ADSKIFCExporterHelp.htm" ProductCode="{40527B9C-60B8-407E-BF56-7AAA67F07ACA}" UpgradeCode="{A27E008E-2278-4F84-BB3B-59C605168900}" SupportedLocales="Enu">
   <CompanyDetails Name="Autodesk, Inc." Phone=" " Url="http://www.autodesk.com" Email="Revit.apps@autodesk.com" />
   <RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2023" SeriesMax="R2023" />
   <Components Description="2023">
     <RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2023" SeriesMax="R2023" />
-    <ComponentEntry AppName="IFC For Revit 2023" Version="23.2.4" ModuleName="./Contents/2023/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2023" />
-    <ComponentEntry AppName="IFC For Revit 2023" Version="23.2.4" ModuleName="./Contents/2023/Revit.IFC.addin" AppDescription="IFC For Revit 2023" />
+    <ComponentEntry AppName="IFC For Revit 2023" Version="23.2.5" ModuleName="./Contents/2023/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2023" />
+    <ComponentEntry AppName="IFC For Revit 2023" Version="23.2.5" ModuleName="./Contents/2023/Revit.IFC.addin" AppDescription="IFC For Revit 2023" />
   </Components>
 </ApplicationPackage>
diff --git a/Install/RevitIFCSetupWix/Product.wxs b/Install/RevitIFCSetupWix/Product.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
-   <Product Id="40C6C8DB-A732-48F4-935C-1947DD171167" Name="Revit IFC 2023" Language="1033" Version="23.2.4.0" Manufacturer="Autodesk" UpgradeCode="1A9C2C21-23B8-42D2-0000-992E73C11B3F">
+   <Product Id="1A9C2C21-2325-42D2-0000-992E73C12300" Name="Revit IFC 2023" Language="1033" Version="23.2.5.0" Manufacturer="Autodesk" UpgradeCode="1A9C2C21-23B8-42D2-0000-992E73C11B3F">
       <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
       <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />

diff --git a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj
@@ -6,7 +6,7 @@
     <ProductVersion>3.8</ProductVersion>
     <ProjectGuid>7dfbd495-c588-4c7b-b8f6-5b793adb06f2</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>IFC for Revit 2023.2.4.0</OutputName>
+    <OutputName>IFC for Revit 2023.2.5.0</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

diff --git a/Install/RevitIFCSetupWix/buildInstaller.bat b/Install/RevitIFCSetupWix/buildInstaller.bat
@@ -11,9 +11,9 @@ rem It is necessary to add the Wix bin directory to the system path temporarily
 SET PATH=%PATH%;%WixRoot%
 
 candle.exe -dProjectDir=%2 -ext WixUtilExtension %2Product.wxs 
-light.exe -ext WixUtilExtension -out RevitIFC2023.2.4.msi product.wixobj -ext WixUIExtension
+light.exe -ext WixUtilExtension -out RevitIFC2023.2.5.msi product.wixobj -ext WixUIExtension
 
-copy RevitIFC2023.2.4.msi %1..\Releasex64
-del RevitIFC2023.2.4.msi
+copy RevitIFC2023.2.5.msi %1..\Releasex64
+del RevitIFC2023.2.5.msi
 
-echo %1..\Releasex64\RevitIFC2023.2.4.msi
+echo %1..\Releasex64\RevitIFC2023.2.5.msi
diff --git a/Source/IFCExporterUIOverride/IFCClassificationUI.xaml.cs b/Source/IFCExporterUIOverride/IFCClassificationUI.xaml.cs
@@ -44,7 +44,7 @@ public partial class IFCClassificationWindow : ChildWindow
       public IFCClassificationWindow(IFCExportConfiguration configuration)
       {
          InitializeComponent();
-         m_newClassification = configuration.ClassificationSettings.IsClassificationEmpty()? m_newClassification : configuration.ClassificationSettings;
+         m_newClassification = configuration.ClassificationSettings;
 
          if (m_newClassification.ClassificationEditionDate <= DateTime.MinValue || m_newClassification.ClassificationEditionDate >= DateTime.MaxValue)
          {

diff --git a/Source/IFCExporterUIOverride/IFCExportConfiguration.cs b/Source/IFCExporterUIOverride/IFCExportConfiguration.cs
@@ -671,9 +671,18 @@ public void DeserializeFromJson(IDictionary<string, object> dictionary, JavaScri
                continue;
 
             // set direct for all the writeable props
-            if (propInfo.CanWrite)
+            if (propInfo.CanWrite && !propInfo.IsDefined(typeof(ScriptIgnoreAttribute)))
             {
-               propInfo.SetValue(this, serializer.ConvertToType(propValue, propInfo.PropertyType));
+               try
+               {
+                  propInfo.SetValue(this, serializer.ConvertToType(propValue, propInfo.PropertyType));
+               }
+               catch (Exception)
+               {
+                  // avoid exceptions that may occur during property deserialization to continue loading user configuration,
+                  // the default value should be set
+               }
+
                continue;
             }
 

diff --git a/Source/IFCExporterUIOverride/IFCExportConfigurationsMap.cs b/Source/IFCExporterUIOverride/IFCExportConfigurationsMap.cs
@@ -304,11 +304,19 @@ public void AddSavedConfigurations()
                {
                   foreach (DataStorage storedSetup in GetSavedConfigurations(m_jsonSchema))
                   {
-                     Entity configEntity = storedSetup.GetEntity(m_jsonSchema);
-                     string configData = configEntity.Get<string>(s_configMapField);
-                     JavaScriptSerializer ser = new JavaScriptSerializer();
-                     IFCExportConfiguration configuration = ser.Deserialize<IFCExportConfiguration>(configData);
-                     AddOrReplace(configuration);
+                     try
+                     {
+                        Entity configEntity = storedSetup.GetEntity(m_jsonSchema);
+                        string configData = configEntity.Get<string>(s_configMapField);
+                        JavaScriptSerializer ser = new JavaScriptSerializer();
+                        ser.RegisterConverters(new JavaScriptConverter[] { new IFCExportConfigurationConverter() });
+                        IFCExportConfiguration configuration = ser.Deserialize<IFCExportConfiguration>(configData);
+                        AddOrReplace(configuration);
+                     }
+                     catch (Exception)
+                     {
+                        // don't skip all configurations if an exception occurs for one
+                     }
                   }
                }
             }

diff --git a/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs b/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs
@@ -66,6 +66,6 @@
 // The following information is used in the Open Source version as the release version number.
 // The number will show up in the Title bar of the export dialog as well as at the IFC header file
 // This number must be manually updated prior to releasing the new version
-[assembly: AssemblyVersion("23.2.4.0")]
-[assembly: AssemblyFileVersion("23.2.4.0")]
+[assembly: AssemblyVersion("23.2.5.0")]
+[assembly: AssemblyFileVersion("23.2.5.0")]
 #endif
diff --git a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs
@@ -13,8 +13,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("23.2.4.0")]
-[assembly: AssemblyFileVersion("23.2.4.0")]
+[assembly: AssemblyVersion("23.2.5.0")]
+[assembly: AssemblyFileVersion("23.2.5.0")]
 #endif
 
 

diff --git a/Source/Revit.IFC.Export/Exporter/PropertySet/ClassificationUtil.cs b/Source/Revit.IFC.Export/Exporter/PropertySet/ClassificationUtil.cs
@@ -97,7 +97,7 @@ public static void CreateUniformatClassification(ExporterIFC exporterIFC, IFCFil
                if (IFCAnyHandleUtil.IsSubTypeOf(elemHnd, constraintEntType))
                {
                   ClassificationReferenceKey key = new ClassificationReferenceKey(GetUniformatURL(),
-                     uniformatCode, uniformatDescription, "", classification);
+                     uniformatCode, uniformatKeyString, uniformatDescription, classification);
                   InsertClassificationReference(file, key, elemHnd);
                }
             }

diff --git a/Source/Revit.IFC.Export/Exporter/ZoneInfo.cs b/Source/Revit.IFC.Export/Exporter/ZoneInfo.cs
@@ -264,7 +264,7 @@ public void ConditionalAddClassification(IFCFile file, string zoneClassification
 
          ClassificationUtil.ParseClassificationCode(zoneClassificationCode, null,
             out string classificationName, out string classificationCode,
-            out string classificationDescription);
+            out string classificationRefName);
          ExporterCacheManager.ClassificationLocationCache.TryGetValue(classificationName,
             out string location);
 
@@ -279,8 +279,8 @@ public void ConditionalAddClassification(IFCFile file, string zoneClassification
             ExporterCacheManager.ClassificationCache.ClassificationHandles.Add(classificationName, classification);
          }
 
-         ClassificationReferenceKey key = new ClassificationReferenceKey(location, 
-            classificationName, classificationCode, classificationDescription, classification);
+         ClassificationReferenceKey key = new ClassificationReferenceKey(location,
+            classificationCode, classificationRefName, null, classification);
          ClassificationReferences[zoneClassificationCode] =
             ExporterCacheManager.ClassificationCache.FindOrCreateClassificationReference(file, key);
       }

diff --git a/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs
@@ -14,8 +14,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("23.2.4.0")]
-[assembly: AssemblyFileVersion("23.2.4.0")]
+[assembly: AssemblyVersion("23.2.5.0")]
+[assembly: AssemblyFileVersion("23.2.5.0")]
 
 #endif
 

diff --git a/Source/Revit.IFC.Import.Core/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Import.Core/Properties/AssemblyInfo.cs
@@ -13,8 +13,8 @@
 [assembly: AssemblyDescription("Revit.IFC.Import.Core")]
 [assembly: AssemblyCompany("Autodesk")]
 [assembly: AssemblyCopyright("@2012-2023 Autodesk, Inc. All rights reserved.")]
-[assembly: AssemblyVersion("23.2.4.0")]
-[assembly: AssemblyFileVersion("23.2.4.0")]
+[assembly: AssemblyVersion("23.2.5.0")]
+[assembly: AssemblyFileVersion("23.2.5.0")]
 
 // Version information can now be found in Source\Foundation\RevitENU\Version.cs
 //
diff --git a/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs
@@ -12,8 +12,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("23.2.4.0")]
-[assembly: AssemblyFileVersion("23.2.4.0")]
+[assembly: AssemblyVersion("23.2.5.0")]
+[assembly: AssemblyFileVersion("23.2.5.0")]
 #endif
 
 #region Using directives

diff --git a/Source/RevitIFCTools/Properties/AssemblyInfo.cs b/Source/RevitIFCTools/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("23.2.4.0")]
-[assembly: AssemblyFileVersion("23.2.4.0")]
+[assembly: AssemblyVersion("23.2.5.0")]
+[assembly: AssemblyFileVersion("23.2.5.0")]