Skip to content

Commit 3fc465c

Browse files
o-babiio-babii
authored
Merge pull request #606 from Autodesk/babio/22_6_2_update
IFC Extension 22.6.2 update
2 parents 25054b2 + 697575e commit 3fc465c

File tree

18 files changed

+64
-31
lines changed

18 files changed

+64
-31
lines changed

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

0 Bytes
Binary file not shown.

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

0 Bytes
Binary file not shown.

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

+17
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,23 @@ <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
238238

239239
<div class="versionset">
240240

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

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ApplicationPackage SchemaVersion="1.0" AutodeskProduct="Revit" ProductType="Application" Name="IFC Exporter for Revit" AppVersion="4.0.0.0"
2+
<ApplicationPackage SchemaVersion="1.0" AutodeskProduct="Revit" ProductType="Application" Name="IFC Exporter for Revit" AppVersion="22.6.2.0"
33
Description="This application seamlessly replaces the built-in IFC export capabilities of Revit 2022. "
44
Author="Autodesk" Icon=".\Contents\Resources\IFCExporter.png" AppNameSpace="appstore.exchange.autodesk.com"
55
OnlineDocumentation="http://www.autodesk.com" HelpFile=".\Contents\Resources\ADSKIFCExporterHelp.htm"
@@ -8,7 +8,7 @@
88
<RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2022" SeriesMax="R2022" />
99
<Components Description="2022">
1010
<RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2022" SeriesMax="R2022" />
11-
<ComponentEntry AppName="IFC For Revit 2022" Version="22.6.1" ModuleName="./Contents/2022/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2022" />
12-
<ComponentEntry AppName="IFC For Revit 2022" Version="22.6.1" ModuleName="./Contents/2022/Revit.IFC.addin" AppDescription="IFC For Revit 2022" />
11+
<ComponentEntry AppName="IFC For Revit 2022" Version="22.6.2" ModuleName="./Contents/2022/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2022" />
12+
<ComponentEntry AppName="IFC For Revit 2022" Version="22.6.2" ModuleName="./Contents/2022/Revit.IFC.addin" AppDescription="IFC For Revit 2022" />
1313
</Components>
1414
</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="42595B8C-B370-4D93-987E-03D8DEBDE506" Name="Revit IFC 2022" Language="1033" Version="22.6.1.0" Manufacturer="Autodesk" UpgradeCode="254F4C8A-9ECA-4690-A718-21ACD3849485">
5+
<Product Id="CA67C17D-7F68-46E2-897A-E2358C3823E9" Name="Revit IFC 2022" Language="1033" Version="22.6.2.0" Manufacturer="Autodesk" UpgradeCode="254F4C8A-9ECA-4690-A718-21ACD3849485">
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 2022.6.1.0</OutputName>
9+
<OutputName>IFC for Revit 2022.6.2.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

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SET PATH=%PATH%;%WixRoot%
1313
candle.exe -dProjectDir=%2 -ext WixUtilExtension %2Product.wxs
1414
light.exe -ext WixUtilExtension -out RevitIFC2022.6.1.msi product.wixobj -ext WixUIExtension
1515

16-
copy RevitIFC2022.6.1.msi %1..\Releasex64
17-
del RevitIFC2022.6.1.msi
16+
copy RevitIFC2022.6.2.msi %1..\Releasex64
17+
del RevitIFC2022.6.2.msi
1818

19-
echo %1..\Releasex64\RevitIFC2022.6.1.msi
19+
echo %1..\Releasex64\RevitIFC2022.6.2.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

+10-2
Original file line numberDiff line numberDiff line change
@@ -666,9 +666,17 @@ public void DeserializeFromJson(IDictionary<string, object> dictionary, JavaScri
666666
continue;
667667

668668
// set direct for all the writeable props
669-
if (propInfo.CanWrite)
669+
if (propInfo.CanWrite && !propInfo.IsDefined(typeof(ScriptIgnoreAttribute)))
670670
{
671-
propInfo.SetValue(this, serializer.ConvertToType(propValue, propInfo.PropertyType));
671+
try
672+
{
673+
propInfo.SetValue(this, serializer.ConvertToType(propValue, propInfo.PropertyType));
674+
}
675+
catch (Exception)
676+
{
677+
// avoid exceptions that may occur during property deserialization to continue loading user configuration,
678+
// the default value should be set
679+
}
672680
continue;
673681
}
674682

‎Source/IFCExporterUIOverride/IFCExportConfigurationsMap.cs

+13-5
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,19 @@ public void AddSavedConfigurations()
300300
{
301301
foreach (DataStorage storedSetup in GetSavedConfigurations(m_jsonSchema))
302302
{
303-
Entity configEntity = storedSetup.GetEntity(m_jsonSchema);
304-
string configData = configEntity.Get<string>(s_configMapField);
305-
JavaScriptSerializer ser = new JavaScriptSerializer();
306-
IFCExportConfiguration configuration = ser.Deserialize<IFCExportConfiguration>(configData);
307-
AddOrReplace(configuration);
303+
try
304+
{
305+
Entity configEntity = storedSetup.GetEntity(m_jsonSchema);
306+
string configData = configEntity.Get<string>(s_configMapField);
307+
JavaScriptSerializer ser = new JavaScriptSerializer();
308+
ser.RegisterConverters(new JavaScriptConverter[] { new IFCExportConfigurationConverter() });
309+
IFCExportConfiguration configuration = ser.Deserialize<IFCExportConfiguration>(configData);
310+
AddOrReplace(configuration);
311+
}
312+
catch (Exception)
313+
{
314+
// don't skip all configurations if an exception occurs for one
315+
}
308316
}
309317
}
310318
}

‎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("22.6.1.0")]
70-
[assembly: AssemblyFileVersion("22.6.1.0")]
69+
[assembly: AssemblyVersion("22.6.2.0")]
70+
[assembly: AssemblyFileVersion("22.6.2.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("22.6.1.0")]
17-
[assembly: AssemblyFileVersion("22.6.1.0")]
16+
[assembly: AssemblyVersion("22.6.2.0")]
17+
[assembly: AssemblyFileVersion("22.6.2.0")]
1818
#endif
1919

2020

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
// The following information is used in the Open Source version as the release version number.
4343
// The number will show up in the Title bar of the export dialog as well as at the IFC header file
4444
// This number must be manually updated prior to releasing the new version
45-
[assembly: AssemblyVersion("22.6.1.0")]
46-
[assembly: AssemblyFileVersion("22.6.1.0")]
45+
[assembly: AssemblyVersion("22.6.2.0")]
46+
[assembly: AssemblyFileVersion("22.6.2.0")]

‎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/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("22.6.1.0")]
18-
[assembly: AssemblyFileVersion("22.6.1.0")]
17+
[assembly: AssemblyVersion("22.6.2.0")]
18+
[assembly: AssemblyFileVersion("22.6.2.0")]
1919

2020
#endif
2121

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
// The following information is used in the Open Source version as the release version number.
4343
// The number will show up in the Title bar of the export dialog as well as at the IFC header file
4444
// This number must be manually updated prior to releasing the new version
45-
[assembly: AssemblyVersion("22.6.1.0")]
46-
[assembly: AssemblyFileVersion("22.6.1.0")]
45+
[assembly: AssemblyVersion("22.6.2.0")]
46+
[assembly: AssemblyFileVersion("22.6.2.0")]
4747

‎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("22.6.1.0")]
16-
[assembly: AssemblyFileVersion("22.6.1.0")]
15+
[assembly: AssemblyVersion("22.6.2.0")]
16+
[assembly: AssemblyFileVersion("22.6.2.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("22.6.1.0")]
55-
[assembly: AssemblyFileVersion("22.6.1.0")]
54+
[assembly: AssemblyVersion("22.6.2.0")]
55+
[assembly: AssemblyFileVersion("22.6.2.0")]

0 commit comments

Comments
 (0)