From b7923818acafadb32266768bd0e207eaa14924d0 Mon Sep 17 00:00:00 2001 From: Jo64 Date: Tue, 5 Mar 2019 18:57:49 +0100 Subject: [PATCH 01/14] =?UTF-8?q?QM=2027224=20-=20T=C3=BCren=20mit=20Raumb?= =?UTF-8?q?ezug=20im=20IFC=20-=20DoorBelongsToRoom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QM 27224 - Türen mit Raumbezug im IFC - issue https://github.com/Autodesk/revit-ifc/issues/91 - update to VisualStudio 2017 - added new boolean export option 'DoorBelongsToRoom' --- Install/RevitIFCSetupWix/Product.wxs | 50 +++++++++---------- .../RevitIFCSetupWix/RevitIFCSetupWix.wixproj | 15 +++--- Install/RevitIFCSetupWix/buildInstaller.bat | 13 ++--- Revit.IFC.sln | 13 +++-- .../IFCExportConfiguration.cs | 7 +++ .../IFCExporterUIWindow.xaml | 3 +- .../IFCExporterUIWindow.xaml.cs | 12 +++++ .../Properties/AssemblyInfo.cs | 4 +- .../Properties/Resources.Designer.cs | 9 ++++ .../Properties/Resources.resx | 4 ++ .../Properties/AssemblyInfo.cs | 4 +- Source/Revit.IFC.Export/Exporter/Exporter.cs | 13 +++++ .../Properties/AssemblyInfo.cs | 4 +- .../Revit.IFC.Export/Revit.IFC.Export.csproj | 3 ++ .../Toolkit/IFCInstanceExporter.cs | 31 ++++++++++++ .../Utility/ExportOptionsCache.cs | 7 +++ .../Utility/ExporterCacheManager.cs | 14 ++++++ .../Properties/AssemblyInfo.cs | 4 +- 18 files changed, 160 insertions(+), 50 deletions(-) diff --git a/Install/RevitIFCSetupWix/Product.wxs b/Install/RevitIFCSetupWix/Product.wxs index 2549e131..f3a23690 100644 --- a/Install/RevitIFCSetupWix/Product.wxs +++ b/Install/RevitIFCSetupWix/Product.wxs @@ -2,7 +2,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -38,9 +38,9 @@ - + - + @@ -48,12 +48,12 @@ - + - + @@ -64,25 +64,25 @@ - - - - + + - - - - + + - - - - + + - + @@ -93,14 +93,14 @@ - + - + @@ -131,11 +131,11 @@ - + diff --git a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj index 7d00b691..f0a2529d 100644 --- a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj +++ b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj @@ -6,15 +6,18 @@ 3.8 7dfbd495-c588-4c7b-b8f6-5b793adb06f2 2.0 - Revit IFC for Revit 2015 + Revit IFC for Revit 2018 Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets Always - Perforce Project - MSSCCI:Perforce SCM + + + + - . + + $(SolutionDir)..\$(Configuration)$(PlatformName)\ @@ -42,8 +45,8 @@ - - BIM.IFC.Common + + Revit.IFC.Common {032ea4dc-181f-4453-9f93-e08de1c07d95} True True diff --git a/Install/RevitIFCSetupWix/buildInstaller.bat b/Install/RevitIFCSetupWix/buildInstaller.bat index c4640d4d..11949279 100644 --- a/Install/RevitIFCSetupWix/buildInstaller.bat +++ b/Install/RevitIFCSetupWix/buildInstaller.bat @@ -5,15 +5,16 @@ echo %2 set ThisBatFileRoot=%~dp0 rem Set this path to your Wix bin directory. -set WixRoot=%ThisBatFileRoot%..\..\..\..\..\..\ThirdParty\Wix\ +rem set WixRoot=%ThisBatFileRoot%..\..\..\..\..\..\ThirdParty\Wix\ +set WixRoot="C:\Program Files (x86)\WiX Toolset v3.11\bin" rem It is necessary to add the Wix bin directory to the system path temporarily to use the -ext flag below. SET PATH=%PATH%;%WixRoot% candle.exe -dProjectDir=%2 -ext WixUtilExtension %2Product.wxs -light.exe -ext WixUtilExtension -out RevitIFC2019.msi product.wixobj -ext WixUIExtension +rem light.exe -ext WixUtilExtension -out RevitIFC2019.msi product.wixobj -ext WixUIExtension +light.exe -ext WixUtilExtension -out RevitIFC2018_18410.msi product.wixobj -ext WixUIExtension -copy RevitIFC2019.msi %1..\Releasex64 -del RevitIFC2019.msi - -echo %1..\Releasex64\RevitIFC2019.msi +rem copy RevitIFC2019.msi %1..\Releasex64 +rem del RevitIFC2019.msi +rem echo %1..\Releasex64\RevitIFC2019.msi diff --git a/Revit.IFC.sln b/Revit.IFC.sln index b02f825c..2811d4ef 100644 --- a/Revit.IFC.sln +++ b/Revit.IFC.sln @@ -1,12 +1,15 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.421 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Import", "Source\Revit.IFC.Import\Revit.IFC.Import.csproj", "{7F987D09-9716-4F50-ADE0-278E4B537101}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Export", "Source\Revit.IFC.Export\Revit.IFC.Export.csproj", "{BCE5141A-291B-4CD8-A69B-7B9345AA00E9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Common", "Source\Revit.IFC.Common\Revit.IFC.Common.csproj", "{032EA4DC-181F-4453-9F93-E08DE1C07D95}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFCExporterUI", "Source\IFCExporterUIOverride\IFCExporterUIOverride.csproj", "{BF694550-5BEB-4DCF-8EC2-A5904690DC17}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFCExporterUIOverride", "Source\IFCExporterUIOverride\IFCExporterUIOverride.csproj", "{BF694550-5BEB-4DCF-8EC2-A5904690DC17}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Install", "Install", "{88C55E9A-2767-48B7-A035-E3D864C4FF09}" EndProject @@ -64,7 +67,6 @@ Global {BF694550-5BEB-4DCF-8EC2-A5904690DC17}.Release|x86.ActiveCfg = Release|Any CPU {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2}.Debug|Any CPU.ActiveCfg = Debug|x86 {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2}.Debug|Mixed Platforms.Build.0 = Debug|x86 {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2}.Debug|x86.ActiveCfg = Debug|x86 {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2}.Debug|x86.Build.0 = Debug|x86 {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2}.Release|Any CPU.ActiveCfg = Release|x86 @@ -79,6 +81,9 @@ Global GlobalSection(NestedProjects) = preSolution {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2} = {88C55E9A-2767-48B7-A035-E3D864C4FF09} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {ED91B8E4-8D06-41AB-9215-6FCB84646950} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/Source/IFCExporterUIOverride/IFCExportConfiguration.cs b/Source/IFCExporterUIOverride/IFCExportConfiguration.cs index 97109681..8ffa8cf3 100644 --- a/Source/IFCExporterUIOverride/IFCExportConfiguration.cs +++ b/Source/IFCExporterUIOverride/IFCExportConfiguration.cs @@ -220,6 +220,8 @@ public class IFCExportConfiguration /// public string COBieProjectInfo { get; set; } = ""; + public bool DoorBelongsToRoom { get; set; } + /// /// Value indicating whether steel elements should be exported. /// @@ -292,6 +294,7 @@ private IFCExportConfiguration() this.ExportSpecificSchedules = false; this.TessellationLevelOfDetail = 0.5; this.UseOnlyTriangulation = false; + this.DoorBelongsToRoom = false; this.StoreIFCGUID = false; this.m_isBuiltIn = false; this.m_isInSession = false; @@ -360,6 +363,7 @@ private IFCExportConfiguration() // The default tesselationLevelOfDetail will be low configuration.TessellationLevelOfDetail = 0.5; configuration.UseOnlyTriangulation = false; + configuration.DoorBelongsToRoom = false; configuration.StoreIFCGUID = false; configuration.m_isBuiltIn = true; configuration.m_isInSession = false; @@ -410,6 +414,7 @@ private IFCExportConfiguration(IFCExportConfiguration other) this.IncludeSiteElevation = other.IncludeSiteElevation; this.TessellationLevelOfDetail = other.TessellationLevelOfDetail; this.UseOnlyTriangulation = other.UseOnlyTriangulation; + this.DoorBelongsToRoom = other.DoorBelongsToRoom; this.StoreIFCGUID = other.StoreIFCGUID; this.m_isBuiltIn = other.m_isBuiltIn; this.m_isInSession = other.m_isInSession; @@ -465,6 +470,7 @@ private IFCExportConfiguration(String name, IFCExportConfiguration other) this.IncludeSiteElevation = other.IncludeSiteElevation; this.TessellationLevelOfDetail = other.TessellationLevelOfDetail; this.UseOnlyTriangulation = other.UseOnlyTriangulation; + this.DoorBelongsToRoom = other.DoorBelongsToRoom; this.ActivePhaseId = other.ActivePhaseId; this.ExportRoomsInView = other.ExportRoomsInView; this.m_isBuiltIn = false; @@ -538,6 +544,7 @@ public void UpdateOptions(IFCExportOptions options, ElementId filterViewId) options.AddOption("SitePlacement", SitePlacement.ToString()); options.AddOption("TessellationLevelOfDetail", TessellationLevelOfDetail.ToString()); options.AddOption("UseOnlyTriangulation", UseOnlyTriangulation.ToString()); + options.AddOption("DoorBelongsToRoom", DoorBelongsToRoom.ToString()); options.AddOption("ActiveViewId", ActiveViewId.ToString()); options.AddOption("StoreIFCGUID", StoreIFCGUID.ToString()); diff --git a/Source/IFCExporterUIOverride/IFCExporterUIWindow.xaml b/Source/IFCExporterUIOverride/IFCExporterUIWindow.xaml index 59a08b14..6c54685f 100644 --- a/Source/IFCExporterUIOverride/IFCExporterUIWindow.xaml +++ b/Source/IFCExporterUIOverride/IFCExporterUIWindow.xaml @@ -102,7 +102,8 @@ - + + + @@ -38,9 +38,9 @@ - + - + @@ -48,12 +48,12 @@ - + - + @@ -64,25 +64,25 @@ - + + + + - - + + + + - - + + + + - - + @@ -93,14 +93,14 @@ - + - + @@ -131,11 +131,11 @@ - + diff --git a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj index f0a2529d..7d00b691 100644 --- a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj +++ b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj @@ -6,18 +6,15 @@ 3.8 7dfbd495-c588-4c7b-b8f6-5b793adb06f2 2.0 - Revit IFC for Revit 2018 + Revit IFC for Revit 2015 Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets Always - - - - + Perforce Project + MSSCCI:Perforce SCM - - + . $(SolutionDir)..\$(Configuration)$(PlatformName)\ @@ -45,8 +42,8 @@ - - Revit.IFC.Common + + BIM.IFC.Common {032ea4dc-181f-4453-9f93-e08de1c07d95} True True diff --git a/Install/RevitIFCSetupWix/buildInstaller.bat b/Install/RevitIFCSetupWix/buildInstaller.bat index 11949279..c4640d4d 100644 --- a/Install/RevitIFCSetupWix/buildInstaller.bat +++ b/Install/RevitIFCSetupWix/buildInstaller.bat @@ -5,16 +5,15 @@ echo %2 set ThisBatFileRoot=%~dp0 rem Set this path to your Wix bin directory. -rem set WixRoot=%ThisBatFileRoot%..\..\..\..\..\..\ThirdParty\Wix\ -set WixRoot="C:\Program Files (x86)\WiX Toolset v3.11\bin" +set WixRoot=%ThisBatFileRoot%..\..\..\..\..\..\ThirdParty\Wix\ rem It is necessary to add the Wix bin directory to the system path temporarily to use the -ext flag below. SET PATH=%PATH%;%WixRoot% candle.exe -dProjectDir=%2 -ext WixUtilExtension %2Product.wxs -rem light.exe -ext WixUtilExtension -out RevitIFC2019.msi product.wixobj -ext WixUIExtension -light.exe -ext WixUtilExtension -out RevitIFC2018_18410.msi product.wixobj -ext WixUIExtension +light.exe -ext WixUtilExtension -out RevitIFC2019.msi product.wixobj -ext WixUIExtension -rem copy RevitIFC2019.msi %1..\Releasex64 -rem del RevitIFC2019.msi -rem echo %1..\Releasex64\RevitIFC2019.msi +copy RevitIFC2019.msi %1..\Releasex64 +del RevitIFC2019.msi + +echo %1..\Releasex64\RevitIFC2019.msi From 70d2044a836031a9488c4df68366ad1cbd5719ce Mon Sep 17 00:00:00 2001 From: Jo64 Date: Tue, 12 Mar 2019 22:44:52 +0100 Subject: [PATCH 07/14] changes removed --- Revit.IFC.sln | 13 +++---------- Source/Revit.IFC.Common/Properties/AssemblyInfo.cs | 4 ++-- Source/Revit.IFC.Export/Properties/AssemblyInfo.cs | 4 ++-- Source/Revit.IFC.Export/Revit.IFC.Export.csproj | 3 --- Source/Revit.IFC.Import/Properties/AssemblyInfo.cs | 4 ++-- 5 files changed, 9 insertions(+), 19 deletions(-) diff --git a/Revit.IFC.sln b/Revit.IFC.sln index 2811d4ef..051f56f3 100644 --- a/Revit.IFC.sln +++ b/Revit.IFC.sln @@ -1,15 +1,10 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.421 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Import", "Source\Revit.IFC.Import\Revit.IFC.Import.csproj", "{7F987D09-9716-4F50-ADE0-278E4B537101}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Import", "Source\Revit.IFC.Import\Revit.IFC.Import.csproj", "{7F987D09-9716-4F50-ADE0-278E4B537101}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Export", "Source\Revit.IFC.Export\Revit.IFC.Export.csproj", "{BCE5141A-291B-4CD8-A69B-7B9345AA00E9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Common", "Source\Revit.IFC.Common\Revit.IFC.Common.csproj", "{032EA4DC-181F-4453-9F93-E08DE1C07D95}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFCExporterUIOverride", "Source\IFCExporterUIOverride\IFCExporterUIOverride.csproj", "{BF694550-5BEB-4DCF-8EC2-A5904690DC17}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFCExporterUI", "Source\IFCExporterUIOverride\IFCExporterUIOverride.csproj", "{BF694550-5BEB-4DCF-8EC2-A5904690DC17}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Install", "Install", "{88C55E9A-2767-48B7-A035-E3D864C4FF09}" EndProject @@ -67,6 +62,7 @@ Global {BF694550-5BEB-4DCF-8EC2-A5904690DC17}.Release|x86.ActiveCfg = Release|Any CPU {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2}.Debug|Any CPU.ActiveCfg = Debug|x86 {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2}.Debug|Mixed Platforms.Build.0 = Debug|x86 {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2}.Debug|x86.ActiveCfg = Debug|x86 {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2}.Debug|x86.Build.0 = Debug|x86 {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2}.Release|Any CPU.ActiveCfg = Release|x86 @@ -81,9 +77,6 @@ Global GlobalSection(NestedProjects) = preSolution {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2} = {88C55E9A-2767-48B7-A035-E3D864C4FF09} EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {ED91B8E4-8D06-41AB-9215-6FCB84646950} - EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection diff --git a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs index 4e7e5dba..6e292c1e 100644 --- a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("18.4.1.0")] -[assembly: AssemblyFileVersion("18.4.1.0")] +[assembly: AssemblyVersion("19.1.0.0")] +[assembly: AssemblyFileVersion("19.1.0.0")] #region Using directives diff --git a/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs index e9d9cf82..e5ab8b17 100644 --- a/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("18.4.1.0")] -[assembly: AssemblyFileVersion("18.4.1.0")] +[assembly: AssemblyVersion("19.1.0.0")] +[assembly: AssemblyFileVersion("19.1.0.0")] #region Using directives diff --git a/Source/Revit.IFC.Export/Revit.IFC.Export.csproj b/Source/Revit.IFC.Export/Revit.IFC.Export.csproj index 756ca37e..4841cfb3 100644 --- a/Source/Revit.IFC.Export/Revit.IFC.Export.csproj +++ b/Source/Revit.IFC.Export/Revit.IFC.Export.csproj @@ -48,9 +48,6 @@ false - - TRACE;DEBUG - ..\..\packages\Antlr4.Runtime.4.6.4\lib\net45\Antlr4.Runtime.dll diff --git a/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs index bdf96083..72474b2a 100644 --- a/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("18.4.1.0")] -[assembly: AssemblyFileVersion("18.4.1.0")] +[assembly: AssemblyVersion("19.1.0.0")] +[assembly: AssemblyFileVersion("19.1.0.0")] #region Using directives From 80b54e3840387ae61552979bbb6c44e268514ee5 Mon Sep 17 00:00:00 2001 From: Jo64 Date: Tue, 12 Mar 2019 23:41:19 +0100 Subject: [PATCH 08/14] Update Revit.IFC.sln --- Revit.IFC.sln | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Revit.IFC.sln b/Revit.IFC.sln index 051f56f3..b02f825c 100644 --- a/Revit.IFC.sln +++ b/Revit.IFC.sln @@ -1,4 +1,6 @@ -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Import", "Source\Revit.IFC.Import\Revit.IFC.Import.csproj", "{7F987D09-9716-4F50-ADE0-278E4B537101}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Import", "Source\Revit.IFC.Import\Revit.IFC.Import.csproj", "{7F987D09-9716-4F50-ADE0-278E4B537101}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Export", "Source\Revit.IFC.Export\Revit.IFC.Export.csproj", "{BCE5141A-291B-4CD8-A69B-7B9345AA00E9}" EndProject From aec3e1fb5a7d9d7f2d641ab57c829b027fa08b64 Mon Sep 17 00:00:00 2001 From: Jo64 Date: Tue, 12 Mar 2019 23:41:19 +0100 Subject: [PATCH 09/14] Update Revit.IFC.sln --- Revit.IFC.sln | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Revit.IFC.sln b/Revit.IFC.sln index 051f56f3..b02f825c 100644 --- a/Revit.IFC.sln +++ b/Revit.IFC.sln @@ -1,4 +1,6 @@ -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Import", "Source\Revit.IFC.Import\Revit.IFC.Import.csproj", "{7F987D09-9716-4F50-ADE0-278E4B537101}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Import", "Source\Revit.IFC.Import\Revit.IFC.Import.csproj", "{7F987D09-9716-4F50-ADE0-278E4B537101}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Export", "Source\Revit.IFC.Export\Revit.IFC.Export.csproj", "{BCE5141A-291B-4CD8-A69B-7B9345AA00E9}" EndProject From 3157354ff4650703dc00cda504f38ba24ac48a38 Mon Sep 17 00:00:00 2001 From: Jo64 Date: Thu, 14 Mar 2019 09:58:47 +0100 Subject: [PATCH 10/14] Update pull request files --- Install/RevitIFCSetupWix/Product.wxs | 1 + Revit.IFC.sln | 1 + Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs | 1 + Source/IFCExporterUIOverride/Properties/Resources.Designer.cs | 2 +- Source/IFCExporterUIOverride/Properties/Resources.resx | 2 +- Source/Revit.IFC.Common/Properties/AssemblyInfo.cs | 1 + Source/Revit.IFC.Export/Properties/AssemblyInfo.cs | 1 + Source/Revit.IFC.Export/Revit.IFC.Export.csproj | 1 + Source/Revit.IFC.Import/Properties/AssemblyInfo.cs | 1 + 9 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Install/RevitIFCSetupWix/Product.wxs b/Install/RevitIFCSetupWix/Product.wxs index 2549e131..1fa4c7b1 100644 --- a/Install/RevitIFCSetupWix/Product.wxs +++ b/Install/RevitIFCSetupWix/Product.wxs @@ -167,6 +167,7 @@ + diff --git a/Revit.IFC.sln b/Revit.IFC.sln index b02f825c..596f1ea5 100644 --- a/Revit.IFC.sln +++ b/Revit.IFC.sln @@ -82,4 +82,5 @@ Global GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection + EndGlobal diff --git a/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs b/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs index 0f6f23d4..5732da74 100644 --- a/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs +++ b/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs @@ -60,6 +60,7 @@ )] + // Version information for an assembly consists of the following four values: // // Major Version diff --git a/Source/IFCExporterUIOverride/Properties/Resources.Designer.cs b/Source/IFCExporterUIOverride/Properties/Resources.Designer.cs index 9ee72fba..df9795c5 100644 --- a/Source/IFCExporterUIOverride/Properties/Resources.Designer.cs +++ b/Source/IFCExporterUIOverride/Properties/Resources.Designer.cs @@ -529,7 +529,7 @@ public class Resources { } /// - /// Looks up a localized string similar to The door (IfcDoor) belongs to the room (IfcSpace). + /// Looks up a localized string similar to Relate doors to rooms. /// public static string DoorBelongsToRoom { get { diff --git a/Source/IFCExporterUIOverride/Properties/Resources.resx b/Source/IFCExporterUIOverride/Properties/Resources.resx index b2d62242..ed4da0f9 100644 --- a/Source/IFCExporterUIOverride/Properties/Resources.resx +++ b/Source/IFCExporterUIOverride/Properties/Resources.resx @@ -790,6 +790,6 @@ Keep Tessellated Geometry as Triangulation - The door (IfcDoor) belongs to the room (IfcSpace) + Relate doors to rooms \ No newline at end of file diff --git a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs index 6e292c1e..8801bf41 100644 --- a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs @@ -15,6 +15,7 @@ [assembly: AssemblyVersion("19.1.0.0")] [assembly: AssemblyFileVersion("19.1.0.0")] + #region Using directives #endregion diff --git a/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs index e5ab8b17..8bc2c6ad 100644 --- a/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs @@ -15,6 +15,7 @@ [assembly: AssemblyVersion("19.1.0.0")] [assembly: AssemblyFileVersion("19.1.0.0")] + #region Using directives #endregion diff --git a/Source/Revit.IFC.Export/Revit.IFC.Export.csproj b/Source/Revit.IFC.Export/Revit.IFC.Export.csproj index 4841cfb3..0ef84bd4 100644 --- a/Source/Revit.IFC.Export/Revit.IFC.Export.csproj +++ b/Source/Revit.IFC.Export/Revit.IFC.Export.csproj @@ -346,4 +346,5 @@ --> + \ No newline at end of file diff --git a/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs index 72474b2a..5391cae4 100644 --- a/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs @@ -15,6 +15,7 @@ [assembly: AssemblyVersion("19.1.0.0")] [assembly: AssemblyFileVersion("19.1.0.0")] + #region Using directives #endregion \ No newline at end of file From e8a6e0ec894aac3b73d99ad98210cb8fd57aa0a9 Mon Sep 17 00:00:00 2001 From: Jo64 Date: Thu, 14 Mar 2019 22:18:44 +0100 Subject: [PATCH 11/14] Reset to our requirements again --- Install/RevitIFCSetupWix/Product.wxs | 51 +++++++++---------- .../RevitIFCSetupWix/RevitIFCSetupWix.wixproj | 17 ++++--- Install/RevitIFCSetupWix/buildInstaller.bat | 14 +++-- Revit.IFC.sln | 13 +++-- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- 8 files changed, 61 insertions(+), 50 deletions(-) diff --git a/Install/RevitIFCSetupWix/Product.wxs b/Install/RevitIFCSetupWix/Product.wxs index 1fa4c7b1..cc773af0 100644 --- a/Install/RevitIFCSetupWix/Product.wxs +++ b/Install/RevitIFCSetupWix/Product.wxs @@ -2,7 +2,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -38,9 +38,9 @@ - + - + @@ -48,12 +48,12 @@ - + - + @@ -64,25 +64,25 @@ - - - - + + - - - - + + - - - - + + - + @@ -93,14 +93,14 @@ - + - + @@ -131,11 +131,11 @@ - + @@ -167,7 +167,6 @@ - diff --git a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj index 7d00b691..09179c65 100644 --- a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj +++ b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj @@ -6,15 +6,18 @@ 3.8 7dfbd495-c588-4c7b-b8f6-5b793adb06f2 2.0 - Revit IFC for Revit 2015 + Revit IFC for Revit 2018 Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets Always - Perforce Project - MSSCCI:Perforce SCM + + + + - . + + $(SolutionDir)..\$(Configuration)$(PlatformName)\ @@ -22,7 +25,7 @@ Debug - $(SolutionDir)..\$(Configuration)$(PlatformName)\ + $(SolutionDir)\Setup\$(Configuration)$(PlatformName)\ obj\$(Configuration)\ @@ -42,8 +45,8 @@ - - BIM.IFC.Common + + Revit.IFC.Common {032ea4dc-181f-4453-9f93-e08de1c07d95} True True diff --git a/Install/RevitIFCSetupWix/buildInstaller.bat b/Install/RevitIFCSetupWix/buildInstaller.bat index c4640d4d..bae28424 100644 --- a/Install/RevitIFCSetupWix/buildInstaller.bat +++ b/Install/RevitIFCSetupWix/buildInstaller.bat @@ -5,15 +5,19 @@ echo %2 set ThisBatFileRoot=%~dp0 rem Set this path to your Wix bin directory. -set WixRoot=%ThisBatFileRoot%..\..\..\..\..\..\ThirdParty\Wix\ +rem set WixRoot=%ThisBatFileRoot%..\..\..\..\..\..\ThirdParty\Wix\ +set WixRoot="C:\Program Files (x86)\WiX Toolset v3.11\bin\" rem It is necessary to add the Wix bin directory to the system path temporarily to use the -ext flag below. SET PATH=%PATH%;%WixRoot% candle.exe -dProjectDir=%2 -ext WixUtilExtension %2Product.wxs -light.exe -ext WixUtilExtension -out RevitIFC2019.msi product.wixobj -ext WixUIExtension +rem light.exe -ext WixUtilExtension -out RevitIFC2019.msi product.wixobj -ext WixUIExtension +rem light.exe -ext WixUtilExtension -out RevitIFC2018_18410.msi product.wixobj -ext WixUIExtension +light.exe -ext WixUtilExtension -out RevitIFC2018_18410.msi product.wixobj -ext WixUIExtension -copy RevitIFC2019.msi %1..\Releasex64 -del RevitIFC2019.msi +rem copy RevitIFC2019.msi %1..\Releasex64 +rem echo %1..\Releasex64\RevitIFC2019.msi -echo %1..\Releasex64\RevitIFC2019.msi +del "*.wix*" +del "Revit IFC for Revit 2018.msi" diff --git a/Revit.IFC.sln b/Revit.IFC.sln index 596f1ea5..73fde64c 100644 --- a/Revit.IFC.sln +++ b/Revit.IFC.sln @@ -1,12 +1,15 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.489 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Import", "Source\Revit.IFC.Import\Revit.IFC.Import.csproj", "{7F987D09-9716-4F50-ADE0-278E4B537101}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Export", "Source\Revit.IFC.Export\Revit.IFC.Export.csproj", "{BCE5141A-291B-4CD8-A69B-7B9345AA00E9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Common", "Source\Revit.IFC.Common\Revit.IFC.Common.csproj", "{032EA4DC-181F-4453-9F93-E08DE1C07D95}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFCExporterUI", "Source\IFCExporterUIOverride\IFCExporterUIOverride.csproj", "{BF694550-5BEB-4DCF-8EC2-A5904690DC17}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFCExporterUIOverride", "Source\IFCExporterUIOverride\IFCExporterUIOverride.csproj", "{BF694550-5BEB-4DCF-8EC2-A5904690DC17}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Install", "Install", "{88C55E9A-2767-48B7-A035-E3D864C4FF09}" EndProject @@ -79,8 +82,10 @@ Global GlobalSection(NestedProjects) = preSolution {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2} = {88C55E9A-2767-48B7-A035-E3D864C4FF09} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A466EE46-9A7B-493D-A047-4F929CB6ADFA} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection - EndGlobal diff --git a/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs b/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs index 5732da74..f1910818 100644 --- a/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs +++ b/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs @@ -71,5 +71,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("19.1.0.0")] -[assembly: AssemblyFileVersion("19.1.0.0")] +[assembly: AssemblyVersion("18.4.1.0")] +[assembly: AssemblyFileVersion("18.4.1.0")] diff --git a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs index 8801bf41..d01c7954 100644 --- a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("19.1.0.0")] -[assembly: AssemblyFileVersion("19.1.0.0")] +[assembly: AssemblyVersion("18.4.1.0")] +[assembly: AssemblyFileVersion("18.4.1.0")] #region Using directives diff --git a/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs index 8bc2c6ad..20782f80 100644 --- a/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("19.1.0.0")] -[assembly: AssemblyFileVersion("19.1.0.0")] +[assembly: AssemblyVersion("18.4.1.0")] +[assembly: AssemblyFileVersion("18.4.1.0")] #region Using directives diff --git a/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs index 5391cae4..e9b6bee2 100644 --- a/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("19.1.0.0")] -[assembly: AssemblyFileVersion("19.1.0.0")] +[assembly: AssemblyVersion("18.4.1.0")] +[assembly: AssemblyFileVersion("18.4.1.0")] #region Using directives From bb167d88e718949a194a5cf4f7b7834ebbc4e1cf Mon Sep 17 00:00:00 2001 From: Jo64 Date: Thu, 14 Mar 2019 23:15:44 +0100 Subject: [PATCH 12/14] Revert "Reset to our requirements again" This reverts commit e8a6e0ec894aac3b73d99ad98210cb8fd57aa0a9. --- Install/RevitIFCSetupWix/Product.wxs | 51 ++++++++++--------- .../RevitIFCSetupWix/RevitIFCSetupWix.wixproj | 17 +++---- Install/RevitIFCSetupWix/buildInstaller.bat | 14 ++--- Revit.IFC.sln | 13 ++--- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- 8 files changed, 50 insertions(+), 61 deletions(-) diff --git a/Install/RevitIFCSetupWix/Product.wxs b/Install/RevitIFCSetupWix/Product.wxs index cc773af0..1fa4c7b1 100644 --- a/Install/RevitIFCSetupWix/Product.wxs +++ b/Install/RevitIFCSetupWix/Product.wxs @@ -2,7 +2,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -38,9 +38,9 @@ - + - + @@ -48,12 +48,12 @@ - + - + @@ -64,25 +64,25 @@ - + + + + - - + + + + - - + + + + - - + @@ -93,14 +93,14 @@ - + - + @@ -131,11 +131,11 @@ - + @@ -167,6 +167,7 @@ + diff --git a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj index 09179c65..7d00b691 100644 --- a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj +++ b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj @@ -6,18 +6,15 @@ 3.8 7dfbd495-c588-4c7b-b8f6-5b793adb06f2 2.0 - Revit IFC for Revit 2018 + Revit IFC for Revit 2015 Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets Always - - - - + Perforce Project + MSSCCI:Perforce SCM - - + . $(SolutionDir)..\$(Configuration)$(PlatformName)\ @@ -25,7 +22,7 @@ Debug - $(SolutionDir)\Setup\$(Configuration)$(PlatformName)\ + $(SolutionDir)..\$(Configuration)$(PlatformName)\ obj\$(Configuration)\ @@ -45,8 +42,8 @@ - - Revit.IFC.Common + + BIM.IFC.Common {032ea4dc-181f-4453-9f93-e08de1c07d95} True True diff --git a/Install/RevitIFCSetupWix/buildInstaller.bat b/Install/RevitIFCSetupWix/buildInstaller.bat index bae28424..c4640d4d 100644 --- a/Install/RevitIFCSetupWix/buildInstaller.bat +++ b/Install/RevitIFCSetupWix/buildInstaller.bat @@ -5,19 +5,15 @@ echo %2 set ThisBatFileRoot=%~dp0 rem Set this path to your Wix bin directory. -rem set WixRoot=%ThisBatFileRoot%..\..\..\..\..\..\ThirdParty\Wix\ -set WixRoot="C:\Program Files (x86)\WiX Toolset v3.11\bin\" +set WixRoot=%ThisBatFileRoot%..\..\..\..\..\..\ThirdParty\Wix\ rem It is necessary to add the Wix bin directory to the system path temporarily to use the -ext flag below. SET PATH=%PATH%;%WixRoot% candle.exe -dProjectDir=%2 -ext WixUtilExtension %2Product.wxs -rem light.exe -ext WixUtilExtension -out RevitIFC2019.msi product.wixobj -ext WixUIExtension -rem light.exe -ext WixUtilExtension -out RevitIFC2018_18410.msi product.wixobj -ext WixUIExtension -light.exe -ext WixUtilExtension -out RevitIFC2018_18410.msi product.wixobj -ext WixUIExtension +light.exe -ext WixUtilExtension -out RevitIFC2019.msi product.wixobj -ext WixUIExtension -rem copy RevitIFC2019.msi %1..\Releasex64 -rem echo %1..\Releasex64\RevitIFC2019.msi +copy RevitIFC2019.msi %1..\Releasex64 +del RevitIFC2019.msi -del "*.wix*" -del "Revit IFC for Revit 2018.msi" +echo %1..\Releasex64\RevitIFC2019.msi diff --git a/Revit.IFC.sln b/Revit.IFC.sln index 73fde64c..596f1ea5 100644 --- a/Revit.IFC.sln +++ b/Revit.IFC.sln @@ -1,15 +1,12 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.489 -MinimumVisualStudioVersion = 10.0.40219.1 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Import", "Source\Revit.IFC.Import\Revit.IFC.Import.csproj", "{7F987D09-9716-4F50-ADE0-278E4B537101}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Export", "Source\Revit.IFC.Export\Revit.IFC.Export.csproj", "{BCE5141A-291B-4CD8-A69B-7B9345AA00E9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Common", "Source\Revit.IFC.Common\Revit.IFC.Common.csproj", "{032EA4DC-181F-4453-9F93-E08DE1C07D95}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFCExporterUIOverride", "Source\IFCExporterUIOverride\IFCExporterUIOverride.csproj", "{BF694550-5BEB-4DCF-8EC2-A5904690DC17}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFCExporterUI", "Source\IFCExporterUIOverride\IFCExporterUIOverride.csproj", "{BF694550-5BEB-4DCF-8EC2-A5904690DC17}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Install", "Install", "{88C55E9A-2767-48B7-A035-E3D864C4FF09}" EndProject @@ -82,10 +79,8 @@ Global GlobalSection(NestedProjects) = preSolution {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2} = {88C55E9A-2767-48B7-A035-E3D864C4FF09} EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A466EE46-9A7B-493D-A047-4F929CB6ADFA} - EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection + EndGlobal diff --git a/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs b/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs index f1910818..5732da74 100644 --- a/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs +++ b/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs @@ -71,5 +71,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("18.4.1.0")] -[assembly: AssemblyFileVersion("18.4.1.0")] +[assembly: AssemblyVersion("19.1.0.0")] +[assembly: AssemblyFileVersion("19.1.0.0")] diff --git a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs index d01c7954..8801bf41 100644 --- a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("18.4.1.0")] -[assembly: AssemblyFileVersion("18.4.1.0")] +[assembly: AssemblyVersion("19.1.0.0")] +[assembly: AssemblyFileVersion("19.1.0.0")] #region Using directives diff --git a/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs index 20782f80..8bc2c6ad 100644 --- a/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("18.4.1.0")] -[assembly: AssemblyFileVersion("18.4.1.0")] +[assembly: AssemblyVersion("19.1.0.0")] +[assembly: AssemblyFileVersion("19.1.0.0")] #region Using directives diff --git a/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs index e9b6bee2..5391cae4 100644 --- a/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("18.4.1.0")] -[assembly: AssemblyFileVersion("18.4.1.0")] +[assembly: AssemblyVersion("19.1.0.0")] +[assembly: AssemblyFileVersion("19.1.0.0")] #region Using directives From b0bbff6b68182f7abe4fda618e1c8eb0f54be3ba Mon Sep 17 00:00:00 2001 From: Jo64 Date: Thu, 14 Mar 2019 23:36:18 +0100 Subject: [PATCH 13/14] Reset to our requirements again --- Install/RevitIFCSetupWix/Product.wxs | 51 +++++++++---------- .../RevitIFCSetupWix/RevitIFCSetupWix.wixproj | 17 ++++--- Install/RevitIFCSetupWix/buildInstaller.bat | 14 +++-- Revit.IFC.sln | 13 +++-- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- 8 files changed, 61 insertions(+), 50 deletions(-) diff --git a/Install/RevitIFCSetupWix/Product.wxs b/Install/RevitIFCSetupWix/Product.wxs index 1fa4c7b1..cc773af0 100644 --- a/Install/RevitIFCSetupWix/Product.wxs +++ b/Install/RevitIFCSetupWix/Product.wxs @@ -2,7 +2,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -38,9 +38,9 @@ - + - + @@ -48,12 +48,12 @@ - + - + @@ -64,25 +64,25 @@ - - - - + + - - - - + + - - - - + + - + @@ -93,14 +93,14 @@ - + - + @@ -131,11 +131,11 @@ - + @@ -167,7 +167,6 @@ - diff --git a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj index 7d00b691..09179c65 100644 --- a/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj +++ b/Install/RevitIFCSetupWix/RevitIFCSetupWix.wixproj @@ -6,15 +6,18 @@ 3.8 7dfbd495-c588-4c7b-b8f6-5b793adb06f2 2.0 - Revit IFC for Revit 2015 + Revit IFC for Revit 2018 Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets Always - Perforce Project - MSSCCI:Perforce SCM + + + + - . + + $(SolutionDir)..\$(Configuration)$(PlatformName)\ @@ -22,7 +25,7 @@ Debug - $(SolutionDir)..\$(Configuration)$(PlatformName)\ + $(SolutionDir)\Setup\$(Configuration)$(PlatformName)\ obj\$(Configuration)\ @@ -42,8 +45,8 @@ - - BIM.IFC.Common + + Revit.IFC.Common {032ea4dc-181f-4453-9f93-e08de1c07d95} True True diff --git a/Install/RevitIFCSetupWix/buildInstaller.bat b/Install/RevitIFCSetupWix/buildInstaller.bat index c4640d4d..bae28424 100644 --- a/Install/RevitIFCSetupWix/buildInstaller.bat +++ b/Install/RevitIFCSetupWix/buildInstaller.bat @@ -5,15 +5,19 @@ echo %2 set ThisBatFileRoot=%~dp0 rem Set this path to your Wix bin directory. -set WixRoot=%ThisBatFileRoot%..\..\..\..\..\..\ThirdParty\Wix\ +rem set WixRoot=%ThisBatFileRoot%..\..\..\..\..\..\ThirdParty\Wix\ +set WixRoot="C:\Program Files (x86)\WiX Toolset v3.11\bin\" rem It is necessary to add the Wix bin directory to the system path temporarily to use the -ext flag below. SET PATH=%PATH%;%WixRoot% candle.exe -dProjectDir=%2 -ext WixUtilExtension %2Product.wxs -light.exe -ext WixUtilExtension -out RevitIFC2019.msi product.wixobj -ext WixUIExtension +rem light.exe -ext WixUtilExtension -out RevitIFC2019.msi product.wixobj -ext WixUIExtension +rem light.exe -ext WixUtilExtension -out RevitIFC2018_18410.msi product.wixobj -ext WixUIExtension +light.exe -ext WixUtilExtension -out RevitIFC2018_18410.msi product.wixobj -ext WixUIExtension -copy RevitIFC2019.msi %1..\Releasex64 -del RevitIFC2019.msi +rem copy RevitIFC2019.msi %1..\Releasex64 +rem echo %1..\Releasex64\RevitIFC2019.msi -echo %1..\Releasex64\RevitIFC2019.msi +del "*.wix*" +del "Revit IFC for Revit 2018.msi" diff --git a/Revit.IFC.sln b/Revit.IFC.sln index 596f1ea5..73fde64c 100644 --- a/Revit.IFC.sln +++ b/Revit.IFC.sln @@ -1,12 +1,15 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.489 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Import", "Source\Revit.IFC.Import\Revit.IFC.Import.csproj", "{7F987D09-9716-4F50-ADE0-278E4B537101}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Export", "Source\Revit.IFC.Export\Revit.IFC.Export.csproj", "{BCE5141A-291B-4CD8-A69B-7B9345AA00E9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Revit.IFC.Common", "Source\Revit.IFC.Common\Revit.IFC.Common.csproj", "{032EA4DC-181F-4453-9F93-E08DE1C07D95}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFCExporterUI", "Source\IFCExporterUIOverride\IFCExporterUIOverride.csproj", "{BF694550-5BEB-4DCF-8EC2-A5904690DC17}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFCExporterUIOverride", "Source\IFCExporterUIOverride\IFCExporterUIOverride.csproj", "{BF694550-5BEB-4DCF-8EC2-A5904690DC17}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Install", "Install", "{88C55E9A-2767-48B7-A035-E3D864C4FF09}" EndProject @@ -79,8 +82,10 @@ Global GlobalSection(NestedProjects) = preSolution {7DFBD495-C588-4C7B-B8F6-5B793ADB06F2} = {88C55E9A-2767-48B7-A035-E3D864C4FF09} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A466EE46-9A7B-493D-A047-4F929CB6ADFA} + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection - EndGlobal diff --git a/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs b/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs index 5732da74..f1910818 100644 --- a/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs +++ b/Source/IFCExporterUIOverride/Properties/AssemblyInfo.cs @@ -71,5 +71,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("19.1.0.0")] -[assembly: AssemblyFileVersion("19.1.0.0")] +[assembly: AssemblyVersion("18.4.1.0")] +[assembly: AssemblyFileVersion("18.4.1.0")] diff --git a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs index 8801bf41..d01c7954 100644 --- a/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Common/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("19.1.0.0")] -[assembly: AssemblyFileVersion("19.1.0.0")] +[assembly: AssemblyVersion("18.4.1.0")] +[assembly: AssemblyFileVersion("18.4.1.0")] #region Using directives diff --git a/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs index 8bc2c6ad..20782f80 100644 --- a/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Export/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("19.1.0.0")] -[assembly: AssemblyFileVersion("19.1.0.0")] +[assembly: AssemblyVersion("18.4.1.0")] +[assembly: AssemblyFileVersion("18.4.1.0")] #region Using directives diff --git a/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs b/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs index 5391cae4..e9b6bee2 100644 --- a/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs +++ b/Source/Revit.IFC.Import/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("19.1.0.0")] -[assembly: AssemblyFileVersion("19.1.0.0")] +[assembly: AssemblyVersion("18.4.1.0")] +[assembly: AssemblyFileVersion("18.4.1.0")] #region Using directives From edbbf39ed0a80b48ed8046dd7650812e40fd6bf4 Mon Sep 17 00:00:00 2001 From: Jo64 Date: Mon, 29 Apr 2019 14:21:40 +0200 Subject: [PATCH 14/14] Update ProductCode/UpgradeCode to 2018 Update ProductCode/UpgradeCode to 2018 --- Install/RevitIFCSetupWix/Product.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Install/RevitIFCSetupWix/Product.wxs b/Install/RevitIFCSetupWix/Product.wxs index cc773af0..d576e33b 100644 --- a/Install/RevitIFCSetupWix/Product.wxs +++ b/Install/RevitIFCSetupWix/Product.wxs @@ -2,7 +2,7 @@ - +