chore: structure update

Author: AndrewBabbitt97

.editorconfig

@@ -56,6 +56,9 @@ dotnet_diagnostic.IDE0035.severity = warning
 # IDE0045: Use conditional expression for assignment
 dotnet_style_prefer_conditional_expression_over_assignment = false
 
+# IDE0046: Use conditional expression for return
+dotnet_style_prefer_conditional_expression_over_return = false
+
 # IDE0049: Use language keywords instead of framework type names for type references
 dotnet_diagnostic.IDE0049.severity = warning
 
@@ -71,6 +74,12 @@ dotnet_diagnostic.IDE0079.severity = warning
 # IDE0160-IDE0161: Namespace declaration preferences
 csharp_style_namespace_declarations = file_scoped
 
+# IDE0130: Namespace does not match folder structure
+dotnet_diagnostic.IDE0130.severity = warning
+
+# IDE0290: Use primary constructor
+csharp_style_prefer_primary_constructors = false
+
 # IDE1006: Naming styles
 dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.severity = warning
 dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.symbols = non_private_static_fields

src/BlazorDesktop.sln renamed to BlazorDesktop.sln

@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorDesktop", "BlazorDesktop\BlazorDesktop.csproj", "{36822AC5-A3A4-4AFA-A3EC-0C9F7DBFAC39}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorDesktop", "src\BlazorDesktop\BlazorDesktop.csproj", "{36822AC5-A3A4-4AFA-A3EC-0C9F7DBFAC39}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorDesktop.Sample", "BlazorDesktop.Sample\BlazorDesktop.Sample.csproj", "{A05779F3-CE78-4455-BBCB-FF1ED77CD5E7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorDesktop.Sample", "src\BlazorDesktop.Sample\BlazorDesktop.Sample.csproj", "{A05779F3-CE78-4455-BBCB-FF1ED77CD5E7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorDesktop.Templates", "BlazorDesktop.Templates\BlazorDesktop.Templates.csproj", "{69F353B9-60B3-4E9B-87EE-4A628A3CFA81}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorDesktop.Templates", "src\BlazorDesktop.Templates\BlazorDesktop.Templates.csproj", "{69F353B9-60B3-4E9B-87EE-4A628A3CFA81}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Directory.Build.props renamed to Directory.Build.props

@@ -32,7 +32,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <BaseOutputPath>$(MSBuildThisFileDirectory)../bin/$(MSBuildProjectName)</BaseOutputPath>
+    <BaseOutputPath>$(MSBuildThisFileDirectory)bin/$(MSBuildProjectName)</BaseOutputPath>
     <Copyright>© $(Authors). All rights reserved.</Copyright>
     <RepositoryType>git</RepositoryType>
     <IncludeSymbols>true</IncludeSymbols>
@@ -44,9 +44,9 @@
   </PropertyGroup>
 
   <ItemGroup Condition="$(IsPackable) == 'true'">
-    <None Include="$(MSBuildThisFileDirectory)../assets/nuget.png" Visible="false" Pack="true" PackagePath="" />
-    <None Include="$(MSBuildThisFileDirectory)../README.md" Visible="false" Pack="true" PackagePath="" />
-    <None Include="$(MSBuildThisFileDirectory)../LICENSE.txt" Visible="False" Pack="true" PackagePath="" />
+    <None Include="$(MSBuildThisFileDirectory)assets/nuget.png" Visible="false" Pack="true" PackagePath="" />
+    <None Include="$(MSBuildThisFileDirectory)README.md" Visible="false" Pack="true" PackagePath="" />
+    <None Include="$(MSBuildThisFileDirectory)LICENSE.txt" Visible="False" Pack="true" PackagePath="" />
   </ItemGroup>
 
 </Project>

global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "8.0.302",
+    "allowPrerelease": false,
+    "rollForward": "latestFeature"
+  }
+}

src/BlazorDesktop/BlazorDesktop.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="8.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="8.0.61" />
     <PackageReference Include="WebView2.Runtime.AutoInstaller" Version="1.0.0" />
   </ItemGroup>
 

src/BlazorDesktop/Services/BlazorDesktopService.cs

@@ -14,39 +14,48 @@ namespace BlazorDesktop.Services;
 /// <summary>
 /// The blazor desktop service.
 /// </summary>
-/// <remarks>
-/// Creates a <see cref="BlazorDesktopService"/> instance.
-/// </remarks>
-/// <param name="lifetime">The <see cref="IHostApplicationLifetime"/>.</param>
-/// <param name="services">The <see cref="IServiceProvider"/>.</param>
-/// <param name="logger">The <see cref="ILogger{TCategoryName}"/>.</param>
-/// <param name="webViewInstaller">The <see cref="WebViewInstaller"/>.</param>
-public partial class BlazorDesktopService(IHostApplicationLifetime lifetime, IServiceProvider services, ILogger<BlazorDesktopService> logger, WebViewInstaller webViewInstaller) : IHostedService, IDisposable
+public partial class BlazorDesktopService : IHostedService, IDisposable
 {
+    /// <summary>
+    /// The cancellation token registration.
+    /// </summary>
+    private CancellationTokenRegistration _applicationStoppingRegistration;
+
     /// <summary>
     /// The application lifetime.
     /// </summary>
-    private readonly IHostApplicationLifetime _lifetime = lifetime;
+    private readonly IHostApplicationLifetime _lifetime;
 
     /// <summary>
     /// The services.
     /// </summary>
-    private readonly IServiceProvider _services = services;
+    private readonly IServiceProvider _services;
 
     /// <summary>
     /// The <see cref="ILogger{TCategoryName}"/>.
     /// </summary>
-    private readonly ILogger<BlazorDesktopService> _logger = logger;
+    private readonly ILogger<BlazorDesktopService> _logger;
 
     /// <summary>
     /// The web view installer.
     /// </summary>
-    private readonly WebViewInstaller _webViewInstaller = webViewInstaller;
+    private readonly WebViewInstaller _webViewInstaller;
 
     /// <summary>
-    /// The cancellation token registration.
+    /// Creates a <see cref="BlazorDesktopService"/> instance.
     /// </summary>
-    private CancellationTokenRegistration _applicationStoppingRegistration;
+    /// <param name="lifetime">The <see cref="IHostApplicationLifetime"/>.</param>
+    /// <param name="services">The <see cref="IServiceProvider"/>.</param>
+    /// <param name="logger">The <see cref="ILogger{TCategoryName}"/>.</param>
+    /// <param name="webViewInstaller">The <see cref="WebViewInstaller"/>.</param>
+    public BlazorDesktopService(IHostApplicationLifetime lifetime, IServiceProvider services, ILogger<BlazorDesktopService> logger, WebViewInstaller webViewInstaller)
+    {
+        _applicationStoppingRegistration = new();
+        _lifetime = lifetime;
+        _services = services;
+        _logger = logger;
+        _webViewInstaller = webViewInstaller;
+    }
 
     /// <summary>
     /// Starts the service.

src/BlazorDesktop/Wpf/BlazorDesktopEventForwarder.cs

@@ -9,11 +9,7 @@ namespace BlazorDesktop.Wpf;
 /// <summary>
 /// The blazor desktop event forwarder.
 /// </summary>
-/// <remarks>
-/// Creates an instance of <see cref="BlazorDesktopEventForwarder"/>.
-/// </remarks>
-/// <param name="target">The target handle.</param>
-public partial class BlazorDesktopEventForwarder(IntPtr target)
+public partial class BlazorDesktopEventForwarder
 {
     /// <summary>
     /// Posted when the user presses the left mouse button while the cursor is
@@ -29,7 +25,16 @@ public partial class BlazorDesktopEventForwarder(IntPtr target)
     /// <summary>
     /// The target
     /// </summary>
-    private readonly IntPtr _target = target;
+    private readonly IntPtr _target;
+
+    /// <summary>
+    /// Creates an instance of <see cref="BlazorDesktopEventForwarder"/>.
+    /// </summary>
+    /// <param name="target">The target handle.</param>
+    public BlazorDesktopEventForwarder(IntPtr target)
+    {
+        _target = target;
+    }
 
     /// <summary>
     /// Occurs when the mouse starts dragging.