Skip to content

Commit 476e306

Browse files
author
Wawan Solihin
committed
Updates for release 20.2.0.0
1 parent 1a5af4e commit 476e306

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

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="F2D04214-ECD3-4EC3-8631-DC9C7A6FD777" Name="Revit IFC 2020" Language="1033" Version="20.2.0.0" Manufacturer="Autodesk" UpgradeCode="4B4E5B70-E64C-4BC6-A149-2CE79BB899D1">
5+
<Product Id="A553F44D-80A7-45A6-BF2D-255CF0D0EC5A" Name="Revit IFC 2020" Language="1033" Version="20.2.0.0" Manufacturer="Autodesk" UpgradeCode="FA32511B-DA6D-405A-B735-33C943730AAB">
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 2020.1.0.2</OutputName>
9+
<OutputName>IFC for Revit 2020 version 20.2.0.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 RevitIFC2020.msi product.wixobj -ext WixUIExtension
14+
light.exe -ext WixUtilExtension -out RevitIFC20.2.0.0.msi product.wixobj -ext WixUIExtension
1515

16-
copy RevitIFC2020.msi %1..\Releasex64
17-
del RevitIFC2020.msi
16+
copy RevitIFC20.2.0.0.msi %1..\Releasex64
17+
del RevitIFC20.2.0.0.msi
1818

19-
echo %1..\Releasex64\RevitIFC2020.msi
19+
echo %1..\Releasex64\RevitIFC20.2.0.0.msi

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

+8-3
Original file line numberDiff line numberDiff line change
@@ -2162,8 +2162,13 @@ private void WriteIFCFile(ExporterIFC exporterIFC, Document document)
21622162
// Reuse almost all of the information above to write out extra copies of the IFC file.
21632163
if (exportOptionsCache.ExportingLink)
21642164
{
2165-
IFCAnyHandle buildingHnd = ExporterCacheManager.BuildingHandle;
2166-
IFCAnyHandle buildingPlacement = IFCAnyHandleUtil.GetObjectPlacement(buildingHnd);
2165+
IFCAnyHandle buildingOrSiteHnd = ExporterCacheManager.BuildingHandle;
2166+
if (IFCAnyHandleUtil.IsNullOrHasNoValue(buildingOrSiteHnd))
2167+
{
2168+
buildingOrSiteHnd = ExporterCacheManager.SiteHandle;
2169+
}
2170+
2171+
IFCAnyHandle buildingOrSitePlacement = IFCAnyHandleUtil.GetObjectPlacement(buildingOrSiteHnd);
21672172

21682173
int numRevitLinkInstances = exportOptionsCache.GetNumLinkInstanceInfos();
21692174
for (int ii = 1; ii < numRevitLinkInstances; ii++)
@@ -2174,7 +2179,7 @@ private void WriteIFCFile(ExporterIFC exporterIFC, Document document)
21742179
// Note that we overwrite this here for subsequent writes, which clobbers the
21752180
// original placement, so the IfcBuilding handle is suspect after this without
21762181
// explicit cleanup.
2177-
GeometryUtil.SetRelativePlacement(buildingPlacement, relativePlacement);
2182+
GeometryUtil.SetRelativePlacement(buildingOrSitePlacement, relativePlacement);
21782183

21792184
writeOptions.FileName = exportOptionsCache.GetLinkInstanceFileName(ii);
21802185
file.Write(writeOptions);

0 commit comments

Comments
 (0)