Update to latest XAML package and fix some more naming

Author: dibarbet

package.json

@@ -42,7 +42,7 @@
     "razor": "7.0.0-preview.24178.4",
     "razorOmnisharp": "7.0.0-preview.23363.1",
     "razorTelemetry": "7.0.0-preview.24178.4",
-    "xamlTools": "17.11.34811.206"
+    "xamlTools": "17.11.34815.8"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",

src/lsptoolshost/builtInComponents.ts

@@ -23,8 +23,8 @@ export const componentInfo: { [key: string]: ComponentInfo } = {
         defaultFolderName: '.xamlTools',
         optionName: 'xamlTools',
         componentDllPaths: [
-            path.join('lib', 'netstandard2.0', 'Microsoft.VisualStudio.DesignTools.CodeAnalysis.dll'),
-            path.join('lib', 'netstandard2.0', 'Microsoft.VisualStudio.DesignTools.CodeAnalysis.Diagnostics.dll'),
+            'Microsoft.VisualStudio.DesignTools.CodeAnalysis.dll',
+            'Microsoft.VisualStudio.DesignTools.CodeAnalysis.Diagnostics.dll',
         ],
     },
 };

src/lsptoolshost/roslynLanguageServer.ts

@@ -820,7 +820,7 @@ export class RoslynLanguageServer {
         args.push('--sessionId', getSessionId());
 
         // Also include the Xaml Dev Kit extensions, if enabled.
-        if (languageServerOptions.enableXamlTools) {
+        if (languageServerOptions.enableXamlToolsPreview) {
             getComponentPaths('xamlTools', languageServerOptions).forEach((path) =>
                 additionalExtensionPaths.push(path)
             );

src/shared/options.ts

@@ -78,7 +78,7 @@ export interface LanguageServerOptions {
     readonly analyzerDiagnosticScope: string;
     readonly compilerDiagnosticScope: string;
     readonly componentPaths: { [key: string]: string } | null;
-    readonly enableXamlTools: boolean;
+    readonly enableXamlToolsPreview: boolean;
 }
 
 export interface RazorOptions {
@@ -402,7 +402,7 @@ class LanguageServerOptionsImpl implements LanguageServerOptions {
     public get componentPaths() {
         return readOption<{ [key: string]: string }>('dotnet.server.componentPaths', {});
     }
-    public get enableXamlTools() {
+    public get enableXamlToolsPreview() {
         return readOption<boolean>('dotnet.enableXamlToolsPreview', false);
     }
 }
@@ -499,5 +499,5 @@ export const LanguageServerOptionsThatTriggerReload: ReadonlyArray<keyof Languag
     'documentSelector',
     'preferCSharpExtension',
     'componentPaths',
-    'enableXamlTools',
+    'enableXamlToolsPreview',
 ];

tasks/offlinePackagingTasks.ts

@@ -81,7 +81,7 @@ export const nugetPackageInfo: { [key: string]: NugetPackageInfo } = {
     xamlTools: {
         getPackageName: (_platformInfo) => 'Microsoft.VisualStudio.DesignToolsBase',
         packageJsonName: 'xamlTools',
-        getPackageContentPath: (_platformInfo) => '',
+        getPackageContentPath: (_platformInfo) => 'content',
         vsixOutputPath: xamlToolsDirectory,
     },
 };