зеркало из https://github.com/aspnet/Razor.VSCode.git
Make the repo buildable.
- Made the server net461 to work with our underlying Razor dependencies. - Updated the server start code to not depend on `dotnet` (it boots an .exe now). - Harvest dependencies from underlying Razor clone to ensure no mismatch in korebuild and othe dependent versions. #4
This commit is contained in:
Родитель
9a3e176655
Коммит
c433554544
|
@ -8,7 +8,7 @@
|
|||
<Import Project="build\sources.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<Product>Microsoft ASP.NET Core</Product>
|
||||
<Product>Microsoft ASP.NET Core VSCode</Product>
|
||||
<RepositoryUrl>https://github.com/aspnet/Razor.VSCode</RepositoryUrl>
|
||||
<RepositoryType>git</RepositoryType>
|
||||
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
|
||||
|
|
|
@ -4,6 +4,16 @@
|
|||
// Don't run any rules for packages the ADX team creates but doesn't ship.
|
||||
],
|
||||
"packages": {
|
||||
"Microsoft.AspNetCore.Razor.LanguageServer": {
|
||||
"Exclusions": {
|
||||
"SIGN_STRONGNAME": {
|
||||
"lib/net461/Microsoft.AspNetCore.Razor.LanguageServer.exe": "Underlying omnisharp server is not strong-named."
|
||||
},
|
||||
"WRONG_PUBLICKEYTOKEN": {
|
||||
"lib/net461/Microsoft.AspNetCore.Razor.LanguageServer.exe": "Underlying omnisharp server is not strong-named."
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"Default": { // Rules to run for packages not listed in any other set.
|
||||
|
@ -11,4 +21,4 @@
|
|||
"DefaultCompositeRule"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,10 +1,8 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
|
||||
</PropertyGroup>
|
||||
<Import Project="..\modules\Razor\build\dependencies.props" />
|
||||
|
||||
<PropertyGroup Label="Package Versions">
|
||||
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
|
||||
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17090</InternalAspNetCoreSdkPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
|
||||
<DependencyVersionsFile>$(RepositoryRoot)modules\Razor\build\dependencies.props</DependencyVersionsFile>
|
||||
|
||||
<!-- These properties are use by the automation that updates dependencies.props -->
|
||||
<LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
|
||||
<LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
|
||||
|
|
|
@ -30,16 +30,16 @@ export class RazorLanguageServerClient implements vscode.Disposable {
|
|||
outputChannel: options.outputChannel
|
||||
};
|
||||
|
||||
// TODO: Resolve dotnet path or self-host server executable
|
||||
let args = [options.serverDllPath, '-lsp'];
|
||||
const args = ['-lsp'];
|
||||
let args = ['-lsp'];
|
||||
|
||||
if (options.debug) {
|
||||
args[2] = "--debug";
|
||||
}
|
||||
|
||||
this._serverOptions = {
|
||||
run: { command: 'dotnet', args: args },
|
||||
debug: { command: 'dotnet', args: args }
|
||||
run: { command: options.serverDllPath, args },
|
||||
debug: { command: options.serverDllPath, args },
|
||||
};
|
||||
|
||||
this._client = new LanguageClient('razorLanguageServer', 'Razor Language Server', this._serverOptions, this._clientOptions);
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
<Project>
|
||||
</Project>
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<TargetFramework>net461</TargetFramework>
|
||||
<Description>Temporary assembly until the csharp language server is strong name signed.</Description>
|
||||
<EnableApiCheck>false</EnableApiCheck>
|
||||
</PropertyGroup>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp2.0</TargetFramework>
|
||||
<TargetFramework>net461</TargetFramework>
|
||||
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains a Razor language server.</Description>
|
||||
<EnableApiCheck>false</EnableApiCheck>
|
||||
<SignAssembly>false</SignAssembly>
|
||||
|
|
|
@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer
|
|||
|
||||
var line = lineBuilder.ToString();
|
||||
var trimmedLine = line.Trim();
|
||||
if (!trimmedLine.StartsWith('@'))
|
||||
if (!trimmedLine.StartsWith("@"))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче