Merge branch 'rel-9.3' into bugfix/bump-dependencies

Author: maliming

.github/ISSUE_TEMPLATE/03_studio.yml

@@ -0,0 +1,94 @@
+name: 🤠 ABP Studio
+description: Create a report to help us improve the ABP Studio
+labels: [studio]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        We welcome bug reports! This template will help us gather the information we need to start the triage process.
+        
+        Please keep in mind that the GitHub issue tracker is not intended as a general support forum, but for reporting **non-security** bugs and feature requests.
+        If you believe you have an issue that affects the SECURITY of the platform, please do NOT create an issue and instead email your issue details to [email protected].
+        For other types of questions, consider using [StackOverflow](https://stackoverflow.com/questions/tagged/abp).
+  - type: checkboxes
+    id: searched
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered or feature request ([abp/issues](https://github.com/abpframework/abp/issues?q=is%3Aopen+is%3Aissue+label%3Astudio)).
+      options:
+      - label: I have searched the existing issues
+        required: true
+  - type: textarea
+    id: background
+    attributes:
+      label: Description
+      description: Please share a clear and concise description of the problem.
+      placeholder: Description
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        ## Setup
+        Please provide more information on your ABP Studio setup.
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Which version of ABP Studio are you using?
+      placeholder: Version
+    validations:
+      required: true
+  - type: dropdown
+    id: Operation-System
+    attributes:
+      label: Operation System
+      description: What is the operation system of the computer?
+      options:
+        - Windows (Default)
+        - Linux
+        - macOS
+        - Others
+    validations:
+      required: true
+  - type: textarea
+    id: solution-config
+    attributes:
+      label: Solution Configuration
+      description: |
+        If there is an open solution, what are the configurations of the solution? 
+        🧐 Hint: You can see all the information about your solution from the configuration window, which opens when you right-click on the [solution](https://abp.io/docs/latest/studio/solution-explorer#solution) and click on the `Solution Configuration` button.
+      placeholder: |
+        - **Template**: app
+        - **Created ABP Studio Version**: 0.7.9
+        - **Tiered**: No
+        - **UI Framework**: mvc
+        - **Theme**: leptonx
+        - **Theme Style**: system
+        - **Database Provider**: ef
+        - **Database Management System**: sqlserver
+        - **Separate Tenant Schema**: No
+        - **Mobile Framework**: none
+        - **Public Website**: No
+        - **Optional Modules**:
+          * GDPR
+          * TextTemplateManagement
+          * LanguageManagement
+          * AuditLogging
+          * SaaS
+          * OpenIddictAdmin
+    validations:
+      required: false      
+  - type: markdown
+    attributes:
+      value: |
+        ---
+  - type: textarea
+    id: other-info
+    attributes:
+      label: Other information
+      description: |
+        If you have an idea where the problem might lie, let us know that here. Please include any pointers to code, relevant changes, or related issues you know of.
+      placeholder: Other information
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/03_article_request.yml renamed to .github/ISSUE_TEMPLATE/04_article_request.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: Issue with ABP Commercial
     url:  https://abp.io/support/questions

.github/ISSUE_TEMPLATE/04_performance_issue.md renamed to .github/ISSUE_TEMPLATE/05_performance_issue.md

@@ -1,54 +1,79 @@
 import os
 import json
+import re
+import xml.etree.ElementTree as ET
 from github import Github
 
-def update_latest_versions():
-    version = os.environ["GITHUB_REF"].split("/")[-1]
+def get_target_release_branch(version):
+    """ 
+    Extracts the first two numbers from the release version (`9.0.5` → `rel-9.0`) 
+    to determine the corresponding `rel-x.x` branch.
+    """
+    match = re.match(r"(\d+)\.(\d+)\.\d+", version)
+    if not match:
+        raise ValueError(f"Invalid version format: {version}")
 
-    if "rc" in version:
-        return False
+    major, minor = match.groups()
+    target_branch = f"rel-{major}.{minor}"
+    return target_branch
 
-    with open("latest-versions.json", "r") as f:
-        latest_versions = json.load(f)
+def get_version_from_common_props(branch):
+    """ 
+    Retrieves `Version` and `LeptonXVersion` from the `common.props` file in the specified branch. 
+    """
+    g = Github(os.environ["GITHUB_TOKEN"])
+    repo = g.get_repo("abpframework/abp")
 
-    latest_versions[0]["version"] = version
+    try:
+        file_content = repo.get_contents("common.props", ref=branch)
+        common_props_content = file_content.decoded_content.decode("utf-8")
 
-    with open("latest-versions.json", "w") as f:
-        json.dump(latest_versions, f, indent=2)
+        root = ET.fromstring(common_props_content)
+        version = root.find(".//Version").text
+        leptonx_version = root.find(".//LeptonXVersion").text
 
-    return True
+        return version, leptonx_version
+    except Exception as e:
+        raise FileNotFoundError(f"common.props not found in branch {branch}: {e}")
 
-def create_pr():
-    g = Github(os.environ["GITHUB_TOKEN"])
-    repo = g.get_repo("abpframework/abp")
+def update_latest_versions():
+    """ 
+    Updates `latest-versions.json` based on the most relevant release branch. 
+    """
+    # Get the release version from GitHub reference
+    release_version = os.environ["GITHUB_REF"].split("/")[-1]  # Example: "refs/tags/v9.0.5" → "v9.0.5"
+    if release_version.startswith("v"):
+        release_version = release_version[1:]  # Convert to "9.0.5" format
 
-    branch_name = f"update-latest-versions-{os.environ['GITHUB_REF'].split('/')[-1]}"
-    base = repo.get_branch("dev")
-    repo.create_git_ref(ref=f"refs/heads/{branch_name}", sha=base.commit.sha)
+    # Determine the correct `rel-x.x` branch
+    target_branch = get_target_release_branch(release_version)
+    
+    # Retrieve `common.props` data from the target branch
+    version, leptonx_version = get_version_from_common_props(target_branch)
 
-    # Get the current latest-versions.json file and its sha
-    contents = repo.get_contents("latest-versions.json", ref="dev")
-    file_sha = contents.sha
+    # Skip if the version is a preview or release candidate
+    if "preview" in version or "rc" in version:
+        return False
 
-    # Update the file in the repo
-    repo.update_file(
-        path="latest-versions.json",
-        message=f"Update latest-versions.json to version {os.environ['GITHUB_REF'].split('/')[-1]}",
-        content=open("latest-versions.json", "r").read().encode("utf-8"),
-        sha=file_sha,
-        branch=branch_name,
-    )
+    # Read the `latest-versions.json` file
+    with open("latest-versions.json", "r") as f:
+        latest_versions = json.load(f)
 
-    try:
-        pr = repo.create_pull(title="Update latest-versions.json",
-                        body="Automated PR to update the latest-versions.json file.",
-                        head=branch_name, base="dev")
-    except Exception as e:
-        print(f"Error while creating PR: {e}")
+    # Add the new version entry
+    new_version_entry = {
+        "version": version,
+        "releaseDate": "",
+        "type": "stable",
+        "message": "",
+        "leptonx": {
+            "version": leptonx_version
+        }
+    }
+    
+    latest_versions.insert(0, new_version_entry)  # Insert the new version at the top
 
-    pr.create_review_request(reviewers=["ebicoglu", "gizemmutukurt", "skoc10"])
+    # Update the file
+    with open("latest-versions.json", "w") as f:
+        json.dump(latest_versions, f, indent=2)
 
-if __name__ == "__main__":
-    should_create_pr = update_latest_versions()
-    if should_create_pr:
-        create_pr()
+    return True

.github/ISSUE_TEMPLATE/05_blank_issue.md renamed to .github/ISSUE_TEMPLATE/06_blank_issue.md

@@ -27,12 +27,12 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: 'npm/ng-packs/node_modules'
           key: ${{ runner.os }}-${{ hashFiles('npm/ng-packs/yarn.lock') }}
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: 'templates/app/angular/node_modules'
           key: ${{ runner.os }}-${{ hashFiles('templates/app/angular/yarn.lock') }}

.github/ISSUE_TEMPLATE/config.yml

@@ -1,31 +1,31 @@
-name: Merge branch rel-9.0 with rel-8.3
+name: Merge branch dev with rel-9.3
 on:
   push:
     branches:
-      - rel-8.3
+      - rel-9.3
 permissions:
   contents: read
 
 jobs:
-  merge-rel-9-0-with-rel-8-3:
+  merge-dev-with-rel-9-3:
     permissions:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: rel-9.0
+          ref: dev
       - name: Reset promotion branch
         run: |
-          git fetch origin rel-8.3:rel-8.3
-          git reset --hard rel-8.3
+          git fetch origin rel-9.3:rel-9.3
+          git reset --hard rel-9.3
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          branch: auto-merge/rel-8-3/${{github.run_number}}
-          title: Merge branch rel-9.0 with rel-8.3
-          body: This PR generated automatically to merge rel-9.0 with rel-8.3. Please review the changed files before merging to prevent any errors that may occur.
+          branch: auto-merge/rel-9-3/${{github.run_number}}
+          title: Merge branch dev with rel-9.3
+          body: This PR generated automatically to merge dev with rel-9.3. Please review the changed files before merging to prevent any errors that may occur.
           reviewers: maliming
           draft: true
           token: ${{ github.token }}
@@ -34,5 +34,5 @@ jobs:
           GH_TOKEN: ${{ secrets.BOT_SECRET }}
         run: |
           gh pr ready
-          gh pr review auto-merge/rel-8-3/${{github.run_number}} --approve
-          gh pr merge auto-merge/rel-8-3/${{github.run_number}} --merge --auto --delete-branch
+          gh pr review auto-merge/rel-9-3/${{github.run_number}} --approve
+          gh pr merge auto-merge/rel-9-3/${{github.run_number}} --merge --auto --delete-branch

.github/scripts/update_versions.py

@@ -18,6 +18,7 @@ on:
       - 'templates/**/*.razor'
       - 'Directory.Build.props'
       - 'Directory.Packages.props'
+      - '.github/workflows/build-and-test.yml'
 
   pull_request:
     paths:
@@ -35,6 +36,7 @@ on:
       - 'templates/**/*.razor'
       - 'Directory.Build.props'
       - 'Directory.Packages.props'
+      - '.github/workflows/build-and-test.yml'
     types:
       - opened
       - synchronize
@@ -45,17 +47,14 @@ permissions:
 
 jobs:
   build-test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    timeout-minutes: 50
     if: ${{ !github.event.pull_request.draft }}
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-dotnet@master
       with:
-        dotnet-version: 8.0.100
-
-    - name: chown
-      run: |
-        sudo chown -R $USER:$USER /home/runneradmin
+        dotnet-version: 9.0.100
 
     - name: Build All
       run: ./build-all.ps1

.github/workflows/angular.yml

@@ -1,3 +1,3 @@
 ## Contribution
 
-See the [contribution guide](docs/en/Contribution/Index.md).
+The contribution guide is available at [contribution guide](docs/en/contribution/index.md).