PR review comments resolved.

Author: AbhitejJohn

azure-pipelines/PublishRoslynCopilot.yml

@@ -17,7 +17,7 @@ extends:
   parameters:
     pool:
       name: AzurePipelines-EO
-      image: AzurePipelinesWindows2022compliantGPT
+      image: 1ESPT-Windows2022
       os: windows
     stages:
     - stage: Upload
@@ -26,19 +26,20 @@ extends:
         displayName: Upload to server
         pool:
           name: AzurePipelines-EO
-          image: AzurePipelinesWindows2022compliantGPT
+          image: 1ESPT-Windows2022
           os: windows
         steps:
         - checkout: none
 
         - download: CI
           artifact: partnerDeployables-Windows
           displayName: 'Download official build CI artifact'
+          targetPath: '$(Pipeline.Workspace)/artifacts'
 
         - task: CopyFiles@2
           displayName: 'Copy files from Zip folder to staging directory'
           inputs:
-            SourceFolder: '$(Pipeline.Workspace)/partnerDeployables-Windows/'
+            SourceFolder: '$(Pipeline.Workspace)/artifacts/'
             Contents: '**/*Roslyn.LanguageServer*.zip'
             TargetFolder: '$(Build.ArtifactStagingDirectory)/staging'
             CleanTargetFolder: true

package.json

@@ -426,7 +426,7 @@
       "id": "RoslynCopilot",
       "description": "Language server for Roslyn Copilot integration (Windows)",
       "url": "https://roslyn.blob.core.windows.net/releases/Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer-17.0.460-alpha-g8013717149",
-      "installPath": ".roslyncopilot",
+      "installPath": ".roslynCopilot",
       "platforms": [
         "win32",
         "linux",
@@ -437,7 +437,7 @@
         "x86_64",
         "arm64"
       ],
-      "installTestPath": "./.roslyncopilot/Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer.dll",
+      "installTestPath": "./.roslynCopilot/Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer.dll",
       "integrity": "9944EBD6EE06BD595BCADD3057CD9BEF4105C3A3952DAE03E54F3114E2E6661F"
     },
     {
@@ -1459,6 +1459,10 @@
               "xamlTools": {
                 "description": "%configuration.dotnet.server.componentPaths.xamlTools%",
                 "type": "string"
+              },
+              "roslynCopilot": {
+                "description": "%configuration.dotnet.server.componentPaths.roslynCopilot%",
+                "type": "string"
               }
             },
             "default": {}

src/lsptoolshost/extensions/builtInComponents.ts

@@ -37,6 +37,11 @@ export const componentInfo: { [key: string]: ComponentInfo } = {
         optionName: 'razorExtension',
         componentDllPaths: ['Microsoft.VisualStudioCode.RazorExtension.dll'],
     },
+    roslynCopilot: {
+        defaultFolderName: '.roslynCopilot',
+        optionName: 'roslynCopilot',
+        componentDllPaths: ['Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer.dll'],
+    },
 };
 
 export function getComponentPaths(componentName: string, options: LanguageServerOptions | undefined): string[] {

src/lsptoolshost/server/roslynLanguageServer.ts

@@ -106,12 +106,6 @@ export class RoslynLanguageServer {
      */
     private static _processId: number | undefined;
 
-    /**
-     * The folder name for the Roslyn Copilot language server dll.
-     */
-    private static readonly _copilotLanguageServerDllDirName = '.roslyncopilot';
-    private static readonly _copilotLanguageServerDllName = 'Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer.dll';
-
     /**
      * The solution file previously opened; we hold onto this so we can send this back over if the server were to be relaunched for any reason, like some other configuration
      * change that required the server to restart, or some other catastrophic failure that completely took down the process. In the case that the process is crashing because
@@ -1083,20 +1077,9 @@ export class RoslynLanguageServer {
             await exports.setupTelemetryEnvironmentAsync(env);
         }
 
-        const copilotServerExtensionFullPath = path.join(
-            util.getExtensionPath(),
-            RoslynLanguageServer._copilotLanguageServerDllDirName,
-            RoslynLanguageServer._copilotLanguageServerDllName
-        );
-
-        if (fs.existsSync(copilotServerExtensionFullPath)) {
-            additionalExtensionPaths.push(copilotServerExtensionFullPath);
-            channel.trace(
-                `CSharp DevKit contributes Copilot language server extension: ${copilotServerExtensionFullPath}`
-            );
-        } else {
-            channel.debug(`Copilot language server extension not found at: ${copilotServerExtensionFullPath}`);
-        }
+        getComponentPaths('roslynCopilot', languageServerOptions).forEach((extPath) => {
+            additionalExtensionPaths.push(extPath);
+        });
     }
 
     /**