Fix casing

dotnet · Nov 27, 2023 · 6224407 · 6224407
1 parent 50c7e0e
commit 6224407
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@ obj
 node_modules
 out
 .roslyn/
-.roslynDevkit/
+.roslynDevKit/
 .omnisharp/
 .omnisharp-*/
 .vs/

diff --git a/.vscodeignore b/.vscodeignore
@@ -2,7 +2,7 @@
 .logs/**
 .nyc_output/**
 !.roslyn/**
-!.roslynDevkit/**
+!.roslynDevKit/**
 !.omnisharp/**
 !.razor/**
 !.razoromnisharp/**

diff --git a/src/lsptoolshost/roslynLanguageServer.ts b/src/lsptoolshost/roslynLanguageServer.ts
@@ -510,8 +510,8 @@ export class RoslynLanguageServer {
                 _channel.appendLine('Activating C# + C# Dev Kit...');
             }
 
-            const csharpDevkitArgs = this.getCSharpDevkitExportArgs();
-            args = args.concat(csharpDevkitArgs);
+            const csharpDevKitArgs = this.getCSharpDevKitExportArgs();
+            args = args.concat(csharpDevKitArgs);
 
             await this.setupDevKitEnvironment(env, csharpDevkitExtension);
         } else {
@@ -756,17 +756,17 @@ export class RoslynLanguageServer {
         );
     }
 
-    private static getCSharpDevkitExportArgs(): string[] {
+    private static getCSharpDevKitExportArgs(): string[] {
         const args: string[] = [];
 
         const clientRoot = __dirname;
-        const devkitDepsPath = path.join(
+        const devKitDepsPath = path.join(
             clientRoot,
             '..',
-            '.roslynDevkit',
+            '.roslynDevKit',
             'Microsoft.VisualStudio.LanguageServices.DevKit.dll'
         );
-        args.push('--extension', devkitDepsPath);
+        args.push('--extension', devKitDepsPath);
 
         args.push('--sessionId', getSessionId());
         return args;

diff --git a/tasks/offlinePackagingTasks.ts b/tasks/offlinePackagingTasks.ts
@@ -23,7 +23,7 @@ import {
     languageServerDirectory,
     nugetTempPath,
     rootPath,
-    devkitDependenciesDirectory,
+    devKitDependenciesDirectory,
 } from '../tasks/projectPaths';
 import { getPackageJSON } from '../tasks/packageJson';
 import { createPackageAsync } from '../tasks/vsceTasks';
@@ -124,8 +124,8 @@ gulp.task(
             await acquireRoslyn(packageJSON, p.platformInfo, true);
         }
 
-        // Also pull in the Roslyn devkit dependencies nuget package.
-        await acquireRoslynDevkit(packageJSON, true);
+        // Also pull in the Roslyn DevKit dependencies nuget package.
+        await acquireRoslynDevKit(packageJSON, true);
     }, 'installDependencies')
 );
 
@@ -139,9 +139,9 @@ async function installRoslyn(packageJSON: any, platformInfo?: PlatformInformatio
         languageServerDirectory
     );
 
-    // Install Roslyn Devkit dependencies.
-    const roslynDevkitPackagePath = await acquireRoslynDevkit(packageJSON, false);
-    await installNuGetPackage(roslynDevkitPackagePath, 'content', devkitDependenciesDirectory);
+    // Install Roslyn DevKit dependencies.
+    const roslynDevKitPackagePath = await acquireRoslynDevKit(packageJSON, false);
+    await installNuGetPackage(roslynDevKitPackagePath, 'content', devKitDependenciesDirectory);
 }
 
 async function installNuGetPackage(pathToPackage: string, contentPath: string, outputPath: string) {
@@ -193,10 +193,10 @@ async function acquireRoslyn(
     return { packagePath, serverPlatform };
 }
 
-async function acquireRoslynDevkit(packageJSON: any, interactive: boolean): Promise<string> {
+async function acquireRoslynDevKit(packageJSON: any, interactive: boolean): Promise<string> {
     const roslynVersion = packageJSON.defaults.roslyn;
     const packagePath = await acquireNugetPackage(
-        `Microsoft.VisualStudio.LanguageServices.Devkit`,
+        `Microsoft.VisualStudio.LanguageServices.DevKit`,
         roslynVersion,
         interactive
     );
@@ -333,7 +333,7 @@ async function cleanAsync() {
         '.debugger',
         '.razor',
         languageServerDirectory,
-        devkitDependenciesDirectory,
+        devKitDependenciesDirectory,
     ]);
 }
 

diff --git a/tasks/projectPaths.ts b/tasks/projectPaths.ts
@@ -15,7 +15,7 @@ export const jestPath = path.join(nodeModulesPath, 'jest', 'bin', 'jest');
 export const packedVsixOutputRoot = commandLineOptions.outputFolder || path.join(rootPath, 'vsix');
 export const nugetTempPath = path.join(rootPath, 'out', '.nuget');
 export const languageServerDirectory = path.join(rootPath, '.roslyn');
-export const devkitDependenciesDirectory = path.join(rootPath, '.roslynDevkit');
+export const devKitDependenciesDirectory = path.join(rootPath, '.roslynDevKit');
 
 export const codeExtensionPath = commandLineOptions.codeExtensionPath || rootPath;