Merge pull request #5588 from NREL/develop

v3.11.0 Release

Author: anchapin

.bundle/config

@@ -0,0 +1,6 @@
+---
+BUNDLE_WITHOUT: "development"
+BUNDLE_JOBS: "4"
+BUNDLE_RETRY: "5"
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_TIMEOUT: "60"

.git-blame-ignore-revs

@@ -157,3 +157,7 @@ b3d2e94e3ae1160f447af2035a1ffabaec4b3423
 
 # [chore] Copyright cleanup [Julien Marrec, 2025-01-14]
 ae602de89105983bf762cf1e6afd33d63d81b4a6
+
+# [chore] Org and copyright year updates for OS 311 [David Goldwasser, 2026-01-05]
+7a409fb41f6b0602ef2a6a018c9b3d33934571af
+3c5a13b05d17ad83bca6ee84ca130b5c1c7f1dda

.github/ISSUE_TEMPLATE/01-bug-report.yml

@@ -0,0 +1,157 @@
+name: Bug Report
+description: Use this template for reporting an issue.
+labels: Triage
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to submit a report.
+        Include all applicable information to help us reproduce
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Provide a general summary of the issue .
+      placeholder: When trying to connect a CoilCoolingDXSingleSpeed to an AirLoopHVAC, I get a crash
+    validations:
+      required: true
+
+  - type: textarea
+    id: current_behavior
+    attributes:
+      label: Current Behavior
+      description: Tell us what happens instead of the expected behavior.
+      placeholder: When trying to do X, I get Y
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected_behavior
+    attributes:
+      label: Expected Behavior
+      description: Tell us what happens instead of the expected behavior.
+      placeholder: What I get instead is Z
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Provide an unambiguous set of steps to reproduce this bug.
+
+        Provide a OSM model that has the bug and/or code (Ruby, Python) to reproduce.
+
+        You **can supply a link to your OSM if applicable**, or rename it to in.osm.txt and upload it directly here by drag and drop.
+        Ideally, make it a _Minimum, Complete, Verifiable, Example (MCVE)_ by including the smallest possible number of input objects to reproduce the defect.
+
+      placeholder: |
+        1. Create a '...'
+        2. Connect it to '....'
+        3. See error
+      value: |
+        1.
+        2.
+        3.
+        4.
+
+        or
+
+        ```ruby
+        require 'openstudio'
+        include OpenStudio::Model
+        m = Model.new
+        # m = Model.load('path/to/model.osm').get
+        [...]
+        ```
+    validations:
+      required: true
+
+  - type: textarea
+    id: possible_solution
+    attributes:
+      label: Possible Solution
+      description: |
+        Optional, but if you can, suggest a fix/reason for the bug
+    validations:
+      required: false
+
+  - type: dropdown
+    id: operating_system_multiple
+    attributes:
+      label: Operating System affected
+      multiple: true
+      description: You may select more than one.
+      options:
+        - All
+        - macOS x86_64
+        - macOS arm64
+        - Ubuntu 22.04
+        - Ubuntu 24.04
+        - Windows 10
+        - Windows 11
+
+  - type: textarea
+    id: env
+    attributes:
+      label: Environment
+      description: |
+        Some additional details about your environment for this issue (if relevant)
+
+        To get your platform info, you can run the following commands in your terminal
+
+        <details>
+
+        <summary>Helpers: click to expand</summary>
+
+        * Linux:
+
+        ```bash
+        echo "* Platform (Operating system, version, architecture): **$(lsb_release -is) $(lsb_release -rs) $(uname -m)**"
+        ```
+
+        * macOS:
+
+        ```bash
+        echo "* Platform (Operating system, version, architecture): **$(sw_vers -productName) $(sw_vers -productVersion) $(uname -m)**"
+        ```
+
+        * Windows (PowerShell):
+
+        ```powershell
+        $os = Get-CimInstance Win32_OperatingSystem
+        $release = (Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion").DisplayVersion
+        Write-Output "* Platform (Operating system, version, architecture): **$($os.Caption) $($os.Version) $release $env:PROCESSOR_ARCHITECTURE**"
+        ```
+        </details>
+
+      placeholder: |
+        * Platform (Operating system, version, architecture): **Linux Ubuntu 24.04**
+        or
+        N/A
+    validations:
+      required: true
+
+  - type: input
+    id: os_version
+    attributes:
+      label: Version of OpenStudio
+      description: |
+        Version of OpenStudio (if using an intermediate build, include SHA). `openstudio --version`
+      placeholder: |
+        3.10.0+86d7e215a1
+    validations:
+      required: true
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Context
+      description: |
+        How has this issue affected you? What are you trying to accomplish?
+        Any link to related issues or UnmetHours post?
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/02-enhancement-request.yml

@@ -0,0 +1,38 @@
+name: Enhancement Request
+description: Use this template for suggesting an enhancement.
+labels: Triage, Enhancement Request
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to submit a report.
+        Include all applicable information to help us reproduce.
+
+  - type: textarea
+    id: summary
+    attributes:
+      label: General Summary
+      description: |
+        Provide a general summary of the feature you would like to see implemented
+    validations:
+      required: true
+
+  - type: textarea
+    id: details
+    attributes:
+      label: Detailed Description
+      description: |
+        Provide a detailed description of the change or addition you are proposing.
+
+        Include screenshots, schemas, OSM/IDD snippets as appropriate.
+    validations:
+      required: true
+
+  - type: textarea
+    id: implementation
+    attributes:
+      label: Possible Implementation
+      description: |
+        Not mandatory, but if you can, suggest an idea for implementing the feature
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Unmet Hours
+    url: https://unmethours.com
+    about: "Ask modeling **questions** on unmethours.com"

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,2 @@
+@ECHO OFF
+node code-signing.js %1

.github/ISSUE_TEMPLATE/enhancement_request.md

@@ -7,7 +7,8 @@ on:
     tags:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
   pull_request:
-    branches: [ master ]
+    branches: [ master, CSharp ]
+    types: [ opened, reopened, synchronize ]
   workflow_dispatch:
 
 env:
@@ -17,6 +18,9 @@ jobs:
   build-csharp:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
+    if: |
+      github.event_name == 'push' ||
+      (github.event_name == 'pull_request' && (github.base_ref == 'master' || github.base_ref == 'CSharp'))
     strategy:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
@@ -26,7 +30,7 @@ jobs:
         - name: Ubuntu
           os: ubuntu-22.04
         - name: macOS
-          os: macos-13
+          os: macos-15-intel
         - name: macOS_arm64
           os: macos-14
         - name: Windows64
@@ -156,14 +160,14 @@ jobs:
 
         cmake --list-presets
         echo "::group::CMake Configure"
-        call ./build/conanbuild.bat
+        call build\conanbuild.bat
         cmake --preset conan-default ^
               -DBUILD_CSHARP_BINDINGS:BOOL=ON  -DBUILD_NUGET_PACKAGE:BOOL=OFF ^
               -DBUILD_TESTING:BOOL=OFF -DBUILD_RUBY_BINDINGS:BOOL=OFF -DBUILD_PYTHON_BINDINGS:BOOL=OFF -DBUILD_CLI:BOOL=OFF
         echo "::engroup::"
 
         echo "::group::Build"
-        cmake --build --preset conan-release
+        cmake --build --preset conan-release --config Release
         echo "::engroup::"
 
     - name: Install Dotnet x86
@@ -178,18 +182,19 @@ jobs:
       shell: cmd
       run: |
         echo "::group::Conan Install"
-        conan install . --output-folder=./build --build=missing -c tools.cmake.cmaketoolchain:generator="Visual Studio 17 2022" -s compiler.cppstd=20 -s build_type=${{ env.BUILD_TYPE }} -o with_testing=False -o with_benchmark=False -o with_ruby=False -o with_python=False -o with_csharp=True -s:b arch=x86_64 -s:h arch=x86
+        conan install . --output-folder=./build --build=missing -c tools.cmake.cmaketoolchain:generator="Visual Studio 17 2022" -s compiler.cppstd=20 -s build_type=${{ env.BUILD_TYPE }} -o with_testing=False -o with_benchmark=False -o with_ruby=False -o with_python=False -o with_csharp=True -s:b arch=x86_64 -s:h arch=x86 -c "antlr4-cppruntime/*:tools.build:cxxflags+=/FIchrono"
         echo "::engroup::"
 
+        cmake --list-presets
         echo "::group::CMake Configure"
-        call ./build/conanbuild.bat
+        call build\conanbuild.bat
         cmake --preset conan-default ^
               -DBUILD_CSHARP_BINDINGS:BOOL=ON  -DBUILD_NUGET_PACKAGE:BOOL=OFF ^
               -DBUILD_TESTING:BOOL=OFF -DBUILD_RUBY_BINDINGS:BOOL=OFF -DBUILD_PYTHON_BINDINGS:BOOL=OFF -DBUILD_CLI:BOOL=OFF
         echo "::engroup::"
 
         echo "::group::Build"
-        cmake --build --preset conan-release
+        cmake --build --preset conan-release --config Release
         echo "::engroup::"
 
     - name: build nuget for Windows
@@ -361,7 +366,7 @@ jobs:
           os: ubuntu-latest
           arch: x64
         - name: macOS
-          os: macos-13
+          os: macos-15-intel
           arch: x64
         - name: macOS_arm64
           os: macos-14