diff --git a/common.ts b/common.ts index f78807a1e..13e1ac209 100644 --- a/common.ts +++ b/common.ts @@ -58,10 +58,10 @@ export const configPrefix = 'azureResourceManagerTools'; // Prefix for user sett // The dotnet version the language server is compiled against (affects where the // assembly is found in the langServer folder) -export const langServerDotnetVersion = '3.1'; +export const langServerDotnetVersion = '6.0'; // The dotnet version to download and run the language server against (minor version // may be greater than langServerDotnetVersion) -export const downloadDotnetVersion = '3.1'; +export const downloadDotnetVersion = '6.0'; export namespace configKeys { export const autoDetectJsonTemplates = 'autoDetectJsonTemplates'; diff --git a/gulpfile.ts b/gulpfile.ts index 6847a5a43..6e75075a9 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -41,7 +41,7 @@ const env = process.env; const preserveStagingFolder = !!env.ARMTOOLS_PRESERVE_STAGING_FOLDER; // Points to a local folder path to retrieve the language server from when packaging (for packaging private builds) -// e.g. (MacOS): "export LANGUAGE_SERVER_PACKAGING_PATH=~/repos/ARM-LanguageServer/artifacts/bin/Microsoft.ArmLanguageServer/Debug/netcoreapp3.1" +// e.g. (MacOS): "export LANGUAGE_SERVER_PACKAGING_PATH=~/repos/ARM-LanguageServer/artifacts/bin/Microsoft.ArmLanguageServer/Debug/net6.0" const languageServerPackagingPath = env.LANGUAGE_SERVER_PACKAGING_PATH; // Official builds will download and include the language server bits (which are licensed differently than the code in the public repo) @@ -214,7 +214,7 @@ async function getLanguageServer(): Promise { 'install', languageServerNugetPackage, '-Version', languageServerVersion, - '-Framework', `netcoreapp${langServerDotnetVersion}`, + '-Framework', `net${langServerDotnetVersion}`, '-OutputDirectory', 'pkgs', //'-Verbosity', 'detailed', '-ExcludeVersion', // Keeps the package version from being included in the output folder name @@ -234,7 +234,7 @@ async function getLanguageServer(): Promise { rimraf.sync(languageServerFolderName); console.log(`Copying language server binaries to ${languageServerFolderName}`); - const langServerSourcePath = path.join(pkgsPath, languageServerNugetPackage, 'lib', `netcoreapp${langServerDotnetVersion}`); + const langServerSourcePath = path.join(pkgsPath, languageServerNugetPackage, 'lib', `net${langServerDotnetVersion}`); const licenseSourcePath = path.join(pkgsPath, languageServerNugetPackage, languageServerLicenseFileName); fse.mkdirpSync(destPath); diff --git a/package.json b/package.json index 4f3daf3fa..93383c99d 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "version": "0.15.5", "publisher": "msazurermtools", "config": { - "ARM_LANGUAGE_SERVER_NUGET_VERSION": "3.0.0-preview.21560.3" + "ARM_LANGUAGE_SERVER_NUGET_VERSION": "3.0.0-preview.22069.1" }, "categories": [ "Azure",