Merge branch 'main' into copilot/enable-log-messages

Author: waldekmastykarz

.editorconfig

@@ -236,6 +236,8 @@ dotnet_diagnostic.CA1303.severity = none
 dotnet_diagnostic.CA1308.severity = none
 # Avoid uninstantiated internal classes
 dotnet_diagnostic.CA1812.severity = none
+# Avoid potentially expensive logging
+dotnet_diagnostic.CA1873.severity = none
 # Use the LoggerMessage delegates
 dotnet_diagnostic.CA1848.severity = none
 # Possible multiple enumerations of IEnumerable collection

.github/skills/upgrade-devproxy-version/SKILL.md

@@ -0,0 +1,172 @@
+---
+name: upgrade-devproxy-version
+description: >
+  This skill should be used when the user asks to "upgrade Dev Proxy version",
+  "bump Dev Proxy to a new version", "update version to X.Y.Z", "release new
+  Dev Proxy version", or mentions version upgrades in the Dev Proxy repository.
+  Handles copying schema folders and updating version strings across csproj,
+  config, installer, and source files.
+---
+
+# Upgrade Dev Proxy Version
+
+Bump Dev Proxy from current version to a new version across all project files.
+
+## Prerequisites
+
+Confirm the Dev Proxy workspace is open:
+- Workspace root: contains `DevProxy.sln`
+- Schema folder: `./schemas/v<current-version>/` exists
+- Project files: `DevProxy/`, `DevProxy.Abstractions/`, `DevProxy.Plugins/` present
+
+## Upgrade Process
+
+### Step 1: Identify Current Version
+
+Find current version from `DevProxy/DevProxy.csproj`:
+
+```xml
+<Version>X.Y.Z</Version>
+```
+
+### Step 2: Copy Schema Folder
+
+Copy the schema folder to the new version:
+
+```bash
+cp -r ./schemas/v<current-version> ./schemas/v<new-version>
+```
+
+### Step 3: Update Version Strings
+
+Update version in all relevant files. There are two categories:
+
+**Category A: Assembly/Package Version** (format: `X.Y.Z`)
+Update `<Version>X.Y.Z</Version>` in:
+- `DevProxy/DevProxy.csproj`
+- `DevProxy.Abstractions/DevProxy.Abstractions.csproj`
+- `DevProxy.Plugins/DevProxy.Plugins.csproj`
+
+**Category B: Schema URLs** (format: `vX.Y.Z` in URL paths)
+Update `schemas/v<old>/` to `schemas/v<new>/` in:
+- `DevProxy/devproxyrc.json` - `$schema` URLs
+- `DevProxy/devproxy-errors.json` - `$schema` URL
+- `DevProxy/config/m365.json` - all `$schema` URLs
+- `DevProxy/config/m365-mocks.json` - `$schema` URL
+- `DevProxy/config/microsoft-graph.json` - all `$schema` URLs
+- `DevProxy/config/microsoft-graph-rate-limiting.json` - `$schema` URL
+- `DevProxy/config/spo-csom-types.json` - `$schema` URL
+- `DevProxy.Plugins/Mocking/MockResponsePlugin.cs` - hardcoded schema URL
+
+**Category C: Installer Files** (format: `X.Y.Z` or `X.Y.Z-beta.N`)
+Update version in:
+- `install.iss`:
+  - `#define MyAppSetupExeName "dev-proxy-installer-win-x64-X.Y.Z"`
+  - `#define MyAppVersion "X.Y.Z"`
+- `install-beta.iss`:
+  - `#define MyAppSetupExeName "dev-proxy-installer-win-x64-X.Y.Z-beta.N"`
+  - `#define MyAppVersion "X.Y.Z-beta.N"`
+
+**Category D: Script Files** (format: `vX.Y.Z` or `vX.Y.Z-beta.N`)
+Update version string in:
+- `scripts/local-setup.ps1` - `$versionString = "vX.Y.Z-beta.N"`
+- `scripts/version.ps1` - `$script:versionString = "vX.Y.Z-beta.N"`
+
+**Category E: Dockerfiles** (format: `X.Y.Z` or `X.Y.Z-beta.N`)
+Update `DEVPROXY_VERSION` ARG in:
+- `Dockerfile` - `ARG DEVPROXY_VERSION=X.Y.Z`
+- `Dockerfile_beta` - `ARG DEVPROXY_VERSION=X.Y.Z`
+- `scripts/Dockerfile_local` - `ARG DEVPROXY_VERSION=X.Y.Z-beta.N`
+
+## Version Formats
+
+Different files use different version formats:
+
+| Location | Format | Example |
+|----------|--------|---------|
+| csproj `<Version>` | `X.Y.Z` | `2.1.0` |
+| Schema URL path | `vX.Y.Z` | `v2.1.0` |
+| Installer stable | `X.Y.Z` | `2.1.0` |
+| Installer beta | `X.Y.Z-beta.N` | `2.1.0-beta.1` |
+| Script version | `vX.Y.Z-beta.N` | `v2.1.0-beta.1` |
+| Dockerfile stable | `X.Y.Z` | `2.1.0` |
+| Dockerfile beta | `X.Y.Z-beta.N` | `2.1.0-beta.1` |
+
+## Execution Steps
+
+1. **Ask** for the target version if not provided
+2. **Detect** current version from `DevProxy/DevProxy.csproj`
+3. **Copy** schema folder: `cp -r ./schemas/v{old} ./schemas/v{new}`
+4. **Update** Category A files (csproj Version tags)
+5. **Update** Category B files (schema URLs in JSON and CS files)
+6. **Update** Category C files (installer definitions)
+7. **Update** Category D files (PowerShell version strings)
+8. **Update** Category E files (Dockerfiles)
+9. **Report** summary of changes made
+
+## Automation Script
+
+Use the bundled script to automate the upgrade:
+
+```bash
+.github/skills/upgrade-devproxy-version/scripts/upgrade-version.sh <new-version> [workspace-root]
+```
+
+Example:
+```bash
+.github/skills/upgrade-devproxy-version/scripts/upgrade-version.sh 2.1.0 .
+```
+
+The script handles all categories automatically, including detecting the current version and applying appropriate beta suffixes where needed.
+
+## Important Notes
+
+- Schema folder copy creates a new folder; existing version folder is preserved
+- Do NOT update `System.CommandLine` package version (coincidentally `2.0.0-beta5`)
+- Do NOT update `.vscode/tasks.json` version (different context)
+- Beta releases: installer-beta.iss and script files use `-beta.N` suffix
+- Stable releases: install.iss uses plain `X.Y.Z`
+
+## Search Patterns
+
+To find all version references, use:
+
+```bash
+# Assembly versions
+grep -r "X\.Y\.Z" --include="*.csproj"
+
+# Schema URLs  
+grep -r "schemas/vX\.Y\.Z" --include="*.json" --include="*.cs"
+
+# Installer versions
+grep -r "X\.Y\.Z" --include="*.iss"
+
+# Script versions
+grep -r "vX\.Y\.Z" --include="*.ps1"
+```
+
+## Example: Upgrade from 2.0.0 to 2.1.0
+
+```bash
+# Step 1: Copy schemas
+cp -r ./schemas/v2.0.0 ./schemas/v2.1.0
+
+# Step 2: Find and update all version strings
+# (Use grep/sed or editor find-replace)
+```
+
+Files to update:
+- 3 csproj files: `2.0.0` → `2.1.0`
+- ~20 schema URLs: `v2.0.0` → `v2.1.0`
+- 2 installer files: version defines
+- 2 PowerShell scripts: version strings
+- 3 Dockerfiles: DEVPROXY_VERSION ARG
+
+## Verification
+
+After upgrade, verify:
+
+1. All three csproj files show new `<Version>`
+2. Schema folder `./schemas/v{new}/` exists
+3. All JSON config files reference new schema version
+4. `dotnet build` succeeds

.github/skills/upgrade-devproxy-version/scripts/upgrade-version.sh

@@ -0,0 +1,154 @@
+#!/bin/bash
+# upgrade-version.sh - Upgrade Dev Proxy version
+# Usage: ./upgrade-version.sh <new-version> [workspace-root]
+#
+# Example: ./upgrade-version.sh 2.1.0 /path/to/dev-proxy
+
+set -e
+
+NEW_VERSION="${1}"
+WORKSPACE_ROOT="${2:-.}"
+
+if [[ -z "$NEW_VERSION" ]]; then
+    echo "Usage: $0 <new-version> [workspace-root]"
+    echo "Example: $0 2.1.0 /path/to/dev-proxy"
+    exit 2
+fi
+
+# Validate workspace
+if [[ ! -f "$WORKSPACE_ROOT/DevProxy.sln" ]]; then
+    echo "Error: DevProxy.sln not found in $WORKSPACE_ROOT"
+    exit 1
+fi
+
+# Extract current version from DevProxy.csproj
+CURRENT_VERSION=$(sed -n 's/.*<Version>\([^<][^<]*\)<\/Version>.*/\1/p' "$WORKSPACE_ROOT/DevProxy/DevProxy.csproj" | head -1)
+
+if [[ -z "$CURRENT_VERSION" ]]; then
+    echo "Error: Could not determine current version"
+    exit 1
+fi
+
+echo "Upgrading Dev Proxy from $CURRENT_VERSION to $NEW_VERSION"
+echo "Workspace: $WORKSPACE_ROOT"
+echo ""
+
+# Step 1: Copy schema folder
+echo "Step 1: Copying schema folder..."
+if [[ -d "$WORKSPACE_ROOT/schemas/v$CURRENT_VERSION" ]]; then
+    cp -r "$WORKSPACE_ROOT/schemas/v$CURRENT_VERSION" "$WORKSPACE_ROOT/schemas/v$NEW_VERSION"
+    echo "  Created: schemas/v$NEW_VERSION"
+else
+    echo "  Warning: schemas/v$CURRENT_VERSION not found, skipping schema copy"
+fi
+
+# Step 2: Update csproj files (Category A)
+echo ""
+echo "Step 2: Updating csproj Version tags..."
+for csproj in DevProxy/DevProxy.csproj DevProxy.Abstractions/DevProxy.Abstractions.csproj DevProxy.Plugins/DevProxy.Plugins.csproj; do
+    if [[ -f "$WORKSPACE_ROOT/$csproj" ]]; then
+        sed -i '' "s|<Version>$CURRENT_VERSION</Version>|<Version>$NEW_VERSION</Version>|g" "$WORKSPACE_ROOT/$csproj"
+        echo "  Updated: $csproj"
+    fi
+done
+
+# Step 3: Update schema URLs in JSON and CS files (Category B)
+echo ""
+echo "Step 3: Updating schema URLs..."
+# JSON files
+for json in DevProxy/devproxyrc.json DevProxy/devproxy-errors.json DevProxy/config/*.json; do
+    if [[ -f "$WORKSPACE_ROOT/$json" ]]; then
+        sed -i '' "s|schemas/v$CURRENT_VERSION/|schemas/v$NEW_VERSION/|g" "$WORKSPACE_ROOT/$json"
+        echo "  Updated: $json"
+    fi
+done
+
+# CS files with hardcoded schema URLs
+MOCK_PLUGIN="$WORKSPACE_ROOT/DevProxy.Plugins/Mocking/MockResponsePlugin.cs"
+if [[ -f "$MOCK_PLUGIN" ]]; then
+    sed -i '' "s|schemas/v$CURRENT_VERSION/|schemas/v$NEW_VERSION/|g" "$MOCK_PLUGIN"
+    echo "  Updated: DevProxy.Plugins/Mocking/MockResponsePlugin.cs"
+fi
+
+# Step 4: Update installer files (Category C)
+echo ""
+echo "Step 4: Updating installer files..."
+# Stable installer
+if [[ -f "$WORKSPACE_ROOT/install.iss" ]]; then
+    sed -i '' "s|dev-proxy-installer-win-x64-$CURRENT_VERSION\"|dev-proxy-installer-win-x64-$NEW_VERSION\"|g" "$WORKSPACE_ROOT/install.iss"
+    sed -i '' "s|MyAppVersion \"$CURRENT_VERSION\"|MyAppVersion \"$NEW_VERSION\"|g" "$WORKSPACE_ROOT/install.iss"
+    echo "  Updated: install.iss"
+fi
+
+# Beta installer (handle beta suffix separately if needed)
+if [[ -f "$WORKSPACE_ROOT/install-beta.iss" ]]; then
+    # Extract current beta version
+    CURRENT_BETA=$(grep -oP '(?<=MyAppVersion ")[^"]+' "$WORKSPACE_ROOT/install-beta.iss" | head -1)
+    if [[ -n "$CURRENT_BETA" ]]; then
+        # Determine new beta version - if NEW_VERSION doesn't have beta suffix, add -beta.1
+        if [[ "$NEW_VERSION" == *"-beta"* ]]; then
+            NEW_BETA="$NEW_VERSION"
+        else
+            NEW_BETA="${NEW_VERSION}-beta.1"
+        fi
+        sed -i '' "s|dev-proxy-installer-win-x64-$CURRENT_BETA\"|dev-proxy-installer-win-x64-$NEW_BETA\"|g" "$WORKSPACE_ROOT/install-beta.iss"
+        sed -i '' "s|MyAppVersion \"$CURRENT_BETA\"|MyAppVersion \"$NEW_BETA\"|g" "$WORKSPACE_ROOT/install-beta.iss"
+        echo "  Updated: install-beta.iss (to $NEW_BETA)"
+    fi
+fi
+
+# Step 5: Update PowerShell scripts (Category D)
+echo ""
+echo "Step 5: Updating PowerShell scripts..."
+for ps1 in scripts/local-setup.ps1 scripts/version.ps1; do
+    if [[ -f "$WORKSPACE_ROOT/$ps1" ]]; then
+        # These use format like "v2.0.0-beta.1"
+        CURRENT_PS_VERSION=$(grep -oP '(?<=versionString = ")[^"]+' "$WORKSPACE_ROOT/$ps1" | head -1)
+        if [[ -n "$CURRENT_PS_VERSION" ]]; then
+            # Determine new PS version
+            if [[ "$NEW_VERSION" == *"-beta"* ]]; then
+                NEW_PS_VERSION="v$NEW_VERSION"
+            else
+                NEW_PS_VERSION="v${NEW_VERSION}-beta.1"
+            fi
+            sed -i '' "s|$CURRENT_PS_VERSION|$NEW_PS_VERSION|g" "$WORKSPACE_ROOT/$ps1"
+            echo "  Updated: $ps1 (to $NEW_PS_VERSION)"
+        fi
+    fi
+done
+
+# Step 6: Update Dockerfiles (Category E)
+echo ""
+echo "Step 6: Updating Dockerfiles..."
+# Stable Dockerfiles
+for dockerfile in Dockerfile Dockerfile_beta; do
+    if [[ -f "$WORKSPACE_ROOT/$dockerfile" ]]; then
+        sed -i '' "s|DEVPROXY_VERSION=$CURRENT_VERSION|DEVPROXY_VERSION=$NEW_VERSION|g" "$WORKSPACE_ROOT/$dockerfile"
+        echo "  Updated: $dockerfile"
+    fi
+done
+
+# Beta/local Dockerfile (uses beta suffix)
+if [[ -f "$WORKSPACE_ROOT/scripts/Dockerfile_local" ]]; then
+    # Extract current version from Dockerfile_local
+    CURRENT_DOCKER_LOCAL=$(grep -oP '(?<=DEVPROXY_VERSION=)[^\s]+' "$WORKSPACE_ROOT/scripts/Dockerfile_local" | head -1)
+    if [[ -n "$CURRENT_DOCKER_LOCAL" ]]; then
+        if [[ "$NEW_VERSION" == *"-beta"* ]]; then
+            NEW_DOCKER_LOCAL="$NEW_VERSION"
+        else
+            NEW_DOCKER_LOCAL="${NEW_VERSION}-beta.1"
+        fi
+        sed -i '' "s|DEVPROXY_VERSION=$CURRENT_DOCKER_LOCAL|DEVPROXY_VERSION=$NEW_DOCKER_LOCAL|g" "$WORKSPACE_ROOT/scripts/Dockerfile_local"
+        echo "  Updated: scripts/Dockerfile_local (to $NEW_DOCKER_LOCAL)"
+    fi
+fi
+
+echo ""
+echo "=== Upgrade Complete ==="
+echo "From: $CURRENT_VERSION"
+echo "To:   $NEW_VERSION"
+echo ""
+echo "Next steps:"
+echo "1. Review changes: git diff"
+echo "2. Build: dotnet build"
+echo "3. Test: dotnet run --project DevProxy"

.github/workflows/codeql-analysis.yml

@@ -44,16 +44,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
+      uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+      uses: github/codeql-action/init@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -81,4 +81,4 @@ jobs:
       run: dotnet build --no-restore -c Release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+      uses: github/codeql-action/analyze@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3