Skip to content

Commit a9ecc80

Browse files
al-fisheral-fisher
authored
Merge pull request #233 from BHoM/develop
8.1 Deployment
2 parents 71cc17e + ed47aac commit a9ecc80

File tree

6 files changed

+33
-40
lines changed

6 files changed

+33
-40
lines changed

‎BHoM_Installer/BHoM_Installer.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
66
<MajorVersion Condition=" '$(MajorVersion)' == '' ">8</MajorVersion>
7-
<MinorVersion Condition=" '$(MinorVersion)' == '' ">0</MinorVersion>
7+
<MinorVersion Condition=" '$(MinorVersion)' == '' ">1</MinorVersion>
88
<VersionSuffix>
99
</VersionSuffix>
1010
<ProductVersion>$(MajorVersion).$(MinorVersion)</ProductVersion>

‎IncludedRepos/altConfigs.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
BHoM/Revit_Toolkit/Release2020
21
BHoM/Revit_Toolkit/Release2021
32
BHoM/Revit_Toolkit/Release2022
43
BHoM/Revit_Toolkit/Release2023
54
BHoM/Revit_Toolkit/Release2024
5+
BHoM/Revit_Toolkit/Release2025
66
BHoM/ETABS_Toolkit/Release
77
BHoM/ETABS_Toolkit/Release16
88
BHoM/ETABS_Toolkit/Release17
@@ -14,4 +14,5 @@ BHoM/Lusas_Toolkit/Release200
1414
BHoM/Lusas_Toolkit/Release210
1515
BHoM/Lusas_Toolkit/Release211
1616
BHoM/GSA_Toolkit/Release87
17-
BHoM/GSA_Toolkit/Release101
17+
BHoM/GSA_Toolkit/Release101
18+
BHoM/GSA_Toolkit/Release102

‎InstallerCore/Components.wxs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@
2424
</Component>
2525
</ComponentGroup>
2626

27-
<ComponentGroup Id="Revit2020" Directory="R2020DIR">
28-
<Component Id="RevitAddin2020">
29-
<File Source="..\..\Revit_Toolkit\Revit_Core_Adapter\Listener\Files\BHoM_2020.Addin" />
30-
<util:RemoveFolderEx On="install" Property="R2020BHoMFolder" />
31-
<RemoveFile On="install" Id="RemoveLegacyAddin20" Name="BHoM.Addin"/>
32-
</Component>
33-
</ComponentGroup>
34-
3527
<ComponentGroup Id="Revit2021" Directory="R2021DIR">
3628
<Component Id="RevitAddin2021">
3729
<File Source="..\..\Revit_Toolkit\Revit_Core_Adapter\Listener\Files\BHoM_2021.Addin" />
@@ -64,6 +56,14 @@
6456
</Component>
6557
</ComponentGroup>
6658

59+
<ComponentGroup Id="Revit2025" Directory="R2025DIR">
60+
<Component Id="RevitAddin2025">
61+
<File Source="..\..\Revit_Toolkit\Revit_Core_Adapter\Listener\Files\BHoM_2025.Addin" />
62+
<util:RemoveFolderEx On="install" Property="R2025BHoMFolder" />
63+
<RemoveFile On="install" Id="RemoveLegacyAddin25" Name="BHoM.Addin"/>
64+
</Component>
65+
</ComponentGroup>
66+
6767
<ComponentGroup Id="Core" Directory="INSTALLFOLDER">
6868
<Component Id="CleanExisting">
6969
<RegistryKey Root="HKCU" Key="Software\BHoM">
@@ -95,12 +95,6 @@
9595
</Component>
9696
</ComponentGroup>
9797

98-
<ComponentGroup Id="RevitSettingsConfig2020" Directory="REVITSETTINGSDIR2020">
99-
<Component Id="RevitSettingsConfig2020" Guid="3a68c387-b031-4aa1-affe-eb2c25d80322">
100-
<CreateFolder />
101-
</Component>
102-
</ComponentGroup>
103-
10498
<ComponentGroup Id="RevitSettingsConfig2021" Directory="REVITSETTINGSDIR2021">
10599
<Component Id="RevitSettingsConfig2021" Guid="9043f36a-d1fb-4b38-aecc-85c758126c3b">
106100
<CreateFolder />
@@ -125,6 +119,12 @@
125119
</Component>
126120
</ComponentGroup>
127121

122+
<ComponentGroup Id="RevitSettingsConfig2025" Directory="REVITSETTINGSDIR2025">
123+
<Component Id="RevitSettingsConfig2025" Guid="81e438a0-8674-4341-93f2-a8a820206817">
124+
<CreateFolder />
125+
</Component>
126+
</ComponentGroup>
127+
128128
<ComponentGroup Id="ExtensionsConfig" Directory="EXTENSIONSDIR">
129129
<Component Id="ExtensionsConfig" Guid="b8cd0c91-2ebc-4bd6-ad2b-1e28fc9e6ad3">
130130
<CreateFolder />
@@ -136,12 +136,6 @@
136136
<CreateFolder />
137137
</Component>
138138
</ComponentGroup>
139-
140-
<ComponentGroup Id="RevitExtensionsConfig2020" Directory="REVITEXTENSIONSDIR2020">
141-
<Component Id="RevitExtensionsConfig2020" Guid="7420bd67-66e4-42ce-a00d-59c3b9884f05">
142-
<CreateFolder />
143-
</Component>
144-
</ComponentGroup>
145139

146140
<ComponentGroup Id="RevitExtensionsConfig2021" Directory="REVITEXTENSIONSDIR2021">
147141
<Component Id="RevitExtensionsConfig2021" Guid="e963fd78-a358-43f0-959c-243c4e77de1d">
@@ -167,6 +161,12 @@
167161
</Component>
168162
</ComponentGroup>
169163

164+
<ComponentGroup Id="RevitExtensionsConfig2025" Directory="REVITEXTENSIONSDIR2025">
165+
<Component Id="RevitExtensionsConfig2025" Guid="7a65f759-009b-4f87-8a9b-2cb36ed207ef">
166+
<CreateFolder />
167+
</Component>
168+
</ComponentGroup>
169+
170170
<ComponentGroup Id="ResourcesConfig" Directory="RESOURCESDIR">
171171
<Component Id="ResourcesConfig" Guid="922ede0a-a035-41e4-adb1-642992cc756a">
172172
<CreateFolder />

‎InstallerCore/CustomActions.wxs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@
2222
<CustomAction Id="Action_CloseAppsPrompt" BinaryKey="InstallerCA.CA.dll" DllEntry="ClosePrompt" Return="check" />
2323

2424
<SetProperty Id="GHBHoMFolder" Value="[GHBHOMDIR]" Before="CostInitialize" />
25-
<SetProperty Id="R2018BHoMFolder" Value="[R2018BHOMDIR]" Before="CostInitialize" />
26-
<SetProperty Id="R2019BHoMFolder" Value="[R2019BHOMDIR]" Before="CostInitialize" />
27-
<SetProperty Id="R2020BHoMFolder" Value="[R2020BHOMDIR]" Before="CostInitialize" />
2825
<SetProperty Id="R2021BHoMFolder" Value="[R2021BHOMDIR]" Before="CostInitialize" />
2926
<SetProperty Id="R2022BHoMFolder" Value="[R2022BHOMDIR]" Before="CostInitialize" />
3027
<SetProperty Id="R2023BHoMFolder" Value="[R2023BHOMDIR]" Before="CostInitialize" />
3128
<SetProperty Id="R2024BHoMFolder" Value="[R2024BHOMDIR]" Before="CostInitialize" />
29+
<SetProperty Id="R2025BHoMFolder" Value="[R2025BHOMDIR]" Before="CostInitialize" />
3230

3331
</Fragment>
3432
</Wix>

‎InstallerCore/Directories.wxs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@
1010
<Directory Id="SETTINGSDIR" Name="Settings">
1111
<Directory Id="PYTHONSETTINGSDIR" Name="Python" />
1212
<Directory Id="REVITSETTINGSDIR" Name="Revit">
13-
<Directory Id="REVITSETTINGSDIR2020" Name="2020" />
1413
<Directory Id="REVITSETTINGSDIR2021" Name="2021" />
1514
<Directory Id="REVITSETTINGSDIR2022" Name="2022" />
1615
<Directory Id="REVITSETTINGSDIR2023" Name="2023" />
1716
<Directory Id="REVITSETTINGSDIR2024" Name="2024" />
17+
<Directory Id="REVITSETTINGSDIR2025" Name="2025" />
1818
</Directory>
1919
</Directory>
2020
<Directory Id="LOGSDIR" Name="Logs" />
2121
<Directory Id="EXTENSIONSDIR" Name="Extensions">
2222
<Directory Id="PYTHONCODEDIR" Name="PythonCode" />
2323
<Directory Id="REVITEXTENSIONSDIR" Name="Revit">
24-
<Directory Id="REVITEXTENSIONSDIR2020" Name="2020" />
2524
<Directory Id="REVITEXTENSIONSDIR2021" Name="2021" />
2625
<Directory Id="REVITEXTENSIONSDIR2022" Name="2022" />
2726
<Directory Id="REVITEXTENSIONSDIR2023" Name="2023" />
2827
<Directory Id="REVITEXTENSIONSDIR2024" Name="2024" />
28+
<Directory Id="REVITEXTENSIONSDIR2025" Name="2025" />
2929
</Directory>
3030
</Directory>
3131

@@ -49,15 +49,6 @@
4949
<Directory Id="AUTODESKDIR" Name="Autodesk" >
5050
<Directory Id="REVITDIR" Name="Revit">
5151
<Directory Id="REVITADDINSDIR" Name="Addins">
52-
<Directory Id="R2018DIR" Name="2018">
53-
<Directory Id="R2018BHOMDIR" Name="BHoM" />
54-
</Directory>
55-
<Directory Id="R2019DIR" Name="2019">
56-
<Directory Id="R2019BHOMDIR" Name="BHoM" />
57-
</Directory>
58-
<Directory Id="R2020DIR" Name="2020">
59-
<Directory Id="R2020BHOMDIR" Name="BHoM" />
60-
</Directory>
6152
<Directory Id="R2021DIR" Name="2021">
6253
<Directory Id="R2021BHOMDIR" Name="BHoM" />
6354
</Directory>
@@ -70,6 +61,9 @@
7061
<Directory Id="R2024DIR" Name="2024">
7162
<Directory Id="R2024BHOMDIR" Name="BHoM" />
7263
</Directory>
64+
<Directory Id="R2025DIR" Name="2025">
65+
<Directory Id="R2025BHOMDIR" Name="BHoM" />
66+
</Directory>
7367
</Directory>
7468
</Directory>
7569
</Directory>

‎InstallerCore/Features.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,31 @@
3333
</Feature>
3434

3535
<Feature Id="RevitPlugin" Title="Revit Plugin" Level="1">
36-
<ComponentGroupRef Id="Revit2020" />
3736
<ComponentGroupRef Id="Revit2021" />
3837
<ComponentGroupRef Id="Revit2022" />
3938
<ComponentGroupRef Id="Revit2023" />
4039
<ComponentGroupRef Id="Revit2024" />
40+
<ComponentGroupRef Id="Revit2025" />
4141
</Feature>
4242

4343
<Feature Id="Settings" Title="Settings" Level="1">
4444
<ComponentGroupRef Id="SettingsConfig" />
4545
<ComponentGroupRef Id="RevitSettingsConfig" />
46-
<ComponentGroupRef Id="RevitSettingsConfig2020" />
4746
<ComponentGroupRef Id="RevitSettingsConfig2021" />
4847
<ComponentGroupRef Id="RevitSettingsConfig2022" />
4948
<ComponentGroupRef Id="RevitSettingsConfig2023" />
5049
<ComponentGroupRef Id="RevitSettingsConfig2024" />
50+
<ComponentGroupRef Id="RevitSettingsConfig2025" />
5151
</Feature>
5252

5353
<Feature Id="Extensions" Title="Extensions" Level="1">
5454
<ComponentGroupRef Id="ExtensionsConfig" />
5555
<ComponentGroupRef Id="RevitExtensionsConfig" />
56-
<ComponentGroupRef Id="RevitExtensionsConfig2020" />
5756
<ComponentGroupRef Id="RevitExtensionsConfig2021" />
5857
<ComponentGroupRef Id="RevitExtensionsConfig2022" />
5958
<ComponentGroupRef Id="RevitExtensionsConfig2023" />
6059
<ComponentGroupRef Id="RevitExtensionsConfig2024" />
60+
<ComponentGroupRef Id="RevitExtensionsConfig2025" />
6161
</Feature>
6262
</FeatureGroup>
6363

0 commit comments

Comments
 (0)