Skip to content

Commit 2dff5ea

Browse files
o-babiio-babii
authored
Merge pull request #607 from Autodesk/babio/23_2_5_update
IFC Extension 23.2.5 update
2 parents 1fcf093 + 6e8caea commit 2dff5ea

File tree

17 files changed

+68
-34
lines changed

17 files changed

+68
-34
lines changed

‎Install/Program Files to Install/Autodesk.SteelConnections.ASIFC.dll

0 Bytes
Binary file not shown.

‎Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm

+18-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,24 @@ <h3>Support Information</h3>
237237
<h2 id="VersionHistory" name="VersionHistory">Version History</h2>
238238

239239
<div class="versionset">
240-
<div class="version">23.2.4.0</div><div class="versioninfo-bullet">
240+
<div class="version">23.2.5.0</div><div class="versioninfo-bullet">
241+
<br><p>
242+
General:
243+
<ul>
244+
<li>This is the official release of IFC Extension 23.2.5
245+
</ul>
246+
</p>
247+
<br>
248+
<p>
249+
Improvement:
250+
<ul>
251+
<li> Improved upgrading of IFC user configuration when upgrading a Revit document to a higher version of Revit.
252+
</ul>
253+
</p>
254+
</div>
255+
<br>
256+
257+
<div class="version">23.2.4.0</div><div class="versioninfo-bullet">
241258
<br><p>
242259
Bugfix:
243260
<ul>

‎Install/Program Files to Install/bundle/PackageContents.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<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">
2+
<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">
33
<CompanyDetails Name="Autodesk, Inc." Phone=" " Url="http://www.autodesk.com" Email="[email protected]" />
44
<RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2023" SeriesMax="R2023" />
55
<Components Description="2023">
66
<RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2023" SeriesMax="R2023" />
7-
<ComponentEntry AppName="IFC For Revit 2023" Version="23.2.4" ModuleName="./Contents/2023/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2023" />
8-
<ComponentEntry AppName="IFC For Revit 2023" Version="23.2.4" ModuleName="./Contents/2023/Revit.IFC.addin" AppDescription="IFC For Revit 2023" />
7+
<ComponentEntry AppName="IFC For Revit 2023" Version="23.2.5" ModuleName="./Contents/2023/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2023" />
8+
<ComponentEntry AppName="IFC For Revit 2023" Version="23.2.5" ModuleName="./Contents/2023/Revit.IFC.addin" AppDescription="IFC For Revit 2023" />
99
</Components>
1010
</ApplicationPackage>

‎Install/RevitIFCSetupWix/Product.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
33
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
44

5-
<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">
5+
<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">
66
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
77

88
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />

‎Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ProductVersion>3.8</ProductVersion>
77
<ProjectGuid>7dfbd495-c588-4c7b-b8f6-5b793adb06f2</ProjectGuid>
88
<SchemaVersion>2.0</SchemaVersion>
9-
<OutputName>IFC for Revit 2023.2.4.0</OutputName>
9+
<OutputName>IFC for Revit 2023.2.5.0</OutputName>
1010
<OutputType>Package</OutputType>
1111
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
1212
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

‎Install/RevitIFCSetupWix/buildInstaller.bat

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ rem It is necessary to add the Wix bin directory to the system path temporarily
1111
SET PATH=%PATH%;%WixRoot%
1212

1313
candle.exe -dProjectDir=%2 -ext WixUtilExtension %2Product.wxs
14-
light.exe -ext WixUtilExtension -out RevitIFC2023.2.4.msi product.wixobj -ext WixUIExtension
14+
light.exe -ext WixUtilExtension -out RevitIFC2023.2.5.msi product.wixobj -ext WixUIExtension
1515

16-
copy RevitIFC2023.2.4.msi %1..\Releasex64
17-
del RevitIFC2023.2.4.msi
16+
copy RevitIFC2023.2.5.msi %1..\Releasex64
17+
del RevitIFC2023.2.5.msi
1818

19-
echo %1..\Releasex64\RevitIFC2023.2.4.msi
19+
echo %1..\Releasex64\RevitIFC2023.2.5.msi

‎Source/IFCExporterUIOverride/IFCClassificationUI.xaml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public partial class IFCClassificationWindow : ChildWindow
4444
public IFCClassificationWindow(IFCExportConfiguration configuration)
4545
{
4646
InitializeComponent();
47-
m_newClassification = configuration.ClassificationSettings.IsClassificationEmpty()? m_newClassification : configuration.ClassificationSettings;
47+
m_newClassification = configuration.ClassificationSettings;
4848

4949
if (m_newClassification.ClassificationEditionDate <= DateTime.MinValue || m_newClassification.ClassificationEditionDate >= DateTime.MaxValue)
5050
{

‎Source/IFCExporterUIOverride/IFCExportConfiguration.cs

+11-2
Original file line numberDiff line numberDiff line change
@@ -671,9 +671,18 @@ public void DeserializeFromJson(IDictionary<string, object> dictionary, JavaScri
671671
continue;
672672

673673
// set direct for all the writeable props
674-
if (propInfo.CanWrite)
674+
if (propInfo.CanWrite && !propInfo.IsDefined(typeof(ScriptIgnoreAttribute)))
675675
{
676-
propInfo.SetValue(this, serializer.ConvertToType(propValue, propInfo.PropertyType));
676+
try
677+
{
678+
propInfo.SetValue(this, serializer.ConvertToType(propValue, propInfo.PropertyType));
679+
}
680+
catch (Exception)
681+
{
682+
// avoid exceptions that may occur during property deserialization to continue loading user configuration,
683+
// the default value should be set
684+
}
685+
677686
continue;
678687
}
679688

‎Source/IFCExporterUIOverride/IFCExportConfigurationsMap.cs

+13-5
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,19 @@ public void AddSavedConfigurations()
304304
{
305305
foreach (DataStorage storedSetup in GetSavedConfigurations(m_jsonSchema))
306306
{
307-
Entity configEntity = storedSetup.GetEntity(m_jsonSchema);
308-
string configData = configEntity.Get<string>(s_configMapField);
309-
JavaScriptSerializer ser = new JavaScriptSerializer();
310-
IFCExportConfiguration configuration = ser.Deserialize<IFCExportConfiguration>(configData);
311-
AddOrReplace(configuration);
307+
try
308+
{
309+
Entity configEntity = storedSetup.GetEntity(m_jsonSchema);
310+
string configData = configEntity.Get<string>(s_configMapField);
311+
JavaScriptSerializer ser = new JavaScriptSerializer();
312+
ser.RegisterConverters(new JavaScriptConverter[] { new IFCExportConfigurationConverter() });
313+
IFCExportConfiguration configuration = ser.Deserialize<IFCExportConfiguration>(configData);
314+
AddOrReplace(configuration);
315+
}
316+
catch (Exception)
317+
{
318+
// don't skip all configurations if an exception occurs for one
319+
}
312320
}
313321
}
314322
}

‎Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@
6666
// The following information is used in the Open Source version as the release version number.
6767
// The number will show up in the Title bar of the export dialog as well as at the IFC header file
6868
// This number must be manually updated prior to releasing the new version
69-
[assembly: AssemblyVersion("23.2.4.0")]
70-
[assembly: AssemblyFileVersion("23.2.4.0")]
69+
[assembly: AssemblyVersion("23.2.5.0")]
70+
[assembly: AssemblyFileVersion("23.2.5.0")]
7171
#endif

‎Source/Revit.IFC.Common/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515

16-
[assembly: AssemblyVersion("23.2.4.0")]
17-
[assembly: AssemblyFileVersion("23.2.4.0")]
16+
[assembly: AssemblyVersion("23.2.5.0")]
17+
[assembly: AssemblyFileVersion("23.2.5.0")]
1818
#endif
1919

2020

‎Source/Revit.IFC.Export/Exporter/PropertySet/ClassificationUtil.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public static void CreateUniformatClassification(ExporterIFC exporterIFC, IFCFil
9797
if (IFCAnyHandleUtil.IsSubTypeOf(elemHnd, constraintEntType))
9898
{
9999
ClassificationReferenceKey key = new ClassificationReferenceKey(GetUniformatURL(),
100-
uniformatCode, uniformatDescription, "", classification);
100+
uniformatCode, uniformatKeyString, uniformatDescription, classification);
101101
InsertClassificationReference(file, key, elemHnd);
102102
}
103103
}

‎Source/Revit.IFC.Export/Exporter/ZoneInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public void ConditionalAddClassification(IFCFile file, string zoneClassification
264264

265265
ClassificationUtil.ParseClassificationCode(zoneClassificationCode, null,
266266
out string classificationName, out string classificationCode,
267-
out string classificationDescription);
267+
out string classificationRefName);
268268
ExporterCacheManager.ClassificationLocationCache.TryGetValue(classificationName,
269269
out string location);
270270

@@ -279,8 +279,8 @@ public void ConditionalAddClassification(IFCFile file, string zoneClassification
279279
ExporterCacheManager.ClassificationCache.ClassificationHandles.Add(classificationName, classification);
280280
}
281281

282-
ClassificationReferenceKey key = new ClassificationReferenceKey(location,
283-
classificationName, classificationCode, classificationDescription, classification);
282+
ClassificationReferenceKey key = new ClassificationReferenceKey(location,
283+
classificationCode, classificationRefName, null, classification);
284284
ClassificationReferences[zoneClassificationCode] =
285285
ExporterCacheManager.ClassificationCache.FindOrCreateClassificationReference(file, key);
286286
}

‎Source/Revit.IFC.Export/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

17-
[assembly: AssemblyVersion("23.2.4.0")]
18-
[assembly: AssemblyFileVersion("23.2.4.0")]
17+
[assembly: AssemblyVersion("23.2.5.0")]
18+
[assembly: AssemblyFileVersion("23.2.5.0")]
1919

2020
#endif
2121

‎Source/Revit.IFC.Import.Core/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
[assembly: AssemblyDescription("Revit.IFC.Import.Core")]
1414
[assembly: AssemblyCompany("Autodesk")]
1515
[assembly: AssemblyCopyright("@2012-2023 Autodesk, Inc. All rights reserved.")]
16-
[assembly: AssemblyVersion("23.2.4.0")]
17-
[assembly: AssemblyFileVersion("23.2.4.0")]
16+
[assembly: AssemblyVersion("23.2.5.0")]
17+
[assembly: AssemblyFileVersion("23.2.5.0")]
1818

1919
// Version information can now be found in Source\Foundation\RevitENU\Version.cs
2020
//

‎Source/Revit.IFC.Import/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
[assembly: AssemblyTrademark("")]
1313
[assembly: AssemblyCulture("")]
1414

15-
[assembly: AssemblyVersion("23.2.4.0")]
16-
[assembly: AssemblyFileVersion("23.2.4.0")]
15+
[assembly: AssemblyVersion("23.2.5.0")]
16+
[assembly: AssemblyFileVersion("23.2.5.0")]
1717
#endif
1818

1919
#region Using directives

‎Source/RevitIFCTools/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("23.2.4.0")]
55-
[assembly: AssemblyFileVersion("23.2.4.0")]
54+
[assembly: AssemblyVersion("23.2.5.0")]
55+
[assembly: AssemblyFileVersion("23.2.5.0")]

0 commit comments

Comments
 (0)