Minor update to 20.2.1 with fix for issue that prevents exporter to work for 2020.0 and 2020.0 due to a new API that was only introduced in 2020.2,

Wawan Solihin · Wawan Solihin · commit 93946a22d95d · 2020-07-28T23:35:18.000+08:00
fix issue of data type mismatch in the parameter expression
diff --git a/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm b/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm
@@ -208,6 +208,23 @@ <h3>Support Information</h3>
 <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
 
 <div class="versionset">
+   <div class="version">20.2.1.0</div><div class="versioninfo-bullet">
+      <br><p>
+         General:
+			<ul>
+            <li>This is a minor update to release 20.2.0 mainly provide a fix due to a new API that is only available in Revit 2020.2 release, but not in 2020.1 and 2020.0
+			</ul>	
+         <br>
+       <p>
+         Bugfix:
+			<ul>
+				<li>Avoid 2020.2 API in the IFC exporter to allow 2020.0 amd 2020.1 to be able to use the exporter
+				<li>Fix issue that mismatches the double value in the parameter expression
+			</ul>
+
+	</div>
+	<br>
+
    <div class="version">20.2.0.0</div><div class="versioninfo-bullet">
 
       <br><p>
diff --git a/Install/Program Files to Install/bundle/PackageContents.xml b/Install/Program Files to Install/bundle/PackageContents.xml
@@ -4,7 +4,7 @@
   <RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2020" SeriesMax="R2020" />
   <Components Description="2020">
     <RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2020" SeriesMax="R2020" />
-    <ComponentEntry AppName="IFC For Revit 2020" Version="20.2.0" ModuleName="./Contents/2020/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2020" />
-    <ComponentEntry AppName="IFC For Revit 2020" Version="20.2.0" ModuleName="./Contents/2020/Revit.IFC.addin" AppDescription="IFC For Revit 2020" />
+    <ComponentEntry AppName="IFC For Revit 2020" Version="20.2.1" ModuleName="./Contents/2020/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2020" />
+    <ComponentEntry AppName="IFC For Revit 2020" Version="20.2.1" ModuleName="./Contents/2020/Revit.IFC.addin" AppDescription="IFC For Revit 2020" />
   </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="A553F44D-80A7-45A6-BF2D-255CF0D0EC5A" Name="Revit IFC 2020" Language="1033" Version="20.2.0.0" Manufacturer="Autodesk" UpgradeCode="C14A1765-2F98-4147-85E0-B0DCDB73A5BF">
+   <Product Id="EA2F8723-7EEC-4B25-A46D-7490CD78FAC9" Name="Revit IFC 2020" Language="1033" Version="20.2.1.0" Manufacturer="Autodesk" UpgradeCode="C14A1765-2F98-4147-85E0-B0DCDB73A5BF">
       <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 version 20.2.0.0</OutputName>
+    <OutputName>IFC for Revit 2020 version 20.2.1.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 RevitIFC20.2.0.0.msi product.wixobj -ext WixUIExtension
+light.exe -ext WixUtilExtension -out RevitIFC20.2.1.0.msi product.wixobj -ext WixUIExtension
 
-copy RevitIFC20.2.0.0.msi %1..\Releasex64
-del RevitIFC20.2.0.0.msi
+copy RevitIFC20.2.1.0.msi %1..\Releasex64
+del RevitIFC20.2.1.0.msi
 
-echo %1..\Releasex64\RevitIFC20.2.0.0.msi
+echo %1..\Releasex64\RevitIFC20.2.1.0.msi
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("20.2.0.0")]
-[assembly: AssemblyFileVersion("20.2.0.0")]
+[assembly: AssemblyVersion("20.2.1.0")]
+[assembly: AssemblyFileVersion("20.2.1.0")]
 #endif
diff --git a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs
@@ -12,8 +12,8 @@
 [assembly: AssemblyCopyright("� 2012-2020 Autodesk, Inc.All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("20.2.0.0")]
-[assembly: AssemblyFileVersion("20.2.0.0")]
+[assembly: AssemblyVersion("20.2.1.0")]
+[assembly: AssemblyFileVersion("20.2.1.0")]
 #endif
 
 
diff --git a/Source/Revit.IFC.Export/Exporter/Exporter.cs b/Source/Revit.IFC.Export/Exporter/Exporter.cs
@@ -2615,7 +2615,8 @@ private void CreateProject(ExporterIFC exporterIFC, Document doc, IFCAnyHandle a
             }
 
             XYZ basePointPosition = null;
-            BasePoint basePoint = BasePoint.GetSurveyPoint(doc);
+            //BasePoint basePoint = BasePoint.GetSurveyPoint(doc);
+            BasePoint basePoint = new FilteredElementCollector(doc).WherePasses(new ElementCategoryFilter(BuiltInCategory.OST_SharedBasePoint)).First() as BasePoint;
             if (basePoint != null)
                basePointPosition = basePoint.Position;
 
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("20.2.0.0")]
-[assembly: AssemblyFileVersion("20.2.0.0")]
+[assembly: AssemblyVersion("20.2.1.0")]
+[assembly: AssemblyFileVersion("20.2.1.0")]
 
 #endif
 
diff --git a/Source/Revit.IFC.Import/Data/IFCImportFile.cs b/Source/Revit.IFC.Import/Data/IFCImportFile.cs
@@ -34,6 +34,7 @@
 using ICSharpCode.SharpZipLib.Core;
 using System.Xml;
 using IFCImportOptions = Revit.IFC.Import.Utility.IFCImportOptions;
+using System.Reflection;
 
 namespace Revit.IFC.Import.Data
 {
@@ -1007,6 +1008,20 @@ static IFCFile CreateIFCFileFromIFCZIP(string path, out IFCSchemaVersion schemaV
          }
       }
 
+      private static string LocateSchemaFile(string schemaFileName)
+      {
+         string filePath = null;
+#if IFC_OPENSOURCE
+         // Find the alternate schema file from the open source install folder
+         filePath = Path.Combine(Path.GetDirectoryName(Assembly.GetCallingAssembly().Location), schemaFileName);
+         if (!File.Exists(filePath))
+#endif
+         {
+            filePath = Path.Combine(DirectoryUtil.RevitProgramPath, "EDM", schemaFileName);
+         }
+         return filePath;
+      }
+
       /// <summary>
       /// Gets IFCFileModelOptions from schema name.
       /// </summary>
@@ -1025,22 +1040,22 @@ static IFCFileModelOptions GetIFCFileModelOptions(string schemaName, out IFCSche
          }
          else if (string.Compare(schemaName, "IFC2X3", true) == 0)
          {
-            modelOptions.SchemaFile = Path.Combine(DirectoryUtil.RevitProgramPath, "EDM\\IFC2X3_TC1.exp");
+            modelOptions.SchemaFile = LocateSchemaFile("IFC2X3_TC1.exp");
             schemaVersion = IFCSchemaVersion.IFC2x3;
          }
          else if (string.Compare(schemaName, "IFC2X_FINAL", true) == 0)
          {
-            modelOptions.SchemaFile = Path.Combine(DirectoryUtil.RevitProgramPath, "EDM\\IFC2X_PROXY.exp");
+            modelOptions.SchemaFile = LocateSchemaFile("IFC2X_PROXY.exp");
             schemaVersion = IFCSchemaVersion.IFC2x;
          }
          else if (string.Compare(schemaName, "IFC2X2_FINAL", true) == 0)
          {
-            modelOptions.SchemaFile = Path.Combine(DirectoryUtil.RevitProgramPath, "EDM\\IFC2X2_ADD1.exp");
+            modelOptions.SchemaFile = LocateSchemaFile("IFC2X2_ADD1.exp");
             schemaVersion = IFCSchemaVersion.IFC2x2;
          }
          else if (string.Compare(schemaName, "IFC4", true) == 0)
          {
-            modelOptions.SchemaFile = Path.Combine(DirectoryUtil.RevitProgramPath, "EDM\\IFC4.exp");
+            modelOptions.SchemaFile = LocateSchemaFile("IFC4.exp");
             schemaVersion = IFCSchemaVersion.IFC4;
          }
          else
diff --git a/Source/Revit.IFC.Import/Data/IFCPropertySet.cs b/Source/Revit.IFC.Import/Data/IFCPropertySet.cs
@@ -154,7 +154,6 @@ static IDictionary<UnitType, ParameterType> UnitToParameterType
                m_UnitToParameterType[UnitType.UT_Mass] = ParameterType.Mass;
                m_UnitToParameterType[UnitType.UT_MassPerUnitArea] = ParameterType.MassPerUnitLength;
                m_UnitToParameterType[UnitType.UT_Moment_of_Inertia] = ParameterType.MomentOfInertia;
-               m_UnitToParameterType[UnitType.UT_Area] = ParameterType.Area;
                m_UnitToParameterType[UnitType.UT_Period] = ParameterType.Period;
                m_UnitToParameterType[UnitType.UT_Pulsation] = ParameterType.Pulsation;
                m_UnitToParameterType[UnitType.UT_Reinforcement_Area] = ParameterType.ReinforcementArea;
diff --git a/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs
@@ -14,8 +14,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("20.2.0.0")]
-[assembly: AssemblyFileVersion("20.2.0.0")]
+[assembly: AssemblyVersion("20.2.1.0")]
+[assembly: AssemblyFileVersion("20.2.1.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("20.2.0.0")]
-[assembly: AssemblyFileVersion("20.2.0.0")]
+[assembly: AssemblyVersion("20.2.1.0")]
+[assembly: AssemblyFileVersion("20.2.1.0")]

Original file line number	Diff line number	Diff line change
`@@ -2615,7 +2615,8 @@ private void CreateProject(ExporterIFC exporterIFC, Document doc, IFCAnyHandle a`
`2615`	`2615`	`}`
`2616`	`2616`
`2617`	`2617`	`XYZ basePointPosition = null;`
`2618`		`- BasePoint basePoint = BasePoint.GetSurveyPoint(doc);`
	`2618`	`+ //BasePoint basePoint = BasePoint.GetSurveyPoint(doc);`
	`2619`	`+ BasePoint basePoint = new FilteredElementCollector(doc).WherePasses(new ElementCategoryFilter(BuiltInCategory.OST_SharedBasePoint)).First() as BasePoint;`
`2619`	`2620`	`if (basePoint != null)`
`2620`	`2621`	`basePointPosition = basePoint.Position;`
`2621`	`2622`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`using ICSharpCode.SharpZipLib.Core;`
`35`	`35`	`using System.Xml;`
`36`	`36`	`using IFCImportOptions = Revit.IFC.Import.Utility.IFCImportOptions;`
	`37`	`+using System.Reflection;`
`37`	`38`
`38`	`39`	`namespace Revit.IFC.Import.Data`
`39`	`40`	`{`
`@@ -1007,6 +1008,20 @@ static IFCFile CreateIFCFileFromIFCZIP(string path, out IFCSchemaVersion schemaV`
`1007`	`1008`	`}`
`1008`	`1009`	`}`
`1009`	`1010`
	`1011`	`+ private static string LocateSchemaFile(string schemaFileName)`
	`1012`	`+ {`
	`1013`	`+ string filePath = null;`
	`1014`	`+#if IFC_OPENSOURCE`
	`1015`	`+ // Find the alternate schema file from the open source install folder`
	`1016`	`+ filePath = Path.Combine(Path.GetDirectoryName(Assembly.GetCallingAssembly().Location), schemaFileName);`
	`1017`	`+ if (!File.Exists(filePath))`
	`1018`	`+#endif`
	`1019`	`+ {`
	`1020`	`+ filePath = Path.Combine(DirectoryUtil.RevitProgramPath, "EDM", schemaFileName);`
	`1021`	`+ }`
	`1022`	`+ return filePath;`
	`1023`	`+ }`
	`1024`	`+`
`1010`	`1025`	`/// <summary>`
`1011`	`1026`	`/// Gets IFCFileModelOptions from schema name.`
`1012`	`1027`	`/// </summary>`
`@@ -1025,22 +1040,22 @@ static IFCFileModelOptions GetIFCFileModelOptions(string schemaName, out IFCSche`
`1025`	`1040`	`}`
`1026`	`1041`	`else if (string.Compare(schemaName, "IFC2X3", true) == 0)`
`1027`	`1042`	`{`
`1028`		`- modelOptions.SchemaFile = Path.Combine(DirectoryUtil.RevitProgramPath, "EDM\\IFC2X3_TC1.exp");`
	`1043`	`+ modelOptions.SchemaFile = LocateSchemaFile("IFC2X3_TC1.exp");`
`1029`	`1044`	`schemaVersion = IFCSchemaVersion.IFC2x3;`
`1030`	`1045`	`}`
`1031`	`1046`	`else if (string.Compare(schemaName, "IFC2X_FINAL", true) == 0)`
`1032`	`1047`	`{`
`1033`		`- modelOptions.SchemaFile = Path.Combine(DirectoryUtil.RevitProgramPath, "EDM\\IFC2X_PROXY.exp");`
	`1048`	`+ modelOptions.SchemaFile = LocateSchemaFile("IFC2X_PROXY.exp");`
`1034`	`1049`	`schemaVersion = IFCSchemaVersion.IFC2x;`
`1035`	`1050`	`}`
`1036`	`1051`	`else if (string.Compare(schemaName, "IFC2X2_FINAL", true) == 0)`
`1037`	`1052`	`{`
`1038`		`- modelOptions.SchemaFile = Path.Combine(DirectoryUtil.RevitProgramPath, "EDM\\IFC2X2_ADD1.exp");`
	`1053`	`+ modelOptions.SchemaFile = LocateSchemaFile("IFC2X2_ADD1.exp");`
`1039`	`1054`	`schemaVersion = IFCSchemaVersion.IFC2x2;`
`1040`	`1055`	`}`
`1041`	`1056`	`else if (string.Compare(schemaName, "IFC4", true) == 0)`
`1042`	`1057`	`{`
`1043`		`- modelOptions.SchemaFile = Path.Combine(DirectoryUtil.RevitProgramPath, "EDM\\IFC4.exp");`
	`1058`	`+ modelOptions.SchemaFile = LocateSchemaFile("IFC4.exp");`
`1044`	`1059`	`schemaVersion = IFCSchemaVersion.IFC4;`
`1045`	`1060`	`}`
`1046`	`1061`	`else`