diff --git a/build/dependencies.props b/build/dependencies.props
index c68b341568..eddd9838e6 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -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>
 
diff --git a/src/Microsoft.CodeAnalysis.Remote.Razor/DefaultTagHelperResolver.cs b/src/Microsoft.CodeAnalysis.Remote.Razor/DefaultTagHelperResolver.cs
index 30e1c638e4..43b55a5b50 100644
--- a/src/Microsoft.CodeAnalysis.Remote.Razor/DefaultTagHelperResolver.cs
+++ b/src/Microsoft.CodeAnalysis.Remote.Razor/DefaultTagHelperResolver.cs
@@ -43,4 +43,4 @@ namespace Microsoft.CodeAnalysis.Remote.Razor
             return resolutionResult;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs b/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs
index b3a165bcd4..930abdee3a 100644
--- a/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs
+++ b/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs
@@ -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);
diff --git a/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDirectiveResolver.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDirectiveResolver.cs
index 870bbc6617..63b6f1781e 100644
--- a/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDirectiveResolver.cs
+++ b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDirectiveResolver.cs
@@ -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
\ No newline at end of file
+#endif
diff --git a/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDocumentGenerator.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDocumentGenerator.cs
index 308e67e585..181b98f9b1 100644
--- a/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDocumentGenerator.cs
+++ b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDocumentGenerator.cs
@@ -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;
                 }
             }
diff --git a/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs
index 22804f9b90..5d8ba6b26d 100644
--- a/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs
+++ b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs
@@ -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);