Merge pull request #181 from NREL/develop

NREL · Aug 22, 2024 · f784348 · f784348
2 parents 1f6228b + d4c13df
commit f784348
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [1.2.2] - 2024-08-22
+- ruby 3.2.2 exists
+
 ## [1.2.1] - 2024-08-11
 - v1.2.0 performance regression
   - openstudio standards 0.6.1 patch

diff --git a/Rakefile b/Rakefile
@@ -38,13 +38,13 @@ end
 desc 'pre sign'
 task :presign do
 
-  unless File.exists?(OS_DIR)
+  unless File.exist?(OS_DIR)
     puts "#{OS_DIR} does not exist"
     exit 1
   end
 
   # dirs
-  FileUtils.rm_rf(PRESIGN_DIR) if File.exists?(PRESIGN_DIR)
+  FileUtils.rm_rf(PRESIGN_DIR) if File.exist?(PRESIGN_DIR)
   FileUtils.mkdir_p(PRESIGN_DIR)
   FileUtils.mkdir_p(File.join(PRESIGN_DIR, 'bin'))
   FileUtils.mkdir_p(File.join(PRESIGN_DIR, 'EnergyPlus'))

diff --git a/aip/OpenStudio CLI For Revit 2022.aip b/aip/OpenStudio CLI For Revit 2022.aip
@@ -9,10 +9,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="os.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="NREL"/>
-    <ROW Property="ProductCode" Value="1033:{1CE64411-C2E7-45C6-8B14-2FFF825C6E40} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{24F24DE5-BDCB-415C-929D-B8E52A319EB5} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="OpenStudio CLI For Revit 2022"/>
-    <ROW Property="ProductVersion" Value="1.2.1"/>
+    <ROW Property="ProductVersion" Value="1.2.2"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{932084BD-2149-42E4-BBEF-F4DE50BC83DF}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

diff --git a/aip/OpenStudio CLI For Revit 2023.aip b/aip/OpenStudio CLI For Revit 2023.aip
@@ -9,10 +9,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="os.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="NREL"/>
-    <ROW Property="ProductCode" Value="1033:{F557F91D-48A3-4942-A660-6C93403653BA} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{B39324F1-CD20-4AAF-8CD0-0325398C7EC9} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="OpenStudio CLI For Revit 2023"/>
-    <ROW Property="ProductVersion" Value="1.2.1"/>
+    <ROW Property="ProductVersion" Value="1.2.2"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{71BD412F-8A45-4B1F-831A-CDF14F4BFD92}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

diff --git a/aip/OpenStudio CLI For Revit 2024.aip b/aip/OpenStudio CLI For Revit 2024.aip
@@ -9,10 +9,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="os.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="NREL"/>
-    <ROW Property="ProductCode" Value="1033:{73E48CDE-BA0F-4C8E-A499-DA5F7801B867} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{7C1F76CA-1A84-4D38-95E0-33E8DABD0FC5} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="OpenStudio CLI For Revit 2024"/>
-    <ROW Property="ProductVersion" Value="1.2.1"/>
+    <ROW Property="ProductVersion" Value="1.2.2"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{89E88DC9-8FB5-499D-B18D-9809F02C5407}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

diff --git a/aip/OpenStudio CLI For Revit 2025.aip b/aip/OpenStudio CLI For Revit 2025.aip
@@ -9,10 +9,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="os.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="NREL"/>
-    <ROW Property="ProductCode" Value="1033:{425026B4-715B-4AD4-91C1-9B5A2955217A} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{3720F934-BDAC-45FE-9558-970D8D058B67} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="OpenStudio CLI For Revit 2025"/>
-    <ROW Property="ProductVersion" Value="1.2.1"/>
+    <ROW Property="ProductVersion" Value="1.2.2"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{0AAD0845-2DF8-489C-8FCD-C65CF5F147E7}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

diff --git a/aip/OpenStudio CLI For Revit 2026.aip b/aip/OpenStudio CLI For Revit 2026.aip
@@ -9,10 +9,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="os.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="NREL"/>
-    <ROW Property="ProductCode" Value="1033:{2752AB89-3237-4915-98E5-0A981303837A} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{21CAF018-C312-493D-A076-0CCB26E28E0A} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="OpenStudio CLI For Revit 2026"/>
-    <ROW Property="ProductVersion" Value="1.2.1"/>
+    <ROW Property="ProductVersion" Value="1.2.2"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{C045639B-9AC7-4770-9CF2-6DAD8A702EBC}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

diff --git a/measures/systems_analysis_report_generator/measure.rb b/measures/systems_analysis_report_generator/measure.rb
@@ -86,7 +86,7 @@ def self.get_config_path(runner)
     file_path = runner.workflow.findFile('reportConfig.json')
     unless file_path.empty?
       file_path = file_path.get if file_path.is_initialized
-      return file_path.to_s if File.exists? file_path.to_s
+      return file_path.to_s if File.exist? file_path.to_s
     else
       runner.registerWarning("Could not find reportConfig.json in root. Using default configuration instead")
     end