Merge pull request #8857 from mono/pr-sandy-roslyn-3.4.0-beta2-19476-01

Bump Roslyn to 3.4.0-beta2-19476-01

Author: sandyarmstrong

main/msbuild/RoslynVersion.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <NuGetVersionRoslyn>3.4.0-beta1-19462-14</NuGetVersionRoslyn>
+    <NuGetVersionRoslyn>3.4.0-beta2-19476-01</NuGetVersionRoslyn>
   </PropertyGroup>
 </Project>

main/src/addins/CSharpBinding/CSharpBinding.csproj

@@ -252,20 +252,11 @@
     <Compile Include="MonoDevelop.CSharp.Navigation\Counters.cs" />
     <Compile Include="MonoDevelop.CSharp.Project\CSharpLanguageVersionHelper.cs" />
     <Compile Include="MonoDevelop.CSharp\DocumentContextExtension.cs" />
-    <Compile Include="MonoDevelop.Ide.Completion.Presentation\RoslynCompletionPresenter.cs" />
-    <Compile Include="MonoDevelop.Ide.Completion.Presentation\RoslynCompletionPresenterSession.ICompletionPresenterSession.cs" />
     <Compile Include="MonoDevelop.Ide.Completion.Presentation\ContainedDocumentPreserveFormattingRule.cs" />
     <Compile Include="MonoDevelop.Ide.Completion.Presentation\ExtensionMethods.cs" />
     <Compile Include="MonoDevelop.Ide.Completion.Presentation\IMonoDevelopContainedLanguageHost.cs" />
-    <Compile Include="MonoDevelop.Ide.Completion.Presentation\IMyRoslynCompletionDataProvider.cs" />
     <Compile Include="MonoDevelop.Ide.Completion.Presentation\MonoDevelopContainedDocument.cs" />
     <Compile Include="MonoDevelop.Ide.Completion.Presentation\MonoDevelopFormattingRuleFactoryServiceFactory.cs" />
-    <Compile Include="MonoDevelop.Ide.Completion.Presentation\MyCSharpCompletionData.cs" />
-    <Compile Include="MonoDevelop.Ide.Completion.Presentation\MyCSharpCompletionDataProvider.cs" />
-    <Compile Include="MonoDevelop.Ide.Completion.Presentation\MyRoslynCompletionData.cs" />
-    <Compile Include="MonoDevelop.Ide.Completion.Presentation\RoslynCommandTarget.cs" />
-    <Compile Include="MonoDevelop.Ide.Completion.Presentation\RoslynCompletionPresenterSession.View.cs" />
-    <Compile Include="MonoDevelop.Ide.Completion.Presentation\RoslynCompletionPresenterSession.IIntelliSensePresenterSession.cs" />
     <Compile Include="MonoDevelop.CSharp.Completion\CompletionProvider\PreProcessorCompletionProvider.cs" />
     <Compile Include="Gui\MonoDevelop.CodeGeneration.GenerateCodeWindow.cs" />
     <Compile Include="Gui\MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog.cs" />
@@ -286,7 +277,6 @@
     <Compile Include="MonoDevelop.CSharp.Formatting\OnTheFlyFormattingPanel.cs" />
     <Compile Include="MonoDevelop.CSharp.OptionProvider\StyleViewModel.cs" />
     <Compile Include="MonoDevelop.CSharp\CSharpPathedDocumentExtension.cs" />
-    <Compile Include="MonoDevelop.Ide.Completion.Presentation\RoslynExperimentationService.cs" />
     <Compile Include="MonoDevelop.CSharp.Debugger\RoslynDebugInfoProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.Refactoring\CommandArgsFactories.cs" />
     <Compile Include="MonoDevelop.CSharp.Debugger\DebuggerCompletionController.cs" />

main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RefactoryCommands.cs

@@ -109,10 +109,11 @@ internal static async Task SortAndRemoveUnusedImports (Document originalDocument
 			var workspace = originalDocument.Project.Solution.Workspace;
 
 			var unnecessaryImportsService = originalDocument.GetLanguageService<IRemoveUnnecessaryImportsService> ();
+			var organizeImportsService = originalDocument.GetLanguageService<IOrganizeImportsService> ();
 
 			// Remove unnecessary imports and sort them
 			var removedImportsDocument = await unnecessaryImportsService.RemoveUnnecessaryImportsAsync (originalDocument, cancellationToken);
-			var resultDocument = await OrganizeImportsService.OrganizeImportsAsync (removedImportsDocument, cancellationToken);
+			var resultDocument = await organizeImportsService.OrganizeImportsAsync (removedImportsDocument, cancellationToken);
 
 			// Apply the document change if needed
 			if (resultDocument != originalDocument) {