Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update lang server version #1430

Merged
merged 6 commits into from
Jan 19, 2022
Merged

Update lang server version #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5dd9862
Update lang server version
bhsubra Dec 16, 2021
bf9a687
Attempt to fix build issue
bhsubra Dec 16, 2021
94d8531
Updating dotnet version
bhsubra Dec 16, 2021
fd99a63
Updated gulpfile
bhsubra Dec 16, 2021
b34d351
Updated dotnet version
bhsubra Dec 17, 2021
68bf6d4
Updated language server version
bhsubra Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 3 additions & 3 deletions gulpfile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -214,7 +214,7 @@ async function getLanguageServer(): Promise<void> {
'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
Expand All @@ -234,7 +234,7 @@ async function getLanguageServer(): Promise<void> {
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);
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down