Changes for Revit 2020 edition. This version is identical to 19.2.1.0…

… RC (from master)
Autodesk · Jul 25, 2019 · cf2dbf9 · cf2dbf9
1 parent a82c665
commit cf2dbf9
Show file tree

Hide file tree

Showing 27 changed files with 28,287 additions and 138 deletions.
diff --git a/Install/Program Files to Install/IFC2X2_ADD1.exp b/Install/Program Files to Install/IFC2X2_ADD1.exp
diff --git a/Install/Program Files to Install/IFC2X3_TC1.exp b/Install/Program Files to Install/IFC2X3_TC1.exp
diff --git a/Install/Program Files to Install/IFC4.exp b/Install/Program Files to Install/IFC4.exp
diff --git a/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm b/Install/Program Files to Install/bundle/Contents/Resources/ADSKIFCExporterHelp.htm
@@ -51,9 +51,9 @@
 <body>
 <div id="heading">
 	<div id="plugin-icon"><img width=85 height=85 id="Rectangle 3" src="IFCExporter.png"></div>
-	<div id="plugin-name"><h1 class="separator-line">Revit IFC 2019</h1></div>
+	<div id="plugin-name"><h1 class="separator-line">Revit IFC 2020</h1></div>
 	<p id="plugin-description">
-	This application seamlessly replaces the built-in IFC capabilities of Revit 2019.  It contains enhancements to functionality and defect fixes provided by Autodesk and Open Source contributors that did not appear in the initial shipping version.
+	This application seamlessly replaces the built-in IFC capabilities of Revit 2020.  It contains enhancements to functionality and defect fixes provided by Autodesk and Open Source contributors that did not appear in the initial shipping version.
     </p>
 </div>
 
@@ -65,7 +65,7 @@ <h2 id="GettingStarted" name="GettingStarted">Getting Started</h2>
 	<div class="command name">Revit IFC</div>
 	<div class="command description">
     <p> 
-    Revit IFC 2019 contains up-to-date improvements on the default IFC capabilities of Revit contributed by Autodesk and our Open 
+    Revit IFC 2020 contains up-to-date improvements on the default IFC capabilities of Revit contributed by Autodesk and our Open 
     Source contributors.  While this app is not necessary for IFC support, it is recommended that users that depend on the quality of their IFC 
     download this app and keep it up-to-date, as new enhancements and defect fixes are added,  For more information on IFC, 
     please visit the <a href="http://buildingsmart.com/standards/ifc" target=_blank>buildingSMART website</a> or the Revit wiki.
@@ -180,7 +180,7 @@ <h2 id="AdditionalInfo" name="AdditionalInfo">Additional Information</h2>
 The source code for this application is available on open source, at the SourceForge project :
 <a href="http://sourceforge.net/p/ifcexporter/home/Home/" target=_blank>http://sourceforge.net/p/ifcexporter/home/Home/</a></p>
 <h3>Known Issues</h3>
-<p>The alternate export UI is currently provided only in English and French.  The help is currently provided only in English.</p>
+<p>The alternate export UI is currently provided in English, French, and German.  The help is currently provided only in English.</p>
 <p>The third party toolkit we use to write out IFC files has a limit on the maximum size of IFC file it can create.  
 While there is no absolute metric for this, in practice it is about 1.5 GB.  The toolkit provider is aware of these issues and is 
 working on expanding and eventually removing this limit, and we will be tracking their progress on this issue.</p>
@@ -204,6 +204,17 @@ <h2 id="VersionHistory" name="VersionHistory">Version History</h2>
 
 <div class="versionset">
 
+   <div class="version">20.0.0.0</div><div class="versioninfo-bullet">
+      <p>
+         General:
+         <ul>
+            <li>This is the first version of IFC Export utility for Revit 2020.
+				<li>The functionality in this version is identical to the 19.2.0.1 version
+         </ul>
+	</div>
+
+	<br>
+
    <div class="version">19.2.0.1</div><div class="versioninfo-bullet">
       <p>
          Import Bug Fixes:

diff --git a/Install/Program Files to Install/bundle/PackageContents.xml b/Install/Program Files to Install/bundle/PackageContents.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ApplicationPackage SchemaVersion="1.0" AutodeskProduct="Revit" ProductType="Application" Name="IFC Exporter for Revit" AppVersion="4.0.0.0" Description="This application seamlessly replaces the built-in IFC export capabilities of Revit 2015. " Author="Autodesk" Icon=".\Contents\Resources\IFCExporter.png" AppNameSpace="appstore.exchange.autodesk.com" OnlineDocumentation="http://www.autodesk.com" HelpFile=".\Contents\Resources\ADSKIFCExporterHelp.htm" ProductCode="{254DE637-077E-4181-9404-973E2884A926}" UpgradeCode="{1EAE3C38-F8B4-4FA4-91DB-51A9D7A2B42B}" SupportedLocales="Enu">
   <CompanyDetails Name="Autodesk, Inc." Phone=" " Url="http://www.autodesk.com" Email="[email protected]" />
-  <RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2019" SeriesMax="R2019" />
-  <Components Description="2019">
-    <RuntimeRequirements OS="Win64" Platform="Revit" SeriesMin="R2019" SeriesMax="R2019" />
-    <ComponentEntry AppName="IFC For Revit 2019" Version="19.2.0" ModuleName="./Contents/2019/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2019" />
-    <ComponentEntry AppName="IFC For Revit 2019" Version="19.2.0" ModuleName="./Contents/2019/Revit.IFC.addin" AppDescription="IFC For Revit 2019" />
+  <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.0.0" ModuleName="./Contents/2020/IFCExporterUIOverride.addin" AppDescription="IFC For Revit 2020" />
+    <ComponentEntry AppName="IFC For Revit 2020" Version="20.0.0" 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="3A997559-7A56-4E1E-BCF3-66AE63E8CBC9" Name="Revit IFC 2019" Language="1033" Version="19.2.1.0" Manufacturer="Autodesk" UpgradeCode="8C1C3E16-78F4-4908-8155-E60EB0F5362B">
+   <Product Id="F2D04214-ECD3-4EC3-8631-DC9C7A6FD777" Name="Revit IFC 2020" Language="1033" Version="20.0.0.0" Manufacturer="Autodesk" UpgradeCode="41B38A6B-4420-4030-B635-E5F10B77EEF5">
       <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
       <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
@@ -19,7 +19,7 @@
       <WixVariable Id="WixUIDefUserDefTxt" Value="$(var.ProjectDir)..\Program Files to Install\DefaultUserDefinedParameterSets.txt"></WixVariable>
       <WixVariable Id="WixUICOBieUserDefTxt" Value="$(var.ProjectDir)..\Program Files to Install\IFC2x3 Extended FM HandOver View.txt"></WixVariable>
 
-      <Feature Id="ProductFeature" Title="Revit IFC 2019" Level="1" ConfigurableDirectory='INSTALLDIR'>
+      <Feature Id="ProductFeature" Title="Revit IFC 2020" Level="1" ConfigurableDirectory='INSTALLDIR'>
          <ComponentGroupRef Id="ProductComponents" />
          <ComponentGroupRef Id="ProductResourceComponents" />
          <ComponentGroupRef Id="ProductFRFiles" />
@@ -44,7 +44,7 @@
       <Fragment>
          <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="ProgramFilesFolder">
-               <Directory Id="INSTALLDIR" Name="Revit IFC 2019">
+               <Directory Id="INSTALLDIR" Name="Revit IFC 2020">
                   <Directory Id="INSTALLRESOURCE" Name="Resource" />
                   <Directory Id="INSTALLFRUI" Name="fr" />
                   <Directory Id="INSTALLDEUI" Name="de" />
@@ -55,12 +55,12 @@
                <Directory Id="DIR_ADSK" Name="Autodesk">
                   <Directory Id="DIR_REVIT" Name="Revit">
                      <Directory Id="DIR_ADDINS" Name="Addins">
-                        <Directory Id="DIR_Addins" Name="2019"/>
+                        <Directory Id="DIR_Addins" Name="2020"/>
                      </Directory>
                   </Directory>
                   <Directory Id="DIR_REVIT_LT" Name="RevitLT">
                      <Directory Id="DIR_ADDINS_LT" Name="Addins">
-                        <Directory Id="DIR_Addins_LT" Name="2019"/>
+                        <Directory Id="DIR_Addins_LT" Name="2020"/>
                      </Directory>
                   </Directory>
                </Directory>
@@ -73,9 +73,9 @@
             <Directory Id="CommonAppDataFolder" Name="MyAppDataFolder">
                <Directory Id="DIR_ADSK" Name="Autodesk">
                   <Directory Id="DIR_PLUGINS" Name="ApplicationPlugins">
-                     <Directory Id="DIR_PACKAGE" Name="IFC 2019.bundle">
+                     <Directory Id="DIR_PACKAGE" Name="IFC 2020.bundle">
                         <Directory Id="DIR_Contents" Name="Contents">
-                          <Directory Id="INSTALLDIR" Name="2019">
+                          <Directory Id="INSTALLDIR" Name="2020">
                             <Directory Id="INSTALLRESOURCE" Name="Resource" />
                             <Directory Id="INSTALLFRUI" Name="fr" />
                             <Directory Id="INSTALLDEUI" Name="de" />

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>Revit IFC for Revit 2019.2.1</OutputName>
+    <OutputName>Revit IFC for Revit 2020.0.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>
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>$(SolutionDir)$(Configuration)$(PlatformName)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>_OfficialBuild=true; _ForNavisworks2019=true</DefineConstants>
+    <DefineConstants>OfficialBuild=true; _ForNavisworks2019=true</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />

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 RevitIFC2019.msi product.wixobj -ext WixUIExtension
+light.exe -ext WixUtilExtension -out RevitIFC2020.msi product.wixobj -ext WixUIExtension
 
-copy RevitIFC2019.msi %1..\Releasex64
-del RevitIFC2019.msi
+copy RevitIFC2020.msi %1..\Releasex64
+del RevitIFC2020.msi
 
-echo %1..\Releasex64\RevitIFC2019.msi
+echo %1..\Releasex64\RevitIFC2020.msi
diff --git a/Source/IFCExporterUIOverride/IFCAddressInformationUI.xaml b/Source/IFCExporterUIOverride/IFCAddressInformationUI.xaml
@@ -1,9 +1,21 @@
-<ui:ChildWindow  x:Class="BIM.IFC.Export.UI.IFCAddressInformation"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:p="clr-namespace:BIM.IFC.Export.UI.Properties"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:ui="clr-namespace:Autodesk.Revit.WPFFramework;assembly=UserInterfaceUtility"         
-        Title="{x:Static p:Resources.AddressInformation}" ResizeMode ="NoResize" Name="AddressTab" Closing="Window_Closing" mc:Ignorable="d" Initialized="AddressTab_Initialized" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignWidth="560" SizeToContent="WidthAndHeight" HorizontalAlignment="Stretch" Margin="10,5,5,1" Height="571.839" >
+<auiw:ChildWindow  x:Class="BIM.IFC.Export.UI.IFCAddressInformation"
+                   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                   xmlns:p="clr-namespace:BIM.IFC.Export.UI.Properties"
+                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                   xmlns:auiw="clr-namespace:Autodesk.UI.Windows;assembly=Autodesk.UI.Windows"
+                   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+                   Title="{x:Static p:Resources.AddressInformation}" 
+                   ResizeMode ="NoResize" 
+                   Name="AddressTab" 
+                   Closing="Window_Closing" 
+                   mc:Ignorable="d" 
+                   Initialized="AddressTab_Initialized" 
+                   d:DesignWidth="560" 
+                   SizeToContent="WidthAndHeight" 
+                   HorizontalAlignment="Stretch" 
+                   Margin="10,5,5,1" 
+                   Height="571.839" >
    <Grid Margin="0,0,1,0" HorizontalAlignment="Right" Width="551" Height="540" VerticalAlignment="Top">
       <Grid.RowDefinitions>
          <RowDefinition Height="499*"/>
@@ -41,4 +53,4 @@
       <CheckBox Content="{x:Static p:Resources.AssignAddressToBuilding}" Height="16" x:Name="Checkbox_AssignToBuilding" Margin="0,427,10,0" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Width="175" IsChecked="True" Checked="Checkbox_AssignToBuilding_Checked" Unchecked="Checkbox_AssignToBuilding_Unchecked"/>
       <CheckBox Content="{x:Static p:Resources.AssignAddressToSite}" Height="16" x:Name="Checkbox_AssignToSite" Margin="0,448,10,0" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Width="175" Checked="Checkbox_AssignToSite_Checked" Unchecked="Checkbox_AssignToSite_Unchecked"/>
    </Grid>
-</ui:ChildWindow>
+</auiw:ChildWindow>
diff --git a/Source/IFCExporterUIOverride/IFCAddressInformationUI.xaml.cs b/Source/IFCExporterUIOverride/IFCAddressInformationUI.xaml.cs
@@ -17,23 +17,11 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using System.Runtime.InteropServices;
-using System.Windows.Interop;
-using Autodesk.Revit.WPFFramework;
 using Autodesk.Revit.DB;
-using Autodesk.Revit.UI;
-using Autodesk.Revit.UI.Events;
+using Autodesk.UI.Windows;
 
 using Revit.IFC.Common.Extensions;
 

diff --git a/Source/IFCExporterUIOverride/IFCClassificationUI.xaml b/Source/IFCExporterUIOverride/IFCClassificationUI.xaml
@@ -1,8 +1,8 @@
-<ui:ChildWindow x:Class="BIM.IFC.Export.UI.IFCClassificationWindow"
+<auiw:ChildWindow x:Class="BIM.IFC.Export.UI.IFCClassificationWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:p="clr-namespace:BIM.IFC.Export.UI.Properties"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:ui="clr-namespace:Autodesk.Revit.WPFFramework;assembly=UserInterfaceUtility"
+        xmlns:auiw="clr-namespace:Autodesk.UI.Windows;assembly=Autodesk.UI.Windows"
         Title="{x:Static p:Resources.ClassificationSetting}" Name="ClassificationTab" Initialized="ClassificationTab_Initialized" Loaded="Window_Loaded" mc:Ignorable="d" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignWidth="570" SizeToContent="WidthAndHeight" HorizontalAlignment="Stretch" Margin="10,5,5,10" Height="315" >
     <Grid Name="grid1" Width="551" Margin="6,2,6,0">
         <Grid.RowDefinitions>
@@ -30,4 +30,4 @@
             <Button Content="{x:Static p:Resources.Cancel}" Height="22" Name="buttonCancel" Width="75" Click="bottonCancel_Click" RenderTransformOrigin="0.507,-4.636" Margin="348,242,13,12" Grid.Column="1"/>
         </Grid>
     </Grid>
-</ui:ChildWindow>
+</auiw:ChildWindow>
diff --git a/Source/IFCExporterUIOverride/IFCClassificationUI.xaml.cs b/Source/IFCExporterUIOverride/IFCClassificationUI.xaml.cs
@@ -18,25 +18,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using System.Runtime.InteropServices;
-using System.Windows.Interop;
-using Autodesk.Revit.WPFFramework;
-using Autodesk.Revit.DB;
-using Autodesk.Revit.UI;
-using Autodesk.Revit.UI.Events;
-
 using Revit.IFC.Common.Extensions;
-
+using Autodesk.UI.Windows;
 
 namespace BIM.IFC.Export.UI
 {

diff --git a/Source/IFCExporterUIOverride/IFCExport.xaml b/Source/IFCExporterUIOverride/IFCExport.xaml
@@ -1,11 +1,20 @@
 <!-- TODO: use resources to govern externalized strings.  (static initialization failure when loaded into Revit even though it shows perfectly well in the Dialog editor) -->
-<ui:ChildWindow x:Class="BIM.IFC.Export.UI.IFCExport"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:p="clr-namespace:BIM.IFC.Export.UI.Properties"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
-        xmlns:ui="clr-namespace:Autodesk.Revit.WPFFramework;assembly=UserInterfaceUtility"
-        xmlns:System="clr-namespace:System;assembly=mscorlib" Title="{x:Static p:Resources.IFCExport}" mc:Ignorable="d" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" WindowStyle="SingleBorderWindow"  ContentRendered="ChildWindow_ContentRendered" ResizeMode="NoResize" Closing="Window_Closing" Height="326" Width="731">
+<auiw:ChildWindow x:Class="BIM.IFC.Export.UI.IFCExport"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:p="clr-namespace:BIM.IFC.Export.UI.Properties"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
+                  xmlns:auiw="clr-namespace:Autodesk.UI.Windows;assembly=Autodesk.UI.Windows"
+                  xmlns:System="clr-namespace:System;assembly=mscorlib" 
+                  Title="{x:Static p:Resources.IFCExport}" 
+                  mc:Ignorable="d" 
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+                  WindowStyle="SingleBorderWindow"  
+                  ContentRendered="ChildWindow_ContentRendered" 
+                  ResizeMode="NoResize" 
+                  Closing="Window_Closing" 
+                  Height="326" 
+                  Width="731">
    <Grid Margin="10,0" RenderTransformOrigin="0,0">
       <Label Content="{x:Static p:Resources.FileName}" HorizontalAlignment="Left" Margin="0,12,0,0" x:Name="label_FileName" Height="28" VerticalAlignment="Top" Width="202" VerticalContentAlignment="Top" RenderTransformOrigin="0.462,0.478"/>
       <TextBox Height="23" Margin="242,12,0,0" Name="textBoxSetupFileName" VerticalAlignment="Top" IsEnabled="True"  TextWrapping="NoWrap" VerticalContentAlignment="Center" HorizontalAlignment="Left" Width="337"/>
@@ -26,11 +35,11 @@
       <Button Content="{x:Static p:Resources.Cancel}" Margin="616,0,0,24" Width="77" Name="buttonCancel" Click="buttonCancel_Click" Height="23" VerticalAlignment="Bottom" HorizontalAlignment="Left" />
    </Grid>
 
-   <Window.Resources>
+   <auiw:ChildWindow.Resources>
       <System:String x:Key="ifcExportWindowTitle">{x:Static p:Resources.IFCExport}</System:String>
       <System:String x:Key="currentSelectedSetup">{x:Static p:Resources.CurrentSelectedSetup}</System:String>
       <System:String x:Key="next">{x:Static p:Resources.Next}</System:String>
       <System:String x:Key="saveSetupAndClose">{x:Static p:Resources.SaveSetupAndClose}</System:String>
       <System:String x:Key="cancel">{x:Static p:Resources.Cancel}</System:String>
-   </Window.Resources>
-</ui:ChildWindow>
+   </auiw:ChildWindow.Resources>
+</auiw:ChildWindow>
diff --git a/Source/IFCExporterUIOverride/IFCExport.xaml.cs b/Source/IFCExporterUIOverride/IFCExport.xaml.cs
@@ -26,7 +26,7 @@
 
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
-using Autodesk.Revit.WPFFramework;
+using Autodesk.UI.Windows;
 
 using SaveFileDialog = Microsoft.Win32.SaveFileDialog;