Skip to content

move to new OperationProgress API. #37781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
7 commits merged into from
Sep 6, 2019
Merged

move to new OperationProgress API. #37781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f21c943
move to new OperationProgress API.
heejaechang Aug 7, 2019
5e6dd1e
Merge branch 'master-vs-deps' of https://github.com/dotnet/roslyn int…
heejaechang Aug 14, 2019
06e3133
moved to new API
heejaechang Aug 14, 2019
9f03fcd
moved VS SDK to new version and supressed newly added analyzers from …
heejaechang Sep 5, 2019
ea7af80
removed temp code I forgot to remove
heejaechang Sep 5, 2019
5768ab6
resolve RS1016 issue
heejaechang Sep 6, 2019
a5c82f3
added github issue link
heejaechang Sep 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Versions used by several individual references below -->
<RoslynDiagnosticsNugetPackageVersion>2.9.3</RoslynDiagnosticsNugetPackageVersion>
<RoslynDiagnosticsNugetPackageVersion>2.9.4</RoslynDiagnosticsNugetPackageVersion>
Copy link
Member

@jasonmalinowski jasonmalinowski Sep 6, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mavasani Was this the buggy version that had that big memory leak?

Copy link
Contributor

@mavasani mavasani Sep 6, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Memory leak has been there since 2.9.3, but we explicitly turned off all the DFA rules that could cause it in our solution ruleset. Not sure if 2.9.4 has more DFA rules on by default. I am planning to publish 2.9.5-beta1 today, which has the fix for the memory leak, and will submit a follow-up PR to move to that package before we merge this branch back to master.

<CodeStyleLayerCodeAnalysisVersion>2.8.2</CodeStyleLayerCodeAnalysisVersion>
<MicrosoftCodeAnalysisTestingVersion>1.0.0-beta1-63310-01</MicrosoftCodeAnalysisTestingVersion>
<CodeStyleAnalyzerVersion>3.3.0-beta2-19376-02</CodeStyleAnalyzerVersion>
Expand Down Expand Up @@ -88,7 +88,7 @@
<MicrosoftNetSdkVersion>2.0.0-alpha-20170405-2</MicrosoftNetSdkVersion>
<MicrosoftNuGetBuildTasksVersion>0.1.0</MicrosoftNuGetBuildTasksVersion>
<MicrosoftPortableTargetsVersion>0.1.2-dev</MicrosoftPortableTargetsVersion>
<MicrosoftServiceHubClientVersion>1.3.23</MicrosoftServiceHubClientVersion>
<MicrosoftServiceHubClientVersion>2.0.48</MicrosoftServiceHubClientVersion>
<MicrosoftVisualBasicVersion>10.1.0</MicrosoftVisualBasicVersion>
<MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>15.8.27812-alpha</MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>
<MicrosoftVisualStudioCodeAnalysisSdkUIVersion>15.8.27812-alpha</MicrosoftVisualStudioCodeAnalysisSdkUIVersion>
Expand Down Expand Up @@ -125,10 +125,10 @@
<MicrosoftVisualStudioProjectSystemVersion>16.2.133-pre</MicrosoftVisualStudioProjectSystemVersion>
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
<MicrosoftVisualStudioRemoteControlVersion>14.1.10</MicrosoftVisualStudioRemoteControlVersion>
<MicrosoftVisualStudioSDKAnalyzersVersion>15.7.7</MicrosoftVisualStudioSDKAnalyzersVersion>
<MicrosoftVisualStudioSDKAnalyzersVersion>16.3.2</MicrosoftVisualStudioSDKAnalyzersVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>1.16.30</MicrosoftVisualStudioSetupConfigurationInteropVersion>
<MicrosoftVisualStudioShell150Version>16.0.28226-pre</MicrosoftVisualStudioShell150Version>
<MicrosoftVisualStudioShellFrameworkVersion>16.1.28917.181</MicrosoftVisualStudioShellFrameworkVersion>
<MicrosoftVisualStudioShellFrameworkVersion>16.3.29212.169</MicrosoftVisualStudioShellFrameworkVersion>
<MicrosoftVisualStudioShellDesignVersion>15.7.27703</MicrosoftVisualStudioShellDesignVersion>
<MicrosoftVisualStudioShellImmutable100Version>15.0.25415</MicrosoftVisualStudioShellImmutable100Version>
<MicrosoftVisualStudioShellImmutable110Version>15.0.25415</MicrosoftVisualStudioShellImmutable110Version>
Expand All @@ -151,9 +151,9 @@
<MicrosoftVisualStudioTextManagerInterop120Version>12.0.30110</MicrosoftVisualStudioTextManagerInterop120Version>
<MicrosoftVisualStudioTextManagerInterop121DesignTimeVersion>12.1.30328</MicrosoftVisualStudioTextManagerInterop121DesignTimeVersion>
<MicrosoftVisualStudioTextManagerInterop160DesignTimeVersion>16.0.0</MicrosoftVisualStudioTextManagerInterop160DesignTimeVersion>
<MicrosoftVisualStudioThreadingAnalyzersVersion>16.0.102</MicrosoftVisualStudioThreadingAnalyzersVersion>
<MicrosoftVisualStudioThreadingAnalyzersVersion>16.3.13</MicrosoftVisualStudioThreadingAnalyzersVersion>
<MicrosoftVisualStudioThreadingVersion>16.3.13</MicrosoftVisualStudioThreadingVersion>
<MicrosoftVisualStudioUtilitiesVersion>16.3.29124.81</MicrosoftVisualStudioUtilitiesVersion>
<MicrosoftVisualStudioUtilitiesVersion>16.3.29212.169</MicrosoftVisualStudioUtilitiesVersion>
<MicrosoftVisualStudioValidationVersion>15.3.23</MicrosoftVisualStudioValidationVersion>
<MicrosoftVisualStudioVsInteractiveWindowVersion>2.0.0-rc3-61304-01</MicrosoftVisualStudioVsInteractiveWindowVersion>
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
Expand All @@ -177,7 +177,7 @@
<RoslynToolsLightUpSystemRuntimeLoaderFixedVersion>4.3.0</RoslynToolsLightUpSystemRuntimeLoaderFixedVersion>
<RoslynMicrosoftVisualStudioExtensionManagerVersion>0.0.4</RoslynMicrosoftVisualStudioExtensionManagerVersion>
<SourceBrowserVersion>1.0.21</SourceBrowserVersion>
<StreamJsonRpcVersion>2.0.187</StreamJsonRpcVersion>
<StreamJsonRpcVersion>2.1.55</StreamJsonRpcVersion>
<SystemBuffersVersion>4.5.0</SystemBuffersVersion>
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
<SystemCommandLineExperimentalVersion>0.1.0-alpha-63729-01</SystemCommandLineExperimentalVersion>
Expand Down
2 changes: 2 additions & 0 deletions eng/config/rulesets/Shipping.ruleset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<Rule Id="CA1822" Action="None" /> <!-- https://github.com/dotnet/roslyn/issues/25132: Enable rule CA1822 (Mark members as static) on Roslyn.sln -->
<Rule Id="CA1823" Action="None" /> <!-- https://github.com/dotnet/roslyn/issues/20404: Enable rule CA1823 (remove unused field) once we have a fixer for it -->
<Rule Id="CA1824" Action="None" /> <!-- mark assemblies with NeutralResourcesLanguageAttribute -->
<Rule Id="CA1827" Action="None" /> <!-- https://github.com/dotnet/roslyn/issues/37959: DoNotUseCountWhenAnyCanBeUsed -->
<Rule Id="CA2000" Action="None" /> <!-- https://github.com/dotnet/roslyn/issues/25880 -->
<Rule Id="CA2007" Action="Warning" />
<Rule Id="CA2211" Action="None" />
Expand Down Expand Up @@ -163,6 +164,7 @@
<!-- https://github.com/Microsoft/VSSDK-Analyzers/blob/master/doc/index.md -->
<Rule Id="VSSDK001" Action="Warning" /> <!-- Derive from AsyncPackage -->
<Rule Id="VSSDK003" Action="Warning" /> <!-- Support async tool windows -->
<Rule Id="VSSDK006" Action="None" /> <!-- https://github.com/dotnet/roslyn/issues/38545 -->
</Rules>
<Rules AnalyzerId="Microsoft.VisualStudio.Threading.Analyzers" RuleNamespace="Microsoft.VisualStudio.Threading.Analyzers">
<Rule Id="VSTHRD002" Action="None" /> <!-- Avoid problematic synchronous waits -->
Expand Down
2 changes: 1 addition & 1 deletion src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ private void OnDiagnosticsUpdated(object sender, DiagnosticsUpdatedArgs e)
OnSuggestedActionsChanged(e.Workspace, e.DocumentId, e.Solution.WorkspaceVersion);
}

private void OnWorkspaceStatusChanged(object sender, bool fullyLoaded)
private void OnWorkspaceStatusChanged(object sender, EventArgs args)
{
var document = _subjectBuffer.AsTextContainer().GetOpenDocumentInCurrentContext();
if (document == null)
Expand Down
7 changes: 5 additions & 2 deletions ...ditorFeatures/Core/Implementation/RenameTracking/AbstractRenameTrackingCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CodeFixes;
using Microsoft.CodeAnalysis.Editor.Host;
using Microsoft.VisualStudio.Text.Operations;
using Roslyn.Utilities;

namespace Microsoft.CodeAnalysis.Editor.Implementation.RenameTracking
{
Expand Down Expand Up @@ -46,5 +44,10 @@ public sealed override Task RegisterCodeFixesAsync(CodeFixContext context)

return Task.CompletedTask;
}

public override FixAllProvider GetFixAllProvider()
{
return null;
}
}
}
4 changes: 4 additions & 0 deletions src/Test/Diagnostics/RemoteHost/RemoteHostPanel.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ public RemoteHostPanel(Workspace workspace) : this()
_workspace = workspace;
}

#pragma warning disable VSTHRD100 // Avoid async void methods
private async void OnSolutionSave(object sender, RoutedEventArgs e)
#pragma warning restore VSTHRD100 // Avoid async void methods
{
using (Disable(SolutionSaveButton))
{
Expand Down Expand Up @@ -66,7 +68,9 @@ private void OnFileToSave(object sender, RoutedEventArgs e)
}
}

#pragma warning disable VSTHRD100 // Avoid async void methods
private async void OnSolutionOpen(object sender, RoutedEventArgs e)
#pragma warning restore VSTHRD100 // Avoid async void methods
{
using (Disable(SolutionOpenButton))
{
Expand Down
11 changes: 6 additions & 5 deletions ...sualStudio/Core/Def/Implementation/Workspace/VisualStudioWorkspaceStatusServiceFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.ComponentModel;
using System.Composition;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -64,7 +65,7 @@ private class Service : IWorkspaceStatusService

private bool _initialized = false;

public event EventHandler<bool> StatusChanged;
public event EventHandler StatusChanged;

public Service(IAsyncServiceProvider2 serviceProvider, IAsynchronousOperationListener listener)
{
Expand Down Expand Up @@ -113,15 +114,15 @@ public async Task<bool> IsFullyLoadedAsync(CancellationToken cancellationToken)
return false;
}

return !status.Status.IsInProgress;
return !status.IsInProgress;
}

private async Task<IVsOperationProgressStageStatus> GetProgressStageStatusAsync(CancellationToken cancellationToken)
private async Task<IVsOperationProgressStageStatusForSolutionLoad> GetProgressStageStatusAsync(CancellationToken cancellationToken)
{
var service = await _serviceProvider.GetServiceAsync<SVsOperationProgress, IVsOperationProgressStatusService>(throwOnFailure: false)
.WithCancellation(cancellationToken).ConfigureAwait(false);

return service?.GetStageStatus(CommonOperationProgressStageIds.Intellisense);
return service?.GetStageStatusForSolutionLoad(CommonOperationProgressStageIds.Intellisense);
}

private async Task EnsureInitializationAsync(CancellationToken cancellationToken)
Expand All @@ -143,7 +144,7 @@ private async Task EnsureInitializationAsync(CancellationToken cancellationToken
return;
}

status.InProgressChanged += (_, e) => this.StatusChanged?.Invoke(this, !e.Status.IsInProgress);
status.PropertyChanged += (_, e) => this.StatusChanged?.Invoke(this, EventArgs.Empty);
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/VisualStudio/LiveShare/Impl/DiagnosticHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ public DiagnosticsHandler(IDiagnosticService diagnosticService)
_diagnosticService.DiagnosticsUpdated += DiagnosticService_DiagnosticsUpdated;
}

#pragma warning disable VSTHRD100 // Avoid async void methods
private async void DiagnosticService_DiagnosticsUpdated(object sender, DiagnosticsUpdatedArgs e)
#pragma warning restore VSTHRD100 // Avoid async void methods
{
// Since this is an async void method, exceptions here will crash the host VS. We catch exceptions here to make sure that we don't crash the host since
// the worst outcome here is that guests may not see all diagnostics.
Expand Down
2 changes: 2 additions & 0 deletions src/VisualStudio/VisualStudioDiagnosticsToolWindow/Telemetry/TelemetryPanel.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ public TelemetryPanel()
InitializeComponent();
}

#pragma warning disable VSTHRD100 // Avoid async void methods
private async void OnDump(object sender, RoutedEventArgs e)
#pragma warning restore VSTHRD100 // Avoid async void methods
{
using (Disable(DumpButton))
using (Disable(CopyButton))
Expand Down
7 changes: 1 addition & 6 deletions src/Workspaces/Core/Portable/Workspace/Host/Status/IWorkspaceStatusService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,8 @@ internal interface IWorkspaceStatusService : IWorkspaceService
{
/// <summary>
/// Indicate that status has changed
///
/// event argument, true, means solution is fully loaded.
///
/// but right now, bool doesn't mean much but having it since platform API we decide to start with bool rather than
/// more richer information
/// </summary>
event EventHandler<bool> StatusChanged;
event EventHandler StatusChanged;

/// <summary>
/// Wait until workspace is fully loaded
Expand Down
2 changes: 1 addition & 1 deletion src/Workspaces/Core/Portable/Workspace/Host/Status/WorkspaceStatusService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public WorkspaceStatusService()
{
}

event EventHandler<bool> IWorkspaceStatusService.StatusChanged
event EventHandler IWorkspaceStatusService.StatusChanged
{
add { }
remove { }
Expand Down