Merge branch 'main' into copilot/add-support-for-responses-api

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/workflows/codeql-analysis.yml

@@ -44,16 +44,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
+      uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
       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@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
       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@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5

.github/workflows/create-release.yml

@@ -30,11 +30,11 @@ jobs:
     env:
       release: 'dev-proxy-${{ matrix.architecture }}-${{ github.ref_name }}'
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Setup .NET
-        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
+        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
       - name: Rename executable for beta
         if: contains(github.ref_name, '-beta')
         run: |
@@ -59,7 +59,7 @@ jobs:
         if: matrix.architecture == 'win-x64'
         run: dotnet build ./DevProxy.Abstractions/DevProxy.Abstractions.csproj -p:InformationalVersion=$("${{ github.ref_name }}".Substring(1)) -c Release --no-self-contained
       - name: Add plugins to output
-        run: cp ./DevProxy/bin/Release/net9.0/${{ matrix.architecture }}/plugins ./${{ env.release }} -r
+        run: cp ./DevProxy/bin/Release/net10.0/${{ matrix.architecture }}/plugins ./${{ env.release }} -r
       - name: Remove unnecessary files
         run: |
           pushd
@@ -112,7 +112,7 @@ jobs:
         shell: pwsh
         run: >
           ./sign code azure-key-vault
-          ./DevProxy.Abstractions/bin/Release/net9.0/DevProxy.Abstractions.dll
+          ./DevProxy.Abstractions/bin/Release/net10.0/DevProxy.Abstractions.dll
           --publisher-name "${{ env.APP_PUBLISHER }}"
           --description "${{ env.APP_DESCRIPTION }}"
           --description-url "${{ env.APP_DESCRIPTION_URL }}"
@@ -127,7 +127,7 @@ jobs:
         uses: thedoctor0/zip-release@b57d897cb5d60cb78b51a507f63fa184cfe35554 # master
         with:
           filename: '../../../../DevProxy.Abstractions-${{ github.ref_name }}.zip'
-          directory: './DevProxy.Abstractions/bin/Release/net9.0'
+          directory: './DevProxy.Abstractions/bin/Release/net10.0'
           exclusions: '*.json'
       - name: Upload abstractions
         if: matrix.architecture == 'win-x64'
@@ -202,7 +202,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           path: output
@@ -229,7 +229,7 @@ jobs:
       id-token: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       # Required for multi-platform images
       - name: Set up QEMU
         uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
@@ -246,7 +246,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |

.github/workflows/dotnet.yml

@@ -18,11 +18,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: Setup .NET
-      uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
+      uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Restore workloads
       run: dotnet workload restore
     - name: Restore dependencies

.vscode/launch.json

@@ -10,9 +10,9 @@
       "request": "launch",
       "preLaunchTask": "build",
       // If you have changed target frameworks, make sure to update the program path.
-      "program": "${workspaceFolder}/DevProxy/bin/Debug/net9.0/devproxy.dll",
+      "program": "${workspaceFolder}/DevProxy/bin/Debug/net10.0/devproxy.dll",
       "args": [],
-      "cwd": "${workspaceFolder}/DevProxy/bin/Debug/net9.0",
+      "cwd": "${workspaceFolder}/DevProxy/bin/Debug/net10.0",
       // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
       "console": "integratedTerminal",
       "stopAtEntry": false,

DevProxy.Abstractions/DevProxy.Abstractions.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>DevProxy.Abstractions</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>1.3.0</Version>
+    <Version>2.0.0</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

DevProxy.Abstractions/LanguageModel/OllamaLanguageModelClient.cs

@@ -54,7 +54,10 @@ public sealed class OllamaLanguageModelClient(
 
         if (Configuration.CacheResponses && _cacheChatCompletion.TryGetCacheValue(messages, out var cachedResponse))
         {
-            Logger.LogDebug("Returning cached response for message: {LastMessage}", messages.Last().Content);
+            if (Logger.IsEnabled(LogLevel.Debug))
+            {
+                Logger.LogDebug("Returning cached response for message: {LastMessage}", messages.Last().Content);
+            }
             return cachedResponse;
         }
 
@@ -181,7 +184,10 @@ protected override async Task<bool> IsEnabledCoreAsync(CancellationToken cancell
         try
         {
             var url = $"{Configuration.Url?.TrimEnd('/')}/api/chat";
-            Logger.LogDebug("Requesting chat completion. Message: {LastMessage}", messages.Last().Content);
+            if (Logger.IsEnabled(LogLevel.Debug))
+            {
+                Logger.LogDebug("Requesting chat completion. Message: {LastMessage}", messages.Last().Content);
+            }
 
             var response = await _httpClient.PostAsJsonAsync(url,
                 new

DevProxy.Abstractions/LanguageModel/OpenAILanguageModelClient.cs

@@ -62,7 +62,10 @@ public sealed class OpenAILanguageModelClient(
 
         if (Configuration.CacheResponses && _cacheChatCompletion.TryGetCacheValue(messages, out var cachedResponse))
         {
-            _logger.LogDebug("Returning cached response for message: {LastMessage}", messages.Last().Content);
+            if (_logger.IsEnabled(LogLevel.Debug))
+            {
+                _logger.LogDebug("Returning cached response for message: {LastMessage}", messages.Last().Content);
+            }
             return cachedResponse;
         }
 
@@ -148,7 +151,10 @@ protected override async Task<bool> IsEnabledCoreAsync(CancellationToken cancell
         try
         {
             var url = $"{Configuration.Url?.TrimEnd('/')}/chat/completions";
-            _logger.LogDebug("Requesting chat completion. Message: {LastMessage}", messages.Last().Content);
+            if (_logger.IsEnabled(LogLevel.Debug))
+            {
+                _logger.LogDebug("Requesting chat completion. Message: {LastMessage}", messages.Last().Content);
+            }
 
             var payload = new OpenAIChatCompletionRequest
             {

DevProxy.Abstractions/Models/MockResponse.cs

@@ -21,6 +21,8 @@ public object Clone()
 
     public static MockResponse FromHttpResponse(string httpResponse, ILogger logger)
     {
+        ArgumentNullException.ThrowIfNull(logger);
+
         logger.LogTrace("{Method} called", nameof(FromHttpResponse));
 
         if (string.IsNullOrWhiteSpace(httpResponse))
@@ -40,7 +42,10 @@ public static MockResponse FromHttpResponse(string httpResponse, ILogger logger)
         for (var i = 0; i < lines.Length; i++)
         {
             var line = lines[i];
-            logger.LogTrace("Processing line {LineNumber}: {LineContent}", i + 1, line);
+            if (logger.IsEnabled(LogLevel.Trace))
+            {
+                logger.LogTrace("Processing line {LineNumber}: {LineContent}", i + 1, line);
+            }
 
             if (i == 0)
             {

DevProxy.Abstractions/Plugins/BaseLoader.cs

@@ -91,7 +91,10 @@ private async Task<bool> ValidateFileContentsAsync(string fileContents, Cancella
 
         if (!IsValid)
         {
-            Logger.LogError("Schema validation failed for {File} with the following errors: {Errors}", FilePath, string.Join(", ", ValidationErrors));
+            if (Logger.IsEnabled(LogLevel.Error))
+            {
+                Logger.LogError("Schema validation failed for {File} with the following errors: {Errors}", FilePath, string.Join(", ", ValidationErrors));
+            }
         }
 
         return IsValid;