Migrate from MEF to Autofac

Author: jbe2277

src/MusicManager/.editorconfig

@@ -33,3 +33,6 @@ csharp_style_expression_bodied_methods = when_on_single_line
 
 # IDE0061: Use block body for local functions
 csharp_style_expression_bodied_local_functions = when_on_single_line
+
+# IDE0160: Convert to block scoped namespace
+csharp_style_namespace_declarations = file_scoped

src/MusicManager/Directory.Packages.props

@@ -3,6 +3,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
+    <PackageVersion Include="Autofac" Version="8.3.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
     <PackageVersion Include="NLog" Version="5.5.0" />
     <PackageVersion Include="System.Waf.Core" Version="8.1.0" />

src/MusicManager/MusicManager.Applications.Test/ApplicationsTest.cs

@@ -1,40 +1,37 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.ComponentModel.Composition;
-using System.ComponentModel.Composition.Hosting;
+using Autofac;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Waf.UnitTesting;
-using System.Waf.UnitTesting.Mocks;
 using Test.MusicManager.Domain;
+using Waf.MusicManager.Applications;
 using Waf.MusicManager.Applications.Properties;
 using Waf.MusicManager.Applications.Services;
-using Waf.MusicManager.Applications.ViewModels;
 using Waf.MusicManager.Domain.MusicFiles;
+using IContainer = Autofac.IContainer;
 
 namespace Test.MusicManager.Applications;
 
 [TestClass]
 public abstract class ApplicationsTest : DomainTest
 {
-    private AggregateCatalog? catalog;
-
     protected UnitTestSynchronizationContext Context { get; private set; } = null!;
 
-    protected CompositionContainer Container { get; private set; } = null!;
+    protected IContainer Container { get; private set; } = null!;
+
+    public T Get<T>() where T : notnull => Container.Resolve<T>();
+
+    public Lazy<T> GetLazy<T>() where T : notnull => new(Get<T>);
 
     protected override void OnInitialize()
     {
         base.OnInitialize();
 
         Context = UnitTestSynchronizationContext.Create();
 
-        catalog = new();
-        OnCatalogInitialize(catalog);
-
-        Container = new(catalog, CompositionOptions.DisableSilentRejection);
-        var batch = new CompositionBatch();
-        batch.AddExportedValue(Container);
-        Container.Compose(batch);
+        var builder = new ContainerBuilder();
+        ConfigureContainer(builder);
+        Container = builder.Build();
 
-        var shellService = Container.GetExportedValue<ShellService>();
+        var shellService = Container.Resolve<ShellService>();
         shellService.Settings = new AppSettings();
 
         ServiceLocator.RegisterInstance<IChangeTrackerService>(new ChangeTrackerService());
@@ -43,15 +40,13 @@ protected override void OnInitialize()
     protected override void OnCleanup()
     {
         Container.Dispose();
-        catalog?.Dispose();
         Context.Dispose();
         base.OnCleanup();
     }
 
-    protected virtual void OnCatalogInitialize(AggregateCatalog catalog)
+    protected virtual void ConfigureContainer(ContainerBuilder builder)
     {
-        catalog.Catalogs.Add(new AssemblyCatalog(typeof(ShellViewModel).Assembly));
-        catalog.Catalogs.Add(new AssemblyCatalog(typeof(MockMessageService).Assembly));
-        catalog.Catalogs.Add(new AssemblyCatalog(typeof(ApplicationsTest).Assembly));
+        builder.RegisterModule(new ApplicationsModule());
+        builder.RegisterModule(new MockPresentationModule());
     }
 }

src/MusicManager/MusicManager.Applications.Test/Controllers/ManagerControllerTest.cs

@@ -21,12 +21,12 @@ public class ManagerControllerTest : ApplicationsTest
     protected override void OnInitialize()
     {
         base.OnInitialize();
-        controller = Container.GetExportedValue<ManagerController>();
+        controller = Get<ManagerController>();
         controller.Initialize();
 
-        shellService = Container.GetExportedValue<ShellService>();
-        selectionService = Container.GetExportedValue<SelectionService>();
-        managerStatusService = Container.GetExportedValue<IManagerStatusService>();
+        shellService = Get<ShellService>();
+        selectionService = Get<SelectionService>();
+        managerStatusService = Get<IManagerStatusService>();
         var view = (MockManagerView)shellService.ContentView!;
         viewModel = ViewHelper.GetViewModel<ManagerViewModel>(view)!;
     }
@@ -42,10 +42,10 @@ protected override void OnCleanup()
     public void FileSystemWatcherService()
     {
         var path = @"C:\Music";
-        var fileService = Container.GetExportedValue<MockFileService>();
+        var fileService = Get<MockFileService>();
         fileService.GetFilesStub = (dir, deep, f1, f2, c) => Task.FromResult<IReadOnlyList<string>>([ Path.Combine(path, "TestMP3.mp3"), Path.Combine(path, "Test42.mp3") ]);
 
-        var fileSystemWatcherService = Container.GetExportedValue<MockFileSystemWatcherService>();
+        var fileSystemWatcherService = Get<MockFileSystemWatcherService>();
         viewModel.FolderBrowser.CurrentPath = path;
         Assert.IsTrue(path.Equals(fileSystemWatcherService.Path, StringComparison.OrdinalIgnoreCase));
         Assert.IsTrue(fileSystemWatcherService.EnableRaisingEvents);

src/MusicManager/MusicManager.Applications.Test/Controllers/MusicPropertiesControllerTest.cs

@@ -26,20 +26,20 @@ protected override void OnInitialize()
     {
         base.OnInitialize();
 
-        musicFileContext = Container.GetExportedValue<MockMusicFileContext>();
+        musicFileContext = Get<MockMusicFileContext>();
         musicFiles = [
             musicFileContext.Create(@"C:\Users\Public\Music\Dancefloor\Culture Beat - Serenity.wav"),
             musicFileContext.Create(@"C:\Culture Beat - Serenity - Epilog.wma"),
         ];
-        selectionService = Container.GetExportedValue<SelectionService>();
+        selectionService = Get<SelectionService>();
         selectionService.Initialize(musicFiles);
 
         playlistManager = new();
-        controller = Container.GetExportedValue<MusicPropertiesController>();
+        controller = Get<MusicPropertiesController>();
         controller.PlaylistManager = playlistManager;
         controller.Initialize();
 
-        var shellService = Container.GetExportedValue<ShellService>();
+        var shellService = Get<ShellService>();
         view = (MockMusicPropertiesView)shellService.MusicPropertiesView!;
         viewModel = ViewHelper.GetViewModel<MusicPropertiesViewModel>(view)!;
     }
@@ -103,7 +103,7 @@ public void SaveChangesErrorTest()
             return tcs.Task;
         };
 
-        var shellService = Container.GetExportedValue<ShellService>();
+        var shellService = Get<ShellService>();
         var showErrorCalled = false;
         shellService.ShowErrorAction = (ex, msg) =>
         {
@@ -158,7 +158,7 @@ public void SaveChangesWhilePlayingMusicFile()
         //   2. save unsaved files because they were played until now
         selectionService.MusicFiles[0].MusicFile.Metadata!.Rating = 75;
         selectionService.MusicFiles[1].MusicFile.Metadata!.Rating = 75;
-        var shellService = Container.GetExportedValue<ShellService>();
+        var shellService = Get<ShellService>();
         musicFileToSave = musicFiles[0];
         controller.Shutdown();
         var tasks = shellService.TasksToCompleteBeforeShutdown.ToArray();

src/MusicManager/MusicManager.Applications.Test/Controllers/PlayerControllerTest.cs

@@ -29,22 +29,22 @@ protected override void OnInitialize()
     {
         base.OnInitialize();
 
-        var musicFileContext = Container.GetExportedValue<MockMusicFileContext>();
+        var musicFileContext = Get<MockMusicFileContext>();
         musicFiles = [
             musicFileContext.Create(@"C:\Users\Public\Music\Dancefloor\Culture Beat - Serenity.wav"),
             musicFileContext.Create(@"C:\Culture Beat - Serenity - Epilog.wma"),
         ];
-        selectionService = Container.GetExportedValue<SelectionService>();
+        selectionService = Get<SelectionService>();
         selectionService.Initialize(musicFiles);
 
         playlistManager = new();
         playlistSettings = new();
-        controller = Container.GetExportedValue<PlayerController>();
+        controller = Get<PlayerController>();
         controller.PlaylistSettings = playlistSettings;
         controller.PlaylistManager = playlistManager;
         controller.Initialize();
 
-        shellService = Container.GetExportedValue<ShellService>();
+        shellService = Get<ShellService>();
         shellService.ShowPlaylistViewAction = () => { };
         shellService.ShowMusicPropertiesViewAction = () => { };
         view = (MockPlayerView)shellService.PlayerView!;
@@ -62,14 +62,14 @@ protected override void OnCleanup()
     public void PassMusicFileViaCommandLineParameter()
     {
         // Simulate that a music file was passed via command line parameter
-        var environmentService = Container.GetExportedValue<MockEnvironmentService>();
+        var environmentService = Get<MockEnvironmentService>();
         environmentService.MusicFilesToLoad = new[] { musicFiles.First().FileName! };
 
         // Another controller is responsible to add first the item into the playlist.
         playlistManager.InsertItems(0, musicFiles.Select(x => new PlaylistItem(x)));
 
         // Now auto-play the file.
-        var playerService = Container.GetExportedValue<PlayerService>();
+        var playerService = Get<PlayerService>();
         playerService.IsPlayCommand = true;
         bool playPauseCommandCalled = false;
         playerService.PlayPauseCommand = new DelegateCommand(() => playPauseCommandCalled = true);
@@ -109,7 +109,7 @@ public void PlayAllAndSelected()
         Assert.AreEqual(1, playlistManager.Items.Count);
 
         // Play all
-        var playerService = Container.GetExportedValue<PlayerService>();
+        var playerService = Get<PlayerService>();
         playerService.IsPlayCommand = true;
         bool playPauseCommandCalled = false;
         playerService.PlayPauseCommand = new DelegateCommand(() => playPauseCommandCalled = true);
@@ -199,7 +199,7 @@ public void ShowMusicProperties()
         shellService.ShowMusicPropertiesViewAction = () => { showMusicPropertiesViewActionCalled = true; };
         viewModel.ShowMusicPropertiesCommand.Execute(null);
         Assert.IsTrue(showMusicPropertiesViewActionCalled);
-        var musicPropertiesViewModel = Container.GetExportedValue<MusicPropertiesViewModel>();
+        var musicPropertiesViewModel = Get<MusicPropertiesViewModel>();
         Assert.AreEqual(playlistManager.CurrentItem!.MusicFile, musicPropertiesViewModel.MusicFile);
     }
 
@@ -210,7 +210,7 @@ public void ShowPlaylist()
         viewModel.PlayerService.PlayAllCommand.Execute(null);
         shellService.ShowMusicPropertiesView();
 
-        var playlistController = Container.GetExportedValue<PlaylistController>();
+        var playlistController = Get<PlaylistController>();
         playlistController.PlaylistManager = playlistManager;
         playlistController.Initialize();
 
@@ -219,7 +219,7 @@ public void ShowPlaylist()
         viewModel.ShowPlaylistCommand.Execute(null);
         Assert.IsTrue(showPlaylistViewActionCalled);
 
-        var playlistViewModel = Container.GetExportedValue<PlaylistViewModel>();
+        var playlistViewModel = Get<PlaylistViewModel>();
         Assert.AreEqual(playlistManager.CurrentItem, playlistViewModel.SelectedPlaylistItem);
     }
 }

src/MusicManager/MusicManager.Applications.Test/Controllers/PlaylistControllerTest.cs

@@ -26,22 +26,22 @@ protected override void OnInitialize()
     {
         base.OnInitialize();
 
-        musicFileContext = Container.GetExportedValue<MockMusicFileContext>();
+        musicFileContext = Get<MockMusicFileContext>();
         musicFiles = [
             musicFileContext.Create(@"C:\Users\Public\Music\Dancefloor\Culture Beat - Serenity.wav"),
             musicFileContext.Create(@"C:\Culture Beat - Serenity - Epilog.wma"),
         ];
-        selectionService = Container.GetExportedValue<SelectionService>();
+        selectionService = Get<SelectionService>();
         selectionService.Initialize(musicFiles);
 
         playlistManager = new();
-        controller = Container.GetExportedValue<PlaylistController>();
+        controller = Get<PlaylistController>();
         controller.PlaylistSettings = new();
         controller.PlaylistManager = playlistManager;
         controller.Initialize();
         controller.Run();
 
-        shellService = Container.GetExportedValue<ShellService>();
+        shellService = Get<ShellService>();
         var view = shellService.PlaylistView!;
         viewModel = ViewHelper.GetViewModel<PlaylistViewModel>((IView)view)!;
     }
@@ -70,7 +70,7 @@ public void PlayAndRemoveSelectedTest()
         Assert.IsTrue(viewModel.RemoveSelectedCommand.CanExecute(null));
 
         // Play the selected item
-        var playerService = Container.GetExportedValue<PlayerService>();
+        var playerService = Get<PlayerService>();
         playerService.IsPlayCommand = true;
         bool playPauseCalled = false;
         playerService.PlayPauseCommand = new DelegateCommand(() => playPauseCalled = true);
@@ -102,7 +102,7 @@ public void PlayAndRemoveSelectedTest()
     public void ShowMusicPropertiesTest()
     {
         // Initialize the MusicPropertiesController
-        var musicPropertiesController = Container.GetExportedValue<MusicPropertiesController>();
+        var musicPropertiesController = Get<MusicPropertiesController>();
         musicPropertiesController.PlaylistManager = playlistManager;
         musicPropertiesController.Initialize();
 

src/MusicManager/MusicManager.Applications.Test/Controllers/TranscodingControllerTest.cs

@@ -20,12 +20,12 @@ protected override void OnInitialize()
     {
         base.OnInitialize();
 
-        musicFileContext = Container.GetExportedValue<MockMusicFileContext>();
+        musicFileContext = Get<MockMusicFileContext>();
         musicFiles = [
             musicFileContext.Create(@"C:\Users\Public\Music\Dancefloor\Culture Beat - Serenity.wav"),
             musicFileContext.Create(@"C:\Culture Beat - Serenity - Epilog.wma"),
         ];
-        selectionService = Container.GetExportedValue<SelectionService>();
+        selectionService = Get<SelectionService>();
         selectionService.Initialize(musicFiles);
 
         musicFiles[0].Metadata!.Album = "Serenity";
@@ -34,10 +34,10 @@ protected override void OnInitialize()
     [TestMethod]
     public void ConvertToMp3Selected()
     {
-        var controller = Container.GetExportedValue<TranscodingController>();
+        var controller = Get<TranscodingController>();
         controller.Initialize();
 
-        var shellService = Container.GetExportedValue<ShellService>();
+        var shellService = Get<ShellService>();
         var view = shellService.TranscodingListView!.Value;
         var viewModel = ViewHelper.GetViewModel<TranscodingListViewModel>((IView)view)!;
         var transcodingService = viewModel.TranscodingService;
@@ -62,7 +62,7 @@ public void ConvertToMp3Selected()
         bool transcodeCalled = false;
         Task transcodeDelayTask = Task.CompletedTask;
         Exception? transcodeError = null;
-        var transcode = Container.GetExportedValue<MockTranscoder>();
+        var transcode = Get<MockTranscoder>();
         transcode.TranscodeAsyncAction = async (sourceFileName, destinationFileName, bitrate, cancellationToken, progress) => 
         {
             transcodeCalled = true;

src/MusicManager/MusicManager.Applications.Test/MockPresentationModule.cs

@@ -0,0 +1,38 @@
+using Autofac;
+using System.Waf.Applications.Services;
+using System.Waf.UnitTesting.Mocks;
+using Test.MusicManager.Applications.Services;
+using Test.MusicManager.Applications.Views;
+using Waf.MusicManager.Applications.Services;
+using Waf.MusicManager.Applications.Views;
+
+namespace Test.MusicManager.Applications;
+
+public class MockPresentationModule(bool useMock = true) : Module
+{
+    protected override void Load(ContainerBuilder builder)
+    {
+        builder.RegisterType<MockFileDialogService>().As<IFileDialogService>().AsSelf().SingleInstance();
+        builder.RegisterType<MockMessageService>().As<IMessageService>().AsSelf().SingleInstance();
+        builder.RegisterType<MockSettingsService>().As<ISettingsService>().AsSelf().SingleInstance();
+
+        builder.RegisterType<MockClipboardService>().As<IClipboardService>().AsSelf().SingleInstance();
+        builder.RegisterType<MockEnvironmentService>().As<IEnvironmentService>().AsSelf().SingleInstance();
+
+        if (useMock)
+        {
+            builder.RegisterType<MockFileService>().As<IFileService>().AsSelf().SingleInstance();
+            builder.RegisterType<MockFileSystemWatcherService>().As<IFileSystemWatcherService>().AsSelf().SingleInstance();
+            builder.RegisterType<MockMusicFileContext>().As<IMusicFileContext>().AsSelf().SingleInstance();
+            builder.RegisterType<MockTranscoder>().As<ITranscoder>().AsSelf().SingleInstance();
+        }
+
+        builder.RegisterType<MockInfoView>().As<IInfoView>();
+        builder.RegisterType<MockManagerView>().As<IManagerView>().AsSelf().SingleInstance();
+        builder.RegisterType<MockMusicPropertiesView>().As<IMusicPropertiesView>().AsSelf().SingleInstance();
+        builder.RegisterType<MockPlayerView>().As<IPlayerView>().AsSelf().SingleInstance();
+        builder.RegisterType<MockPlaylistView>().As<IPlaylistView>().AsSelf().SingleInstance();
+        builder.RegisterType<MockShellView>().As<IShellView>().AsSelf().SingleInstance();
+        builder.RegisterType<MockTranscodingListView>().As<ITranscodingListView>().AsSelf().SingleInstance();
+    }
+}

src/MusicManager/MusicManager.Applications.Test/Services/MockClipboardService.cs

@@ -1,9 +1,7 @@
-using System.ComponentModel.Composition;
-using Waf.MusicManager.Applications.Services;
+using Waf.MusicManager.Applications.Services;
 
 namespace Test.MusicManager.Applications.Services;
 
-[Export, Export(typeof(IClipboardService))]
 public class MockClipboardService : IClipboardService
 {
     public Action<string>? SetTextAction { get; set; }