Introduce correlated logs (#11)

Co-authored-by: Alexandru Macocian <almacoci@microsoft.com>

Daybreak.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.31005.135
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daybreak", "Daybreak\Daybreak.csproj", "{AA45C2B1-8BD0-466C-9271-699F168905AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Daybreak.Tests", "Daybreak.Tests\Daybreak.Tests.csproj", "{C911C1C2-6566-419C-89C7-F802EB3FE709}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daybreak.Tests", "Daybreak.Tests\Daybreak.Tests.csproj", "{C911C1C2-6566-419C-89C7-F802EB3FE709}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,12 +17,12 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x64.ActiveCfg = Debug|x64
-		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x64.Build.0 = Debug|x64
+		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x64.Build.0 = Debug|Any CPU
 		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x64.ActiveCfg = Release|x64
-		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x64.Build.0 = Release|x64
+		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x64.ActiveCfg = Release|Any CPU
+		{AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x64.Build.0 = Release|Any CPU
 		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|x64.ActiveCfg = Debug|Any CPU

Daybreak/Configuration/ProjectConfiguration.cs

@@ -21,8 +21,8 @@ using Slim;
 using System.Extensions;
 using System.Net.Http;
 using System.Windows.Extensions.Http;
-using System.Windows.Extensions;
 using LiteDB;
+using Daybreak.Controls;
 
 namespace Daybreak.Configuration
 {
@@ -32,12 +32,7 @@ namespace Daybreak.Configuration
         {
             serviceManager.ThrowIfNull(nameof(serviceManager));
 
-            serviceManager.RegisterLoggerFactory((sp) =>
-            {
-                var factory = new LoggerFactory();
-                factory.AddProvider(new JsonLoggerProvider(sp.GetService<ILogsManager>()));
-                return factory;
-            });
+            serviceManager.RegisterScoped<ILoggerFactory, CVLoggerFactory>((sp) => new CVLoggerFactory(sp.GetService<ILogsManager>()));
             serviceManager.RegisterResolver(
                 new HttpClientResolver()
                 .WithHttpMessageHandlerFactory((serviceProvider, categoryType) =>
@@ -53,23 +48,23 @@ namespace Daybreak.Configuration
         {
             serviceProducer.ThrowIfNull(nameof(serviceProducer));
 
-            serviceProducer.RegisterSingleton<ICredentialManager, CredentialManager>();
             serviceProducer.RegisterSingleton<ApplicationLifetimeManager>();
             serviceProducer.RegisterSingleton<ViewManager>();
-            serviceProducer.RegisterSingleton<IApplicationLauncher, ApplicationLauncher>();
-            serviceProducer.RegisterSingleton<IScreenshotProvider, ScreenshotProvider>();
             serviceProducer.RegisterSingleton<IConfigurationManager, ConfigurationManager>();
-            serviceProducer.RegisterSingleton<IBloogumClient, BloogumClient>();
-            serviceProducer.RegisterSingleton<IApplicationUpdater, ApplicationUpdater>();
-            serviceProducer.RegisterSingleton<IMutexHandler, MutexHandler>();
-            serviceProducer.RegisterSingleton<IRuntimeStore, RuntimeStore>();
-            serviceProducer.RegisterSingleton<IBuildTemplateManager, BuildTemplateManager>();
-            serviceProducer.RegisterSingleton<IIconRetriever, IconRetriever>();
-            serviceProducer.RegisterSingleton<IPrivilegeManager, PrivilegeManager>();
-            serviceProducer.RegisterSingleton<IScreenManager, ScreenManager>();
-            serviceProducer.RegisterSingleton<IShortcutManager, ShortcutManager>();
-            serviceProducer.RegisterSingleton<ILogsManager, JsonLogsManager>();
             serviceProducer.RegisterSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
+            serviceProducer.RegisterSingleton<IRuntimeStore, RuntimeStore>();
+            serviceProducer.RegisterSingleton<IMutexHandler, MutexHandler>();
+            serviceProducer.RegisterSingleton<IShortcutManager, ShortcutManager>();
+            serviceProducer.RegisterScoped<ICredentialManager, CredentialManager>();
+            serviceProducer.RegisterScoped<IApplicationLauncher, ApplicationLauncher>();
+            serviceProducer.RegisterScoped<IScreenshotProvider, ScreenshotProvider>();
+            serviceProducer.RegisterScoped<IBloogumClient, BloogumClient>();
+            serviceProducer.RegisterScoped<IApplicationUpdater, ApplicationUpdater>();
+            serviceProducer.RegisterScoped<IBuildTemplateManager, BuildTemplateManager>();
+            serviceProducer.RegisterScoped<IIconRetriever, IconRetriever>();
+            serviceProducer.RegisterScoped<IPrivilegeManager, PrivilegeManager>();
+            serviceProducer.RegisterScoped<IScreenManager, ScreenManager>();
+            serviceProducer.RegisterScoped<ILogsManager, JsonLogsManager>();
         }
         public static void RegisterLifetimeServices(IApplicationLifetimeProducer applicationLifetimeProducer)
         {

Daybreak/Controls/ChromiumBrowserWrapper.xaml.cs

@@ -1,5 +1,4 @@
-using Daybreak.Launch;
-using Daybreak.Models.Browser;
+using Daybreak.Models.Browser;
 using Daybreak.Models.Builds;
 using Daybreak.Services.BuildTemplates;
 using Daybreak.Services.Configuration;
@@ -29,9 +28,9 @@ namespace Daybreak.Controls
         public event EventHandler MaximizeClicked;
         public event EventHandler<Build> BuildDecoded;
 
-        private readonly IConfigurationManager configurationManager;
-        private readonly ILogger<ChromiumBrowserWrapper> logger;
-        private readonly IBuildTemplateManager buildTemplateManager;
+        private IConfigurationManager configurationManager;
+        private ILogger<ChromiumBrowserWrapper> logger;
+        private IBuildTemplateManager buildTemplateManager;
         private CoreWebView2Environment coreWebView2Environment;
 
         [GenerateDependencyProperty(InitialValue = true)]
@@ -40,7 +39,7 @@ namespace Daybreak.Controls
         private bool canNavigate;
         [GenerateDependencyProperty(InitialValue = true)]
         private bool controlsEnabled;
-        [GenerateDependencyProperty(InitialValue = true)]
+        [GenerateDependencyProperty]
         private bool browserSupported;
         [GenerateDependencyProperty]
         private bool addressBarReadonly;
@@ -55,12 +54,8 @@ namespace Daybreak.Controls
 
         public ChromiumBrowserWrapper()
         {
-            this.configurationManager = Launcher.ApplicationServiceManager.GetService<IConfigurationManager>();
-            this.logger = Launcher.ApplicationServiceManager.GetService<ILogger<ChromiumBrowserWrapper>>();
-            this.buildTemplateManager = Launcher.ApplicationServiceManager.GetService<IBuildTemplateManager>();
             this.InitializeComponent();
-            this.InitializeEnvironment();
-            this.InitializeBrowser();
+            this.WebBrowser.IsEnabled = false;
         }
 
         protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
@@ -72,6 +67,18 @@ namespace Daybreak.Controls
             }
         }
 
+        public async void InitializeBrowser(
+            IConfigurationManager configurationManager,
+            IBuildTemplateManager buildTemplateManager,
+            ILogger<ChromiumBrowserWrapper> logger)
+        {
+            this.configurationManager = configurationManager;
+            this.buildTemplateManager = buildTemplateManager;
+            this.logger = logger;
+            this.InitializeEnvironment();
+            await this.InitializeBrowser();
+        }
+
         public async void ReinitializeBrowser()
         {
             await this.InitializeBrowser();
@@ -101,6 +108,7 @@ namespace Daybreak.Controls
         {
             if (this.BrowserSupported is true)
             {
+                this.WebBrowser.IsEnabled = true;
                 await this.WebBrowser.EnsureCoreWebView2Async(this.coreWebView2Environment);
                 this.AddressBarReadonly = this.configurationManager.GetConfiguration().AddressBarReadonly;
                 this.CanDownloadBuild = this.configurationManager.GetConfiguration().ExperimentalFeatures.DynamicBuildLoading;

Daybreak/Controls/Templates/BuildTemplate.xaml

@@ -95,42 +95,42 @@
                 <RowDefinition Height="*"></RowDefinition>
                 <RowDefinition Height="auto"></RowDefinition>
             </Grid.RowDefinitions>
-            <local:SkillTemplate Grid.Column="0"
+            <local:SkillTemplate Grid.Column="0" x:Name="SkillTemplate0"
                                  Foreground="White" Cursor="Hand"
                                  FontSize="22" DataContext="{Binding ElementName=_this, Path=Skill0, Mode=TwoWay}"
                                  VerticalAlignment="Stretch" Clicked="SkillTemplate_Clicked"
                                  RemoveClicked="SkillTemplate_RemoveClicked"></local:SkillTemplate>
-            <local:SkillTemplate Grid.Column="1"
+            <local:SkillTemplate Grid.Column="1" x:Name="SkillTemplate1"
                                  Foreground="White" Cursor="Hand"
                                  FontSize="22" DataContext="{Binding ElementName=_this, Path=Skill1, Mode=TwoWay}"
                                  VerticalAlignment="Stretch" Clicked="SkillTemplate_Clicked"
                                  RemoveClicked="SkillTemplate_RemoveClicked"></local:SkillTemplate>
-            <local:SkillTemplate Grid.Column="2"
+            <local:SkillTemplate Grid.Column="2" x:Name="SkillTemplate2"
                                  Foreground="White" Cursor="Hand"
                                  FontSize="22" DataContext="{Binding ElementName=_this, Path=Skill2, Mode=TwoWay}"
                                  VerticalAlignment="Stretch" Clicked="SkillTemplate_Clicked"
                                  RemoveClicked="SkillTemplate_RemoveClicked"></local:SkillTemplate>
-            <local:SkillTemplate Grid.Column="3"
+            <local:SkillTemplate Grid.Column="3" x:Name="SkillTemplate3"
                                  Foreground="White" Cursor="Hand"
                                  FontSize="22" DataContext="{Binding ElementName=_this, Path=Skill3, Mode=TwoWay}"
                                  VerticalAlignment="Stretch" Clicked="SkillTemplate_Clicked"
                                  RemoveClicked="SkillTemplate_RemoveClicked"></local:SkillTemplate>
-            <local:SkillTemplate Grid.Column="4"
+            <local:SkillTemplate Grid.Column="4" x:Name="SkillTemplate4"
                                  Foreground="White" Cursor="Hand"
                                  FontSize="22" DataContext="{Binding ElementName=_this, Path=Skill4, Mode=TwoWay}"
                                  VerticalAlignment="Stretch" Clicked="SkillTemplate_Clicked"
                                  RemoveClicked="SkillTemplate_RemoveClicked"></local:SkillTemplate>
-            <local:SkillTemplate Grid.Column="5"
+            <local:SkillTemplate Grid.Column="5" x:Name="SkillTemplate5"
                                  Foreground="White" Cursor="Hand"
                                  FontSize="22" DataContext="{Binding ElementName=_this, Path=Skill5, Mode=TwoWay}"
                                  VerticalAlignment="Stretch" Clicked="SkillTemplate_Clicked"
                                  RemoveClicked="SkillTemplate_RemoveClicked"></local:SkillTemplate>
-            <local:SkillTemplate Grid.Column="6"
+            <local:SkillTemplate Grid.Column="6" x:Name="SkillTemplate6"
                                  Foreground="White" Cursor="Hand"
                                  FontSize="22" DataContext="{Binding ElementName=_this, Path=Skill6, Mode=TwoWay}"
                                  VerticalAlignment="Stretch" Clicked="SkillTemplate_Clicked"
                                  RemoveClicked="SkillTemplate_RemoveClicked"></local:SkillTemplate>
-            <local:SkillTemplate Grid.Column="7"
+            <local:SkillTemplate Grid.Column="7" x:Name="SkillTemplate7"
                                  Foreground="White" Cursor="Hand"
                                  FontSize="22" DataContext="{Binding ElementName=_this, Path=Skill7, Mode=TwoWay}"
                                  VerticalAlignment="Stretch" Clicked="SkillTemplate_Clicked"

Daybreak/Controls/Templates/BuildTemplate.xaml.cs

@@ -1,4 +1,8 @@
 using Daybreak.Models.Builds;
+using Daybreak.Services.BuildTemplates;
+using Daybreak.Services.Configuration;
+using Daybreak.Services.IconRetrieve;
+using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Extensions;
@@ -54,6 +58,23 @@ namespace Daybreak.Controls
             this.DataContextChanged += BuildTemplate_DataContextChanged;
         }
 
+        public void InitializeTemplate(
+            IIconRetriever iconRetriever,
+            IConfigurationManager configurationManager,
+            IBuildTemplateManager buildTemplateManager,
+            ILogger<ChromiumBrowserWrapper> logger)
+        {
+            this.SkillBrowser.InitializeBrowser(configurationManager, buildTemplateManager, logger);
+            this.SkillTemplate0.InitializeSkillTemplate(iconRetriever);
+            this.SkillTemplate1.InitializeSkillTemplate(iconRetriever);
+            this.SkillTemplate2.InitializeSkillTemplate(iconRetriever);
+            this.SkillTemplate3.InitializeSkillTemplate(iconRetriever);
+            this.SkillTemplate4.InitializeSkillTemplate(iconRetriever);
+            this.SkillTemplate5.InitializeSkillTemplate(iconRetriever);
+            this.SkillTemplate6.InitializeSkillTemplate(iconRetriever);
+            this.SkillTemplate7.InitializeSkillTemplate(iconRetriever);
+        }
+
         protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
         {
             base.OnPropertyChanged(e);

Daybreak/Controls/Templates/SkillTemplate.xaml.cs

@@ -23,7 +23,7 @@ namespace Daybreak.Controls
         public event EventHandler<RoutedEventArgs> Clicked;
         public event EventHandler RemoveClicked;
 
-        private readonly IIconRetriever iconRetriever;
+        private IIconRetriever iconRetriever;
 
         [GenerateDependencyProperty]
         private ImageSource imageSource;
@@ -32,22 +32,26 @@ namespace Daybreak.Controls
 
         public SkillTemplate()
         {
-            this.iconRetriever = Launcher.ApplicationServiceManager.GetService<IIconRetriever>();
             this.InitializeComponent();
             this.DataContextChanged += SkillTemplate_DataContextChanged;
         }
 
+        public void InitializeSkillTemplate(IIconRetriever iconRetriever)
+        {
+            this.iconRetriever = iconRetriever;
+        }
+
         private void SkillTemplate_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
             if (e.NewValue is Skill skill)
             {
                 if (skill != Skill.NoSkill)
                 {
-                    Task.Run(() => GetImageStream(skill)).ContinueWith((previousTask) =>
+                    Task.Run(() => this.GetImageStream(skill)).ContinueWith((previousTask) =>
                     {
                         this.Dispatcher.Invoke(() =>
                         {
-                            this.ImageSource = GetImageSource(previousTask.Result);
+                            this.ImageSource = this.GetImageSource(previousTask.Result);
                         });
                     });
                 }
@@ -88,6 +92,11 @@ namespace Daybreak.Controls
         }
         private async Task<Stream> GetImageStream(Skill skill)
         {
+            if (this.iconRetriever is null)
+            {
+                return null;
+            }
+
             var maybeStream = await this.iconRetriever.GetIcon(skill);
             return maybeStream.ExtractValue();
         }

Daybreak/Daybreak.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
@@ -11,19 +10,20 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.8.9.3</Version>
+    <Version>0.9</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.11.32" />
     <PackageReference Include="LiteDB" Version="5.0.10" />
+    <PackageReference Include="Microsoft.CorrelationVector" Version="1.0.42" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.818.41" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.864.35" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NReco.Logging.File" Version="1.1.1" />
     <PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
-    <PackageReference Include="Slim" Version="1.3.3" />
+    <PackageReference Include="Slim" Version="1.4.2" />
     <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
     <PackageReference Include="SystemExtensions.NetStandard" Version="1.2.0" />
     <PackageReference Include="WCL" Version="1.0.2" />

Daybreak/Launch/Launcher.cs

@@ -27,11 +27,13 @@ namespace Daybreak.Launch
 
         protected override void SetupServiceManager(IServiceManager serviceManager)
         {
+            ApplicationServiceManager = this.ServiceManager;
             ProjectConfiguration.RegisterResolvers(serviceManager);
         }
         protected override void RegisterServices(IServiceProducer serviceProducer)
         {
             ProjectConfiguration.RegisterServices(this.ServiceManager);
+            ServiceManager.BuildSingletons();
             ProjectConfiguration.RegisterLifetimeServices(this.ServiceManager.GetService<IApplicationLifetimeManager>());
             ProjectConfiguration.RegisterViews(this.ServiceManager.GetService<IViewManager>());
         }
@@ -75,7 +77,6 @@ namespace Daybreak.Launch
         }
         protected override void ApplicationStarting()
         {
-            ApplicationServiceManager = this.ServiceManager;
             this.ServiceManager.GetService<IApplicationLifetimeManager>().OnStartup();
             this.RegisterViewContainer();
         }

Daybreak/Models/ScopeMetadata.cs

@@ -0,0 +1,14 @@
+using Microsoft.CorrelationVector;
+
+namespace Daybreak.Models
+{
+    public class ScopeMetadata
+    {
+        public CorrelationVector CorrelationVector { get; set; }
+
+        public ScopeMetadata(CorrelationVector correlationVector)
+        {
+            this.CorrelationVector = correlationVector;
+        }
+    }
+}

Daybreak/Services/Logging/CVLoggerFactory.cs

@@ -0,0 +1,30 @@
+using Microsoft.Extensions.Logging;
+using System;
+
+namespace Daybreak.Services.Logging
+{
+    public sealed class CVLoggerFactory : ILoggerFactory
+    {
+        private readonly LoggerFactory loggerFactory = new();
+
+        public CVLoggerFactory(ILogsManager logsManager)
+        {
+            this.loggerFactory.AddProvider(new JsonLoggerProvider(logsManager));
+        }
+
+        public void AddProvider(ILoggerProvider provider)
+        {
+            ((ILoggerFactory)this.loggerFactory).AddProvider(provider);
+        }
+
+        public ILogger CreateLogger(string categoryName)
+        {
+            return ((ILoggerFactory)this.loggerFactory).CreateLogger(categoryName);
+        }
+
+        public void Dispose()
+        {
+            ((IDisposable)this.loggerFactory).Dispose();
+        }
+    }
+}

Daybreak/Services/Logging/JsonLoggerProvider.cs

@@ -1,4 +1,5 @@
 using Daybreak.Models;
+using Microsoft.CorrelationVector;
 using Microsoft.Extensions.Logging;
 using System.Extensions;
 
@@ -7,19 +8,32 @@ namespace Daybreak.Services.Logging
     public sealed class JsonLoggerProvider : ILoggerProvider
     {
         private readonly ILogsManager logsManager;
+        private CorrelationVector correlationVector;
 
         public JsonLoggerProvider(ILogsManager logsManager)
         {
             this.logsManager = logsManager.ThrowIfNull(nameof(logsManager));
+            this.correlationVector = new CorrelationVector();
         }
 
         public void LogEntry(Log log)
         {
+            if (this.correlationVector is not null)
+            {
+                log.Message = $"[{this.correlationVector.Value}] {log.Message}";
+                this.correlationVector.Increment();
+            }
+
             this.logsManager.WriteLog(log);
         }
 
         public ILogger CreateLogger(string categoryName)
         {
+            if (this.correlationVector is not null)
+            {
+                this.correlationVector = CorrelationVector.Extend(this.correlationVector.ToString());
+            }
+
             return new JsonLogger(categoryName, this);
         }
 

Daybreak/Services/Navigation/ViewManager.cs

@@ -1,4 +1,6 @@
-using Slim;
+using Daybreak.Models;
+using Microsoft.CorrelationVector;
+using Slim;
 using System;
 using System.Extensions;
 using System.Windows;
@@ -53,9 +55,11 @@ namespace Daybreak.Services.ViewManagement
 
         private void ShowViewInner(Type viewType, object dataContext)
         {
+            var scopedManager = this.serviceManager.CreateScope();
+            scopedManager.As<IServiceManager>().RegisterScoped<ScopeMetadata, ScopeMetadata>((sp) => new ScopeMetadata(new CorrelationVector()));
             Application.Current.Dispatcher.Invoke(() =>
             {
-                var view = this.serviceManager.GetService(viewType).As<UserControl>();
+                var view = scopedManager.GetService(viewType).As<UserControl>();
                 this.container.Children.Clear();
                 this.container.Children.Add(view);
                 view.DataContext = dataContext;

Daybreak/Views/BuildTemplateView.xaml

@@ -35,7 +35,7 @@
             <controls:SaveButton Foreground="White" Height="30" Width="30" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5"
                              Clicked="SaveButton_Clicked" Grid.Column="2" IsEnabled="{Binding ElementName=_this, Path=SaveButtonEnabled, Mode=OneWay}"></controls:SaveButton>
         </Grid>
-        <controls:BuildTemplate Grid.Row="1" DataContext="{Binding ElementName=_this, Path=CurrentBuild, Mode=OneWay}">
+        <controls:BuildTemplate x:Name="BuildTemplate" Grid.Row="1" DataContext="{Binding ElementName=_this, Path=CurrentBuild, Mode=OneWay}">
         </controls:BuildTemplate>
     </Grid>
 </UserControl>

Daybreak/Views/BuildTemplateView.xaml.cs

@@ -1,6 +1,10 @@
-using Daybreak.Models.Builds;
+using Daybreak.Controls;
+using Daybreak.Models.Builds;
 using Daybreak.Services.BuildTemplates;
+using Daybreak.Services.Configuration;
+using Daybreak.Services.IconRetrieve;
 using Daybreak.Services.ViewManagement;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Extensions;
 using System.Linq;
@@ -39,11 +43,15 @@ namespace Daybreak.Views
 
         public BuildTemplateView(
             IViewManager viewManager,
-            IBuildTemplateManager buildTemplateManager)
+            IBuildTemplateManager buildTemplateManager,
+            IIconRetriever iconRetriever,
+            IConfigurationManager configurationManager,
+            ILogger<ChromiumBrowserWrapper> logger)
         {
             this.buildTemplateManager = buildTemplateManager.ThrowIfNull(nameof(buildTemplateManager));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.InitializeComponent();
+            this.BuildTemplate.InitializeTemplate(iconRetriever, configurationManager, buildTemplateManager, logger);
             this.DataContextChanged += (sender, contextArgs) =>
             {
                 if (contextArgs.NewValue is BuildEntry)

Daybreak/Views/MainView.xaml

@@ -40,7 +40,8 @@
                                Clicked="LaunchTexmodButton_Clicked" Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="1"
                                Visibility="{Binding ElementName=_this, Path=ButtonsVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibility}}"></controls:OpaqueButton>
         <Grid Grid.Column="2" Margin="10" Visibility="{Binding ElementName=_this, Path=BrowsersEnabled, Mode=OneWay, Converter={StaticResource BooleanToVisibility}}">
-            <controls:ChromiumBrowserWrapper Address="{Binding ElementName=_this, Path=RightBrowserAddress, Mode=OneWay}"
+            <controls:ChromiumBrowserWrapper x:Name="RightWebBrowser"
+                                             Address="{Binding ElementName=_this, Path=RightBrowserAddress, Mode=OneWay}"
                                              Foreground="White" FavoriteUriChanged="RightBrowser_FavoriteUriChanged"
                                              FavoriteAddress="{Binding ElementName=_this, Path=RightBrowserFavoriteAddress, Mode=OneWay}"
                                              MaximizeClicked="RightChromiumBrowserWrapper_MaximizeClicked"
@@ -48,7 +49,8 @@
                                              CanDownloadBuild="True"/>
         </Grid>
         <Grid Grid.Column="0" Margin="10" Visibility="{Binding ElementName=_this, Path=BrowsersEnabled, Mode=OneWay, Converter={StaticResource BooleanToVisibility}}">
-            <controls:ChromiumBrowserWrapper Address="{Binding ElementName=_this, Path=LeftBrowserAddress, Mode=OneWay}"
+            <controls:ChromiumBrowserWrapper x:Name="LeftWebBrowser"
+                                             Address="{Binding ElementName=_this, Path=LeftBrowserAddress, Mode=OneWay}"
                                              Foreground="White" FavoriteUriChanged="LeftBrowser_FavoriteUriChanged"
                                              FavoriteAddress="{Binding ElementName=_this, Path=LeftBrowserFavoriteAddress, Mode=OneWay}"
                                              MaximizeClicked="LeftChromiumBrowserWrapper_MaximizeClicked"

Daybreak/Views/MainView.xaml.cs

@@ -1,9 +1,12 @@
-using Daybreak.Exceptions;
+using Daybreak.Controls;
+using Daybreak.Exceptions;
 using Daybreak.Models.Builds;
 using Daybreak.Services.ApplicationLauncher;
+using Daybreak.Services.BuildTemplates;
 using Daybreak.Services.Configuration;
 using Daybreak.Services.Screens;
 using Daybreak.Services.ViewManagement;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Extensions;
 using System.Linq;
@@ -26,6 +29,8 @@ namespace Daybreak.Views
         private readonly IViewManager viewManager;
         private readonly IConfigurationManager configurationManager;
         private readonly IScreenManager screenManager;
+        private readonly IBuildTemplateManager buildTemplateManager;
+        private readonly ILogger<ChromiumBrowserWrapper> browserLogger;
         private readonly CancellationTokenSource cancellationTokenSource = new();
 
         private bool leftBrowserMaximized = false;
@@ -54,17 +59,28 @@ namespace Daybreak.Views
             IApplicationLauncher applicationDetector,
             IViewManager viewManager,
             IConfigurationManager configurationManager,
-            IScreenManager screenManager)
+            IScreenManager screenManager,
+            IBuildTemplateManager buildTemplateManager,
+            ILogger<ChromiumBrowserWrapper> browserLogger)
         {
+            this.browserLogger = browserLogger;
+            this.buildTemplateManager = buildTemplateManager.ThrowIfNull(nameof(buildTemplateManager));
             this.screenManager = screenManager.ThrowIfNull(nameof(screenManager));
             this.configurationManager = configurationManager.ThrowIfNull(nameof(configurationManager));
             this.applicationDetector = applicationDetector.ThrowIfNull(nameof(applicationDetector));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.InitializeComponent();
             this.PeriodicallyCheckGameState();
+            this.InitializeBrowsers();
             this.NavigateToDefaults();
         }
 
+        private void InitializeBrowsers()
+        {
+            this.LeftWebBrowser.InitializeBrowser(this.configurationManager, this.buildTemplateManager, this.browserLogger);
+            this.RightWebBrowser.InitializeBrowser(this.configurationManager, this.buildTemplateManager, this.browserLogger);
+        }
+
         private void NavigateToDefaults()
         {
             var applicationConfiguration = this.configurationManager.GetConfiguration();