Revert Roslyn dev dependency increase.

- This is needed for the Razor editor to work inside of VS. Once a version of VS is published that supports 2.6 + then we can undo this change.
This commit is contained in:
N. Taylor Mullen 2017-07-18 16:27:51 -07:00
parent 6c7859bfba
commit 8fac9141d8
5 changed files with 7 additions and 17 deletions

View File

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

View File

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

View File

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

View File

@ -21,11 +21,7 @@ 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 },
cancellationToken)
.ConfigureAwait(false);
var document = await session.InvokeAsync<RazorEngineDocument>("GenerateDocumentAsync", new object[] { project.Id.Id, "Foo", filePath, text }).ConfigureAwait(false);
return document;
}
}

View File

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