Use internal browser window (finally figured it out!)

hatzhang · May 15, 2024 · 24bc74b · 24bc74b
1 parent d580af2
commit 24bc74b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.204",
+    "version": "8.0.205",
     "rollForward": "disable"
   }
 }
diff --git a/src/GUI/Shared/Handlers/DacpacAnalyzerHandler.cs b/src/GUI/Shared/Handlers/DacpacAnalyzerHandler.cs
@@ -7,6 +7,7 @@
 using EFCorePowerTools.Handlers.ReverseEngineer;
 using EFCorePowerTools.Helpers;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
 using RevEng.Common;
 
 namespace EFCorePowerTools.Handlers
@@ -44,7 +45,10 @@ public async Task GenerateAsync(string path, bool isConnectionString)
 
                 await VS.StatusBar.ShowProgressAsync("Generating DACPAC Analysis report...", 3, 3);
 
-                ShowReport(reportPath);
+                if (File.Exists(reportPath))
+                {
+                    await OpenVsWebBrowserAsync(reportPath);
+                }
 
                 Telemetry.TrackEvent("PowerTools.GenerateDacpacReport");
             }
@@ -64,12 +68,25 @@ private async Task<string> GetDacpacReportAsync(string path, bool isConnectionSt
             return await launcher.GetReportPathAsync(path, isConnectionString);
         }
 
-        private void ShowReport(string path)
+        private void OpenWebBrowser(string path)
+        {
+            Process.Start(path);
+        }
+
+        private async Task OpenVsWebBrowserAsync(string path)
         {
-            if (File.Exists(path))
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+
+            var service = await VS.GetServiceAsync<SVsWebBrowsingService, IVsWebBrowsingService>();
+
+            if (service == null)
             {
-                Process.Start(path);
+                OpenWebBrowser(path);
+                return;
             }
+
+            service.Navigate(path, (uint)__VSWBNAVIGATEFLAGS.VSNWB_ForceNew, out var frame);
+            frame.Show();
         }
     }
 }