Fix VSSDK warnings.

grokys · grokys · commit ba8382400c4e · 2018-12-14T08:22:39.000+01:00
Left intact warnings that are actually warning us that something is a bit iffy, and "Async" suffix warnings which we need to decide a policy on. We're also hitting microsoft/VSSDK-Analyzers#95 in a number of places.
diff --git a/src/GitHub.InlineReviews/Commands/InlineCommentNavigationCommand.cs b/src/GitHub.InlineReviews/Commands/InlineCommentNavigationCommand.cs
@@ -9,9 +9,11 @@
 using GitHub.Models;
 using GitHub.Services;
 using GitHub.Services.Vssdk.Commands;
+using Microsoft;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Editor;
+using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Differencing;
@@ -99,6 +101,8 @@ protected int GetCursorPoint(ITextView textView, int lineNumber)
         /// </remarks>
         protected IEnumerable<ITextView> GetCurrentTextViews()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             var result = new List<ITextView>();
 
             try
@@ -164,6 +168,8 @@ protected IEnumerable<ITextView> GetCurrentTextViews()
                     }
 
                     var model = (IComponentModel)serviceProvider.GetService(typeof(SComponentModel));
+                    Assumes.Present(model);
+
                     var adapterFactory = model.GetService<IVsEditorAdaptersFactoryService>();
                     var wpfTextView = adapterFactory.GetWpfTextView(textView);
                     result.Add(wpfTextView);
diff --git a/src/GitHub.InlineReviews/Commands/ToggleInlineCommentMarginCommand.cs b/src/GitHub.InlineReviews/Commands/ToggleInlineCommentMarginCommand.cs
@@ -9,6 +9,7 @@
 using Microsoft.VisualStudio.TextManager.Interop;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Editor;
+using GitHub.Extensions;
 
 namespace GitHub.InlineReviews.Commands
 {
@@ -42,7 +43,7 @@ public ToggleInlineCommentMarginCommand(
 
         public override Task Execute()
         {
-            usageTracker.Value.IncrementCounter(x => x.ExecuteToggleInlineCommentMarginCommand);
+            usageTracker.Value.IncrementCounter(x => x.ExecuteToggleInlineCommentMarginCommand).Forget();
 
             IVsTextView activeView = null;
             if (textManager.Value.GetActiveView(1, null, out activeView) == VSConstants.S_OK)
diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -289,10 +289,10 @@
       <Version>0.2.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers">
-      <Version>15.8.33</Version>
+      <Version>15.8.36</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>15.8.122</Version>
+      <Version>15.8.192</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
       <Version>15.8.3252</Version>
diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.cs b/src/GitHub.InlineReviews/InlineReviewsPackage.cs
@@ -12,6 +12,7 @@
 using Microsoft.VisualStudio.Threading;
 using Serilog;
 using Task = System.Threading.Tasks.Task;
+using Microsoft;
 
 namespace GitHub.InlineReviews
 {
@@ -27,8 +28,9 @@ protected override async Task InitializeAsync(
             CancellationToken cancellationToken,
             IProgress<ServiceProgressData> progress)
         {
-            var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
+            Assumes.Present(componentModel);
+
             var exports = componentModel.DefaultExportProvider;
 
             // Avoid delays when there is ongoing UI activity.
@@ -45,6 +47,8 @@ async Task InitializeMenus()
             }
 
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
+            Assumes.Present(componentModel);
+
             var exports = componentModel.DefaultExportProvider;
             var commands = new IVsCommandBase[]
             {
@@ -55,6 +59,8 @@ async Task InitializeMenus()
 
             await JoinableTaskFactory.SwitchToMainThreadAsync();
             var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
+            Assumes.Present(componentModel);
+
             menuService.AddCommands(commands);
         }
     }
diff --git a/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs b/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs
@@ -770,7 +770,7 @@ int GetUpdatedLineNumber(IInlineCommentThreadModel thread, IEnumerable<DiffChunk
 
         Task<IRepository> GetRepository(LocalRepositoryModel repository)
         {
-            return Task.Factory.StartNew(() => gitService.GetRepository(repository.LocalPath));
+            return Task.Run(() => gitService.GetRepository(repository.LocalPath));
         }
 
         async Task<LastCommitAdapter> GetPullRequestLastCommitAdapter(HostAddress address, string owner, string name, int number)
diff --git a/src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs b/src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs
@@ -160,10 +160,10 @@ public async Task Initialize()
             }
 
             fileSubscription?.Dispose();
-            fileSubscription = file.LinesChanged.ObserveOn(RxApp.MainThreadScheduler).Subscribe(LinesChanged);
+            fileSubscription = file.LinesChanged.ObserveOn(RxApp.MainThreadScheduler).Subscribe(x => LinesChanged(x).Forget());
         }
 
-        async void LinesChanged(IReadOnlyList<Tuple<int, DiffSide>> lines)
+        async Task LinesChanged(IReadOnlyList<Tuple<int, DiffSide>> lines)
         {
             try
             {
diff --git a/src/GitHub.VisualStudio/GitContextPackage.cs b/src/GitHub.VisualStudio/GitContextPackage.cs
@@ -6,6 +6,7 @@
 using Microsoft.VisualStudio.Shell;
 using Task = System.Threading.Tasks.Task;
 using static Microsoft.VisualStudio.VSConstants;
+using Microsoft;
 
 namespace GitHub.VisualStudio
 {
@@ -28,6 +29,8 @@ protected async override Task InitializeAsync(CancellationToken cancellationToke
             }
 
             var gitExt = (IVSGitExt)await GetServiceAsync(typeof(IVSGitExt));
+            Assumes.Present(gitExt);
+
             var context = UIContext.FromUIContextGuid(new Guid(Guids.UIContext_Git));
             RefreshContext(context, gitExt);
             gitExt.ActiveRepositoriesChanged += () =>
diff --git a/src/GitHub.VisualStudio/GitHubPackage.cs b/src/GitHub.VisualStudio/GitHubPackage.cs
@@ -24,6 +24,7 @@
 using Microsoft.VisualStudio.Shell.Interop;
 using Serilog;
 using Task = System.Threading.Tasks.Task;
+using Microsoft;
 
 namespace GitHub.VisualStudio
 {
@@ -80,6 +81,8 @@ async Task InitializeMenus()
             if (ExportForVisualStudioProcessAttribute.IsVisualStudioProcess())
             {
                 var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
+                Assumes.Present(componentModel);
+
                 var exports = componentModel.DefaultExportProvider;
                 commands = new IVsCommandBase[]
                 {
@@ -111,11 +114,15 @@ async Task InitializeMenus()
 
             await JoinableTaskFactory.SwitchToMainThreadAsync();
             var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
+            Assumes.Present(menuService);
+
             menuService.AddCommands(commands);
         }
 
         async Task EnsurePackageLoaded(Guid packageGuid)
         {
+            await JoinableTaskFactory.SwitchToMainThreadAsync(DisposalToken);
+
             var shell = await GetServiceAsync(typeof(SVsShell)) as IVsShell;
             if (shell != null)
             {
@@ -233,6 +240,8 @@ async Task CheckBindingPathsAsync()
 
         public async Task<IGitHubPaneViewModel> ShowGitHubPane()
         {
+            await JoinableTaskFactory.SwitchToMainThreadAsync(DisposalToken);
+
             var pane = ShowToolWindow(new Guid(GitHubPane.GitHubPaneGuid));
             if (pane == null)
                 return null;
@@ -248,6 +257,8 @@ public async Task<IGitHubPaneViewModel> ShowGitHubPane()
 
         static ToolWindowPane ShowToolWindow(Guid windowGuid)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             IVsWindowFrame frame;
             if (ErrorHandler.Failed(Services.UIShell.FindToolWindow((uint)__VSCREATETOOLWIN.CTW_fForceCreate,
                 ref windowGuid, out frame)))
@@ -290,6 +301,8 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
                 // These services are got through MEF and we will take a performance hit if ILoginManager is requested during 
                 // InitializeAsync. TODO: We can probably make LoginManager a normal MEF component rather than a service.
                 var serviceProvider = await GetServiceAsync(typeof(IGitHubServiceProvider)) as IGitHubServiceProvider;
+                Assumes.Present(serviceProvider);
+
                 var keychain = serviceProvider.GetService<IKeychain>();
                 var oauthListener = serviceProvider.GetService<IOAuthCallbackListener>();
 
@@ -319,6 +332,8 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
             else if (serviceType == typeof(IUsageService))
             {
                 var sp = await GetServiceAsync(typeof(IGitHubServiceProvider)) as IGitHubServiceProvider;
+                Assumes.Present(sp);
+
                 var environment = new Rothko.Environment();
                 return new UsageService(sp, environment);
             }
@@ -327,6 +342,11 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
                 var usageService = await GetServiceAsync(typeof(IUsageService)) as IUsageService;
                 var serviceProvider = await GetServiceAsync(typeof(IGitHubServiceProvider)) as IGitHubServiceProvider;
                 var settings = await GetServiceAsync(typeof(IPackageSettings)) as IPackageSettings;
+
+                Assumes.Present(usageService);
+                Assumes.Present(serviceProvider);
+                Assumes.Present(settings);
+
                 return new UsageTracker(serviceProvider, usageService, settings);
             }
             else if (serviceType == typeof(IVSGitExt))
@@ -352,6 +372,8 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
             else
             {
                 var sp = await GetServiceAsync(typeof(IGitHubServiceProvider)) as IGitHubServiceProvider;
+                Assumes.Present(sp);
+
                 return sp.TryGetService(serviceType);
             }
         }
diff --git a/src/GitHub.VisualStudio/Helpers/ActiveDocumentSnapshot.cs b/src/GitHub.VisualStudio/Helpers/ActiveDocumentSnapshot.cs
@@ -18,6 +18,8 @@ public class ActiveDocumentSnapshot : IActiveDocumentSnapshot
         [ImportingConstructor]
         public ActiveDocumentSnapshot([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             StartLine = EndLine = -1;
             var document = Services.Dte2?.ActiveDocument;
             Name = document.FullName.Equals(document.ProjectItem.FileNames[1], StringComparison.OrdinalIgnoreCase) ? document.ProjectItem.FileNames[1] : document.FullName;
diff --git a/src/GitHub.VisualStudio/Helpers/Browser.cs b/src/GitHub.VisualStudio/Helpers/Browser.cs
@@ -41,7 +41,12 @@ public void OpenUrl(Uri uri)
             {
                 __VSCREATEWEBBROWSER createFlags = __VSCREATEWEBBROWSER.VSCWB_AutoShow;
                 VSPREVIEWRESOLUTION resolution = VSPREVIEWRESOLUTION.PR_Default;
-                int result = ErrorHandler.CallWithCOMConvention(() => service.CreateExternalWebBrowser((uint)createFlags, resolution, uri.AbsoluteUri));
+                int result = ErrorHandler.CallWithCOMConvention(() =>
+                {
+                    ThreadHelper.ThrowIfNotOnUIThread();
+                    service.CreateExternalWebBrowser((uint)createFlags, resolution, uri.AbsoluteUri);
+                });
+
                 if (ErrorHandler.Succeeded(result))
                     return;
             }
diff --git a/src/GitHub.VisualStudio/Services/UsageService.cs b/src/GitHub.VisualStudio/Services/UsageService.cs
@@ -85,11 +85,13 @@ public async Task<Guid> GetUserGuid()
         public IDisposable StartTimer(Func<Task> callback, TimeSpan dueTime, TimeSpan period)
         {
             return new Timer(
+#pragma warning disable VSTHRD101 // Avoid unsupported async delegates
                 async _ =>
                 {
                     try { await callback(); }
                     catch (Exception ex) { log.Warning(ex, "Failed submitting usage data"); }
                 },
+#pragma warning restore VSTHRD101 // Avoid unsupported async delegates
                 null,
                 dueTime,
                 period);
diff --git a/src/GitHub.VisualStudio/UI/GitHubPane.cs b/src/GitHub.VisualStudio/UI/GitHubPane.cs
@@ -13,6 +13,7 @@
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Threading;
 using ReactiveUI;
+using Microsoft;
 
 namespace GitHub.VisualStudio.UI
 {
@@ -94,6 +95,7 @@ async Task<IGitHubPaneViewModel> InitializeAsync(AsyncPackage asyncPackage)
 
                 // Allow MEF to initialize its cache asynchronously
                 var provider = (IGitHubServiceProvider)await asyncPackage.GetServiceAsync(typeof(IGitHubServiceProvider));
+                Assumes.Present(provider);
 
                 var teServiceHolder = provider.GetService<ITeamExplorerServiceHolder>();
                 teServiceHolder.ServiceProvider = this;
@@ -139,6 +141,8 @@ public override void ClearSearch()
 
         public override void OnToolWindowCreated()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             base.OnToolWindowCreated();
 
             Marshal.ThrowExceptionForHR(((IVsWindowFrame)Frame)?.SetProperty(
@@ -165,6 +169,8 @@ void ShowError(Exception e)
 
         void UpdateSearchHost(bool enabled, string query)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             if (SearchHost != null)
             {
                 SearchHost.IsEnabled = enabled;
@@ -197,6 +203,8 @@ public SearchTask(
 
             protected override void OnStartSearch()
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
+
                 viewModel.SearchQuery = SearchQuery.SearchString;
                 base.OnStartSearch();
             }
diff --git a/test/GitHub.VisualStudio.UnitTests/GlobalSuppressions.cs b/test/GitHub.VisualStudio.UnitTests/GlobalSuppressions.cs
@@ -8,3 +8,6 @@
     Justification = "It's okay for nested unit test types to be visible")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores",
     Justification = "It's okay for unit test names to contain underscores")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "VSSDK006:Check services exist",
+    Justification = "We're mocking the services")]
+
diff --git a/test/Helpers/GlobalSuppressions.cs b/test/Helpers/GlobalSuppressions.cs
@@ -6,3 +6,6 @@
 [assembly: SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores")]
 [assembly: SuppressMessage("Performance", "CA1826:Do not use Enumerable methods on indexable collections. Instead use the collection directly")]
 [assembly: SuppressMessage("Reliability", "CA2007:Do not directly await a Task")]
+[assembly: SuppressMessage("Usage", "VSTHRD101:Avoid unsupported async delegates")]
+[assembly: SuppressMessage("Usage", "VSTHRD110:Observe result of async calls")]
+[assembly: SuppressMessage("Style", "VSTHRD200:Use \"Async\" suffix for async methods")]

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using Microsoft.VisualStudio.TextManager.Interop;`
`10`	`10`	`using Microsoft.VisualStudio;`
`11`	`11`	`using Microsoft.VisualStudio.Editor;`
	`12`	`+using GitHub.Extensions;`
`12`	`13`
`13`	`14`	`namespace GitHub.InlineReviews.Commands`
`14`	`15`	`{`
`@@ -42,7 +43,7 @@ public ToggleInlineCommentMarginCommand(`
`42`	`43`
`43`	`44`	`public override Task Execute()`
`44`	`45`	`{`
`45`		`- usageTracker.Value.IncrementCounter(x => x.ExecuteToggleInlineCommentMarginCommand);`
	`46`	`+ usageTracker.Value.IncrementCounter(x => x.ExecuteToggleInlineCommentMarginCommand).Forget();`
`46`	`47`
`47`	`48`	`IVsTextView activeView = null;`
`48`	`49`	`if (textManager.Value.GetActiveView(1, null, out activeView) == VSConstants.S_OK)`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using Microsoft.VisualStudio.Threading;`
`13`	`13`	`using Serilog;`
`14`	`14`	`using Task = System.Threading.Tasks.Task;`
	`15`	`+using Microsoft;`
`15`	`16`
`16`	`17`	`namespace GitHub.InlineReviews`
`17`	`18`	`{`
`@@ -27,8 +28,9 @@ protected override async Task InitializeAsync(`
`27`	`28`	`CancellationToken cancellationToken,`
`28`	`29`	`IProgress<ServiceProgressData> progress)`
`29`	`30`	`{`
`30`		`- var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));`
`31`	`31`	`var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));`
	`32`	`+ Assumes.Present(componentModel);`
	`33`	`+`
`32`	`34`	`var exports = componentModel.DefaultExportProvider;`
`33`	`35`
`34`	`36`	`// Avoid delays when there is ongoing UI activity.`
`@@ -45,6 +47,8 @@ async Task InitializeMenus()`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));`
	`50`	`+ Assumes.Present(componentModel);`
	`51`	`+`
`48`	`52`	`var exports = componentModel.DefaultExportProvider;`
`49`	`53`	`var commands = new IVsCommandBase[]`
`50`	`54`	`{`
`@@ -55,6 +59,8 @@ async Task InitializeMenus()`
`55`	`59`
`56`	`60`	`await JoinableTaskFactory.SwitchToMainThreadAsync();`
`57`	`61`	`var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));`
	`62`	`+ Assumes.Present(componentModel);`
	`63`	`+`
`58`	`64`	`menuService.AddCommands(commands);`
`59`	`65`	`}`
`60`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -770,7 +770,7 @@ int GetUpdatedLineNumber(IInlineCommentThreadModel thread, IEnumerable<DiffChunk`
`770`	`770`
`771`	`771`	`Task<IRepository> GetRepository(LocalRepositoryModel repository)`
`772`	`772`	`{`
`773`		`- return Task.Factory.StartNew(() => gitService.GetRepository(repository.LocalPath));`
	`773`	`+ return Task.Run(() => gitService.GetRepository(repository.LocalPath));`
`774`	`774`	`}`
`775`	`775`
`776`	`776`	`async Task<LastCommitAdapter> GetPullRequestLastCommitAdapter(HostAddress address, string owner, string name, int number)`
Original file line number	Diff line number	Diff line change
`@@ -160,10 +160,10 @@ public async Task Initialize()`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`fileSubscription?.Dispose();`
`163`		`- fileSubscription = file.LinesChanged.ObserveOn(RxApp.MainThreadScheduler).Subscribe(LinesChanged);`
	`163`	`+ fileSubscription = file.LinesChanged.ObserveOn(RxApp.MainThreadScheduler).Subscribe(x => LinesChanged(x).Forget());`
`164`	`164`	`}`
`165`	`165`
`166`		`- async void LinesChanged(IReadOnlyList<Tuple<int, DiffSide>> lines)`
	`166`	`+ async Task LinesChanged(IReadOnlyList<Tuple<int, DiffSide>> lines)`
`167`	`167`	`{`
`168`	`168`	`try`
`169`	`169`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using Microsoft.VisualStudio.Shell;`
`7`	`7`	`using Task = System.Threading.Tasks.Task;`
`8`	`8`	`using static Microsoft.VisualStudio.VSConstants;`
	`9`	`+using Microsoft;`
`9`	`10`
`10`	`11`	`namespace GitHub.VisualStudio`
`11`	`12`	`{`
`@@ -28,6 +29,8 @@ protected async override Task InitializeAsync(CancellationToken cancellationToke`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`var gitExt = (IVSGitExt)await GetServiceAsync(typeof(IVSGitExt));`
	`32`	`+ Assumes.Present(gitExt);`
	`33`	`+`
`31`	`34`	`var context = UIContext.FromUIContextGuid(new Guid(Guids.UIContext_Git));`
`32`	`35`	`RefreshContext(context, gitExt);`
`33`	`36`	`gitExt.ActiveRepositoriesChanged += () =>`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ public class ActiveDocumentSnapshot : IActiveDocumentSnapshot`
`18`	`18`	`[ImportingConstructor]`
`19`	`19`	`public ActiveDocumentSnapshot([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)`
`20`	`20`	`{`
	`21`	`+ ThreadHelper.ThrowIfNotOnUIThread();`
	`22`	`+`
`21`	`23`	`StartLine = EndLine = -1;`
`22`	`24`	`var document = Services.Dte2?.ActiveDocument;`
`23`	`25`	`Name = document.FullName.Equals(document.ProjectItem.FileNames[1], StringComparison.OrdinalIgnoreCase) ? document.ProjectItem.FileNames[1] : document.FullName;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,12 @@ public void OpenUrl(Uri uri)`
`41`	`41`	`{`
`42`	`42`	`__VSCREATEWEBBROWSER createFlags = __VSCREATEWEBBROWSER.VSCWB_AutoShow;`
`43`	`43`	`VSPREVIEWRESOLUTION resolution = VSPREVIEWRESOLUTION.PR_Default;`
`44`		`- int result = ErrorHandler.CallWithCOMConvention(() => service.CreateExternalWebBrowser((uint)createFlags, resolution, uri.AbsoluteUri));`
	`44`	`+ int result = ErrorHandler.CallWithCOMConvention(() =>`
	`45`	`+ {`
	`46`	`+ ThreadHelper.ThrowIfNotOnUIThread();`
	`47`	`+ service.CreateExternalWebBrowser((uint)createFlags, resolution, uri.AbsoluteUri);`
	`48`	`+ });`
	`49`	`+`
`45`	`50`	`if (ErrorHandler.Succeeded(result))`
`46`	`51`	`return;`
`47`	`52`	`}`