Updated DevToys MacOS

Author: veler

src/DevToys-MacOS.sln

@@ -33,10 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "desktops", "desktops", "{22EE9386-CEFA-47D8-97B2-09A63EDF7F2E}"
-	ProjectSection(SolutionItems) = preProject
-		app\dev\platforms\desktop\Directory.Build.props = app\dev\platforms\desktop\Directory.Build.props
-		app\dev\platforms\desktop\Directory.Build.targets = app\dev\platforms\desktop\Directory.Build.targets
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.CLI", "app\dev\platforms\desktop\DevToys.CLI\DevToys.CLI.csproj", "{8C72D38A-658D-4C9D-B0AD-2DA975BE7826}"
 EndProject

src/app/dev/platforms/desktop/DevToys.Linux/Components/BlazorWebView/BlazorAssetFileProvider.cs

@@ -1,4 +1,6 @@
+using DevToys.Blazor.Core;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
 using WebKit;
 
 namespace DevToys.Linux.Components;
@@ -26,7 +28,7 @@ internal BlazorWebView(IServiceProvider serviceProvider)
                 this,
                 serviceProvider,
                 options,
-                contentRootDir,
+                CreateFileProvider(options, contentRootDir),
                 hostPageRelativePath,
                 OnBlazorInitialized);
     }
@@ -37,4 +39,12 @@ private void OnBlazorInitialized()
     {
         BlazorWebViewInitialized?.Invoke(this, EventArgs.Empty);
     }
+
+    private static IFileProvider CreateFileProvider(BlazorWebViewOptions options, string contentRootDir)
+    {
+        string bundleRootDir = Path.Combine(options.ContentRoot, contentRootDir);
+        var physicalProvider = new PhysicalFileProvider(bundleRootDir);
+        var embeddedProvider = new DevToysBlazorEmbeddedFileProvider();
+        return new CompositeFileProvider(physicalProvider, embeddedProvider);
+    }
 }

src/app/dev/platforms/desktop/DevToys.Linux/Components/BlazorWebView/BlazorWebView.cs

@@ -22,14 +22,14 @@ public BlazorWebViewBridge(
         BlazorWebView webView,
         IServiceProvider serviceProvider,
         BlazorWebViewOptions options,
-        string contentRootRelativeToAppRoot,
+        IFileProvider fileProvider,
         string hostPageRelativePath,
         Action onBlazorInitialized)
         : base(
             serviceProvider,
             Dispatcher.CreateDefault(),
             AppOriginUri,
-            new BlazorAssetFileProvider(Path.Combine(options.ContentRoot, contentRootRelativeToAppRoot)),
+            fileProvider,
             new JSComponentConfigurationStore(),
             hostPageRelativePath)
     {

src/app/dev/platforms/desktop/DevToys.Linux/Components/BlazorWebView/BlazorWebViewBridge.cs

@@ -1,6 +1,7 @@
 using System.Collections.Specialized;
 using System.Globalization;
 using DevToys.Api;
+using DevToys.Blazor.Core;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
 using WebKit;
@@ -259,7 +260,10 @@ private void StartWebViewCoreIfPossible()
 
     private static IFileProvider CreateFileProvider(string contentRootDir)
     {
-        return new BlazorAssetFileProvider(contentRootDir);
+        string bundleRootDir = Path.Combine(NSBundle.MainBundle.ResourcePath, contentRootDir);
+        var physicalProvider = new PhysicalFileProvider(bundleRootDir);
+        var embeddedProvider = new DevToysBlazorEmbeddedFileProvider();
+        return new CompositeFileProvider(physicalProvider, embeddedProvider);
     }
 
     [LoggerMessage(EventId = 0, Level = LogLevel.Debug, Message = "Creating file provider at content root '{contentRootDir}', using host page relative path '{hostPageRelativePath}'.")]

src/app/dev/platforms/desktop/DevToys.MacOS/Controls/BlazorWebView/BlazorAssetFileProvider.cs

@@ -81,19 +81,5 @@
     <Content Remove="Assets.xcassets\AppIcon.appiconset\Contents.json"/>
     <BundleResource Include="Assets.xcassets\AppIcon.appiconset\Contents.json"/>
   </ItemGroup>
-
-  <Target Name="PublishStaticWebAssetsFiles" AfterTargets="_ComputePublishLocation">
-    <!-- Include the .staticwebassets.runtime.json files to the app bundle -->
-    <PropertyGroup>
-      <_AssemblyPublishDir Condition="'$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS' Or '$(_PlatformName)' == 'watchOS'">$(_RelativeAppBundlePath)\</_AssemblyPublishDir>
-      <_AssemblyPublishDir Condition="'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'">$(_RelativeAppBundlePath)\Contents\$(_CustomBundleName)\</_AssemblyPublishDir>
-    </PropertyGroup>
-    <ItemGroup>
-      <StaticWebAssetsFiles Include="$(OutputPath)\*.staticwebassets.runtime.json"/>
-      <ResolvedFileToPublish
-        Include="@(StaticWebAssetsFiles)"
-        RelativePath="$(_AssemblyPublishDir)\%(Filename)%(Extension)" />
-    </ItemGroup>
-  </Target>
 
 </Project>

src/app/dev/platforms/desktop/DevToys.MacOS/Controls/BlazorWebView/BlazorWKWebView.cs

@@ -105,7 +105,7 @@ private void InitializeView()
         // Create WebView and add it to NSVisualEffectView
         Guard.IsNotNull(AppDelegate.ServiceProvider);
         var webView = new BlazorWkWebView(AppDelegate.ServiceProvider, EnableDeveloperTools);
-        webView.BlazorWebViewInitialized+= OnBlazorWebViewInitialized;
+        webView.BlazorWebViewInitialized += OnBlazorWebViewInitialized;
         visualEffectView.AddSubview(webView.View);
 
         // Make the WKWebView resizing with the window and anchor it below the title bar, so we can still move the window with the title bar.