Refactoring:

- Decouple services to reduce circular dependencies
- Move update panel to a separate control
- Remove unrelated methods from MainWindow

Author: tom-englert

ICSharpCode.ILSpyX/Analyzers/AnalyzerScope.cs

@@ -40,17 +40,14 @@ public class AnalyzerScope
 		/// </summary>
 		public bool IsLocal { get; }
 
-		public AssemblyList AssemblyList { get; }
-
 		public ISymbol AnalyzedSymbol { get; }
 
 		public ITypeDefinition TypeScope => typeScope;
 
-		Accessibility effectiveAccessibility;
+		readonly Accessibility effectiveAccessibility;
 
 		public AnalyzerScope(AssemblyList assemblyList, IEntity entity)
 		{
-			AssemblyList = assemblyList;
 			assemblyListSnapshot = assemblyList.GetSnapshot();
 			AnalyzedSymbol = entity;
 			DetermineEffectiveAccessibility(entity, out typeScope, out effectiveAccessibility);

ICSharpCode.ILSpyX/Analyzers/IAnalyzer.cs

@@ -42,6 +42,7 @@ public interface IAnalyzer
 	public interface IAnalyzerMetadata
 	{
 		string Header { get; }
+
 		int Order { get; }
 	}
 }

ILSpy/AboutPage.cs

@@ -26,36 +26,42 @@
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
-using System.Windows.Navigation;
 
 using ICSharpCode.AvalonEdit.Rendering;
 using ICSharpCode.Decompiler;
-using ICSharpCode.ILSpy.AssemblyTree;
 using ICSharpCode.ILSpy.Properties;
 using ICSharpCode.ILSpy.TextView;
 using ICSharpCode.ILSpy.Themes;
 using ICSharpCode.ILSpy.Updates;
+using ICSharpCode.ILSpy.ViewModels;
 
 namespace ICSharpCode.ILSpy
 {
 	[ExportMainMenuCommand(ParentMenuID = nameof(Resources._Help), Header = nameof(Resources._About), MenuOrder = 99999)]
 	[Shared]
-	public sealed class AboutPageCommand(AssemblyTreeModel assemblyTreeModel) : SimpleCommand
+	public sealed class AboutPage : SimpleCommand
 	{
+		readonly SettingsService settingsService;
+		readonly IEnumerable<IAboutPageAddition> aboutPageAdditions;
+
+		public AboutPage(SettingsService settingsService, IEnumerable<IAboutPageAddition> aboutPageAdditions)
+		{
+			this.settingsService = settingsService;
+			this.aboutPageAdditions = aboutPageAdditions;
+			MessageBus<ShowAboutPageEventArgs>.Subscribers += (_, e) => ShowAboutPage(e.TabPage);
+		}
+
 		public override void Execute(object parameter)
 		{
-			assemblyTreeModel.NavigateTo(
-				new RequestNavigateEventArgs(new Uri("resource://aboutpage"), null),
-				inNewTabPage: true
-			);
+			MessageBus.Send(this, new NavigateToEventArgs(new(new("resource://aboutpage"), null), inNewTabPage: true));
 		}
-	}
 
-	[Export]
-	[Shared]
-	public sealed class AboutPage(IEnumerable<IAboutPageAddition> aboutPageAdditions, SettingsService settingsService)
-	{
-		public void Display(DecompilerTextView textView)
+		private void ShowAboutPage(TabPageModel tabPage)
+		{
+			tabPage.ShowTextView(Display);
+		}
+
+		private void Display(DecompilerTextView textView)
 		{
 			AvalonEditTextOutput output = new AvalonEditTextOutput() {
 				Title = Resources.About,
@@ -72,14 +78,14 @@ public void Display(DecompilerTextView textView)
 					HorizontalAlignment = HorizontalAlignment.Center,
 					Orientation = Orientation.Horizontal
 				};
-				if (NotifyOfUpdatesStrategy.LatestAvailableVersion == null)
+				if (UpdateService.LatestAvailableVersion == null)
 				{
 					AddUpdateCheckButton(stackPanel, textView);
 				}
 				else
 				{
 					// we already retrieved the latest version sometime earlier
-					ShowAvailableVersion(NotifyOfUpdatesStrategy.LatestAvailableVersion, stackPanel);
+					ShowAvailableVersion(UpdateService.LatestAvailableVersion, stackPanel);
 				}
 				CheckBox checkBox = new() {
 					Margin = new Thickness(4),
@@ -104,8 +110,7 @@ public void Display(DecompilerTextView textView)
 			{
 				using (StreamReader r = new StreamReader(s))
 				{
-					string line;
-					while ((line = r.ReadLine()) != null)
+					while (r.ReadLine() is { } line)
 					{
 						output.WriteLine(line);
 					}
@@ -166,7 +171,7 @@ static void AddUpdateCheckButton(StackPanel stackPanel, DecompilerTextView textV
 
 				try
 				{
-					AvailableVersionInfo vInfo = await NotifyOfUpdatesStrategy.GetLatestVersionAsync();
+					AvailableVersionInfo vInfo = await UpdateService.GetLatestVersionAsync();
 					stackPanel.Children.Clear();
 					ShowAvailableVersion(vInfo, stackPanel);
 				}
@@ -209,7 +214,7 @@ static void ShowAvailableVersion(AvailableVersionInfo availableVersion, StackPan
 					button.Content = Resources.Download;
 					button.Cursor = Cursors.Arrow;
 					button.Click += delegate {
-						MainWindow.OpenLink(availableVersion.DownloadUrl);
+						GlobalUtils.OpenLink(availableVersion.DownloadUrl);
 					};
 					stackPanel.Children.Add(button);
 				}

ILSpy/Analyzers/AnalyzeCommand.cs

@@ -73,6 +73,8 @@ public void Execute(TextViewContext context)
 		}
 	}
 
+	[Export]
+	[Shared]
 	public sealed class AnalyzeCommand(AssemblyTreeModel assemblyTreeModel, AnalyzerTreeViewModel analyzerTreeViewModel) : SimpleCommand
 	{
 		public override bool CanExecute(object parameter)

ILSpy/Analyzers/AnalyzerSearchTreeNode.cs

@@ -58,10 +58,10 @@ protected IEnumerable<AnalyzerTreeNode> FetchChildren(CancellationToken ct)
 		{
 			if (symbol is IEntity)
 			{
-				var context = new AnalyzerContext() {
+				var context = new AnalyzerContext {
 					CancellationToken = ct,
 					Language = Language,
-					AssemblyList = AssemblyTreeModel.AssemblyList
+					AssemblyList = AssemblyList
 				};
 				var results = analyzer.Analyze(symbol, context).Select(SymbolTreeNodeFactory);
 				if (context.SortResults)

ILSpy/Analyzers/AnalyzerTreeNode.cs

@@ -30,7 +30,9 @@ namespace ICSharpCode.ILSpy.Analyzers
 {
 	public abstract class AnalyzerTreeNode : SharpTreeNode
 	{
-		public static Language Language => App.ExportProvider.GetExportedValue<LanguageService>().Language;
+		protected static Language Language => App.ExportProvider.GetExportedValue<LanguageService>().Language;
+
+		protected static AssemblyList AssemblyList => App.ExportProvider.GetExportedValue<AssemblyList>();
 
 		public override bool CanDelete()
 		{
@@ -47,8 +49,6 @@ public override void Delete()
 			DeleteCore();
 		}
 
-		public static AssemblyTreeModel AssemblyTreeModel { get; } = App.ExportProvider.GetExportedValue<AssemblyTreeModel>();
-
 		public static ICollection<IExport<IAnalyzer, IAnalyzerMetadata>> Analyzers => App.ExportProvider
 			.GetExports<IAnalyzer, IAnalyzerMetadata>("Analyzer")
 			.OrderBy(item => item.Metadata?.Order)

ILSpy/App.xaml.cs

@@ -25,8 +25,6 @@
 using System.Runtime.Loader;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Documents;
-using System.Windows.Navigation;
 using System.Windows.Threading;
 
 using ICSharpCode.ILSpy.AppEnv;
@@ -115,9 +113,6 @@ public App()
 				Thread.CurrentThread.CurrentUICulture = CultureInfo.DefaultThreadCurrentUICulture = new(sessionSettings.CurrentCulture);
 			}
 
-			EventManager.RegisterClassHandler(typeof(Window),
-											  Hyperlink.RequestNavigateEvent,
-											  new RequestNavigateEventHandler(Window_RequestNavigate));
 			ILSpyTraceListener.Install();
 
 			if (CommandLineArguments.ArgumentsParser.IsShowingInformation)
@@ -138,7 +133,7 @@ public App()
 
 		public new MainWindow MainWindow {
 			get => (MainWindow)base.MainWindow;
-			set => base.MainWindow = value;
+			private set => base.MainWindow = value;
 		}
 
 		private static void SingleInstance_NewInstanceDetected(object sender, NewInstanceEventArgs e) => ExportProvider.GetExportedValue<AssemblyTreeModel>().HandleSingleInstanceCommandLineArguments(e.Args).HandleExceptions();
@@ -152,7 +147,7 @@ static Assembly ResolvePluginDependencies(AssemblyLoadContext context, AssemblyN
 			return context.LoadFromAssemblyPath(assemblyFileName);
 		}
 
-		private static bool InitializeDependencyInjection(SettingsService settingsService)
+		private bool InitializeDependencyInjection(SettingsService settingsService)
 		{
 			// Add custom logic for resolution of dependencies.
 			// This necessary because the AssemblyLoadContext.LoadFromAssemblyPath and related methods,
@@ -193,11 +188,14 @@ private static bool InitializeDependencyInjection(SettingsService settingsServic
 				services.AddSingleton(_ => ExportProvider);
 				// Add the docking manager
 				services.AddSingleton(serviceProvider => serviceProvider.GetService<MainWindow>().DockManager);
+				services.AddTransient(serviceProvider => serviceProvider.GetService<AssemblyTreeModel>().AssemblyList);
 
 				var serviceProvider = services.BuildServiceProvider(new ServiceProviderOptions { ValidateOnBuild = true });
 
 				ExportProvider = new ExportProviderAdapter(serviceProvider);
 
+				Exit += (_, _) => serviceProvider.Dispose();
+
 				return true;
 			}
 			catch (Exception ex)
@@ -274,10 +272,5 @@ internal static void UnhandledException(Exception exception)
 			}
 		}
 		#endregion
-
-		void Window_RequestNavigate(object sender, RequestNavigateEventArgs e)
-		{
-			ExportProvider.GetExportedValue<AssemblyTreeModel>().NavigateTo(e);
-		}
 	}
 }