huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to RoslynDev 2.6.0-* packages

This commit is contained in:
Pranav K 2017-07-12 11:00:50 -07:00
parent 8a51fdb39d
commit c812f9d885
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/dependencies.props
View File

@ -11,8 +11,8 @@
<NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
<NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
<RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
<RoslynVersion>2.3.0-beta4-*</RoslynVersion>
<RoslynDevVersion>2.3.0-beta4-*</RoslynDevVersion>
<RoslynVersion>2.3.0</RoslynVersion>
<RoslynDevVersion>2.6.0-beta*</RoslynDevVersion>
<StreamJsonRpcVersion>1.1.92</StreamJsonRpcVersion>
<TestSdkVersion>15.3.0-*</TestSdkVersion>

2
src/Microsoft.CodeAnalysis.Remote.Razor/DefaultTagHelperResolver.cs
View File

@ -43,4 +43,4 @@ namespace Microsoft.CodeAnalysis.Remote.Razor
return resolutionResult;
}
}
}
}

2
src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs
View File

@ -31,7 +31,7 @@ namespace Microsoft.CodeAnalysis.Remote.Razor
{
var projectId = ProjectId.CreateFromSerialized(projectIdBytes, projectDebugName);
var solution = await GetSolutionAsync().ConfigureAwait(false);
var solution = await GetSolutionAsync(cancellationToken).ConfigureAwait(false);
var project = solution.GetProject(projectId);
var resolver = new DefaultTagHelperResolver(designTime: true);

8
src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDirectiveResolver.cs
View File

@ -23,7 +23,11 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
using (var session = await client.CreateSessionAsync(project.Solution))
{
var directives = await session.InvokeAsync<IEnumerable<DirectiveDescriptor>>("GetDirectivesAsync", new object[] { project.Id.Id, "Foo", }).ConfigureAwait(false);
var directives = await session.InvokeAsync<IEnumerable<DirectiveDescriptor>>(
"GetDirectivesAsync",
new object[] { project.Id.Id, "Foo", },
cancellationToken)
.ConfigureAwait(false);
return directives;
}
}
@ -37,4 +41,4 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
}
}
}
#endif
#endif

6
src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDocumentGenerator.cs
View File

@ -21,7 +21,11 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
using (var session = await client.CreateSessionAsync(project.Solution))
{
var document = await session.InvokeAsync<RazorEngineDocument>("GenerateDocumentAsync", new object[] { project.Id.Id, "Foo", filePath, text }).ConfigureAwait(false);
var document = await session.InvokeAsync<RazorEngineDocument>(
"GenerateDocumentAsync",
new object[] { project.Id.Id, "Foo", filePath, text },
cancellationToken)
.ConfigureAwait(false);
return document;
}
}

6
src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs
View File

@ -44,8 +44,10 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
if (session != null)
{
var jsonObject = await session.InvokeAsync<JObject>(
"GetTagHelpersAsync",
new object[] { project.Id.Id, "Foo", }).ConfigureAwait(false);
"GetTagHelpersAsync",
new object[] { project.Id.Id, "Foo", },
CancellationToken.None
).ConfigureAwait(false);
result = GetTagHelperResolutionResult(jsonObject);