Updates for release 20.2.0.0

Autodesk · Jul 14, 2020 · 476e306 · 476e306
1 parent 1a5af4e
commit 476e306
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
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="F2D04214-ECD3-4EC3-8631-DC9C7A6FD777" Name="Revit IFC 2020" Language="1033" Version="20.2.0.0" Manufacturer="Autodesk" UpgradeCode="4B4E5B70-E64C-4BC6-A149-2CE79BB899D1">
+   <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">
       <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 2020.1.0.2</OutputName>
+    <OutputName>IFC for Revit 2020 version 20.2.0.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 RevitIFC2020.msi product.wixobj -ext WixUIExtension
+light.exe -ext WixUtilExtension -out RevitIFC20.2.0.0.msi product.wixobj -ext WixUIExtension
 
-copy RevitIFC2020.msi %1..\Releasex64
-del RevitIFC2020.msi
+copy RevitIFC20.2.0.0.msi %1..\Releasex64
+del RevitIFC20.2.0.0.msi
 
-echo %1..\Releasex64\RevitIFC2020.msi
+echo %1..\Releasex64\RevitIFC20.2.0.0.msi
diff --git a/Source/Revit.IFC.Export/Exporter/Exporter.cs b/Source/Revit.IFC.Export/Exporter/Exporter.cs
@@ -2162,8 +2162,13 @@ private void WriteIFCFile(ExporterIFC exporterIFC, Document document)
             // Reuse almost all of the information above to write out extra copies of the IFC file.
             if (exportOptionsCache.ExportingLink)
             {
-               IFCAnyHandle buildingHnd = ExporterCacheManager.BuildingHandle;
-               IFCAnyHandle buildingPlacement = IFCAnyHandleUtil.GetObjectPlacement(buildingHnd);
+               IFCAnyHandle buildingOrSiteHnd = ExporterCacheManager.BuildingHandle;
+               if (IFCAnyHandleUtil.IsNullOrHasNoValue(buildingOrSiteHnd))
+               {
+                  buildingOrSiteHnd = ExporterCacheManager.SiteHandle;
+               }
+
+               IFCAnyHandle buildingOrSitePlacement = IFCAnyHandleUtil.GetObjectPlacement(buildingOrSiteHnd);
 
                int numRevitLinkInstances = exportOptionsCache.GetNumLinkInstanceInfos();
                for (int ii = 1; ii < numRevitLinkInstances; ii++)
@@ -2174,7 +2179,7 @@ private void WriteIFCFile(ExporterIFC exporterIFC, Document document)
                   // Note that we overwrite this here for subsequent writes, which clobbers the
                   // original placement, so the IfcBuilding handle is suspect after this without
                   // explicit cleanup.
-                  GeometryUtil.SetRelativePlacement(buildingPlacement, relativePlacement);
+                  GeometryUtil.SetRelativePlacement(buildingOrSitePlacement, relativePlacement);
 
                   writeOptions.FileName = exportOptionsCache.GetLinkInstanceFileName(ii);
                   file.Write(writeOptions);