resolving merge conflicts

Author: Theresa Lehr

.github/workflows/release-please-master.yml

@@ -1,21 +1,63 @@
+<<<<<<< HEAD
+=======
+## -----------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+## -----------------------------------------------------------------------------
+#
+# Summary:
+# This GitHub Actions workflow automates the release process using Release Please.
+# It triggers on pushes to the main branch, generates a GitHub App token using organization
+# variables and secrets, and then runs the release-please-action to manage versioning and changelogs.
+
+>>>>>>> dev
 name: Release Please for Master
 
 on:
   push:
     branches:
       - dev  # Trigger when dev is updated
+  workflow_dispatch:  # Allow manual triggering from GitHub UI
+    inputs:
+      reason:
+        description: 'Reason for manual trigger'
+        required: false
+        default: 'Manual release trigger'
+      dry_run:
+        description: 'Perform dry run (no actual release)'
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   release-please-master:
     runs-on: ubuntu-latest
     steps:
+      - name: Log manual trigger details
+        if: github.event_name == 'workflow_dispatch'
+        run: |
+          echo "Manual trigger initiated"
+          echo "Reason: ${{ github.event.inputs.reason }}"
+          echo "Dry run: ${{ github.event.inputs.dry_run }}"
+          echo "Triggered by: ${{ github.actor }}"
+
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ vars.RELEASE_PLEASE_TOKEN_PROVIDER_APP_ID }}
+          private-key: ${{ secrets.RELEASE_PLEASE_TOKEN_PROVIDER_PEM }}
 
-      - name: Run Release Please for Master
+      - name: Release Please
         uses: googleapis/release-please-action@v4
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          target-branch: master
+          token: ${{ steps.app-token.outputs.token }}
           config-file: release-please-config.json
-          manifest-file: .release-please-manifest.json
+          manifest-file: .release-please-manifest.json
+          manifest: true
+          primaryBranch: dev
+          handleGHRelease: true
+          dry-run: ${{ github.event.inputs.dry_run == 'true' }}

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "11.1.3"
+    ".": "11.1.4"
 }

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [11.1.4](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/compare/v11.1.3...v11.1.4) (2025-10-27)
+
+
+### Bug Fixes
+
+* dummy--readme updates ([#3986](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/issues/3986)) ([aab4e11](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/commit/aab4e117ad4b8f4bf002a2ce2c428cecbe1b9a85))
+* upgrading axios version inside tarbell ([#3985](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/issues/3985)) ([f7b1424](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/commit/f7b1424e5b0bc634185c6a467e2bb9f815a6ddb9))
+
 ## [11.1.3](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/compare/v11.1.2...v11.1.3) (2025-07-10)
 
 

README.md

@@ -13,7 +13,8 @@ The Graph Explorer is written in [TypeScript](https://www.typescriptlang.org/) a
 
 Microsoft Graph Explorer is built and developed using node v18.
 
-- `npm install` to install project dependencies. `npm` is installed by default with [Node.js](https://nodejs.org/).
+- `npm install` to install project dependencies. `npm` is installed by default with [Node.js](https://nodejs.org/). If you have issues with packages, try using Node version 18.20.0 locally when you try to run.
+- `npm run build` to build the project.
 - `npm start` starts the TypeScript compiler in watch mode and the local server. It should open your browser automatically with the Graph Explorer at [http://localhost:3000/](http://localhost:3000).
 
 ### Enabling authentication with your own credentials

package-lock.json

@@ -1,6 +1,6 @@
 {
         "name": "graph-explorer-v2",
-        "version": "11.1.3",
+        "version": "11.1.4",
         "private": true,
         "dependencies": {
                 "@augloop/types-core": "file:packages/types-core-2.16.189.tgz",
@@ -34,7 +34,7 @@
                 "eslint-config-react-app": "7.0.1",
                 "eslint-webpack-plugin": "4.1.0",
                 "express": "5.1.0",
-                "expvariantassignmentsdk": "file:packages/expvariantassignmentsdk-1.0.0.tgz",
+                "expvariantassignmentsdk": "file:packages/expvariantassignmentsdk-1.0.1.tgz",
                 "file-loader": "6.2.0",
                 "fork-ts-checker-webpack-plugin": "9.0.2",
                 "fs-extra": "11.3.0",

package.json

@@ -2,7 +2,7 @@ sonar.projectKey=microsoftgraph_microsoft-graph-explorer-v4
 sonar.organization=microsoftgraph2
 sonar.projectName=microsoft-graph-explorer-v4
 // x-release-please-start-version
-sonar.projectVersion=11.1.3
+sonar.projectVersion=11.1.4
 // x-release-please-end
 sonar.host.url=https://sonarcloud.io