From 7b3ac75543373b32ac2f84b8bc00ed4450e5fbb6 Mon Sep 17 00:00:00 2001
From: Thorsten Sommer <mail@tsommer.org>
Date: Wed, 24 Jan 2024 19:22:13 +0100
Subject: [PATCH] Fixed naming

---
 NET8Blazor/.run/Run Photino Net.run.xml       |  4 +--
 NET8Blazor/PhotinoNetApp/Components/App.razor |  2 +-
 .../PhotinoNetApp/Components/_Imports.razor   |  4 +--
 NET8Blazor/PhotinoNetApp/PhotinoNetApp.csproj | 26 +++++++++++++++----
 NET8Blazor/PhotinoNetApp/Program.cs           | 25 +++++++++++++-----
 5 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/NET8Blazor/.run/Run Photino Net.run.xml b/NET8Blazor/.run/Run Photino Net.run.xml
index 23a243d..6c405cf 100644
--- a/NET8Blazor/.run/Run Photino Net.run.xml	
+++ b/NET8Blazor/.run/Run Photino Net.run.xml	
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Photino Net" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/PhotinoNetAbpp/bin/Debug/net8.0/PhotinoNetAbpp" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/PhotinoNetApp/bin/Debug/net8.0/PhotinoNetAbpp" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/PhotinoNetAbpp" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/PhotinoNetApp" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
diff --git a/NET8Blazor/PhotinoNetApp/Components/App.razor b/NET8Blazor/PhotinoNetApp/Components/App.razor
index 6ef9b52..aad41a4 100644
--- a/NET8Blazor/PhotinoNetApp/Components/App.razor
+++ b/NET8Blazor/PhotinoNetApp/Components/App.razor
@@ -7,7 +7,7 @@
     <base href="/"/>
     <link rel="stylesheet" href="bootstrap/bootstrap.min.css"/>
     <link rel="stylesheet" href="app.css"/>
-    <link rel="stylesheet" href="PhotinoNetAbpp.styles.css"/>
+    <link rel="stylesheet" href="PhotinoNetApp.styles.css"/>
     <link rel="icon" type="image/png" href="favicon.png"/>
     <HeadOutlet/>
 </head>
diff --git a/NET8Blazor/PhotinoNetApp/Components/_Imports.razor b/NET8Blazor/PhotinoNetApp/Components/_Imports.razor
index 64f7b64..018ce8a 100644
--- a/NET8Blazor/PhotinoNetApp/Components/_Imports.razor
+++ b/NET8Blazor/PhotinoNetApp/Components/_Imports.razor
@@ -6,5 +6,5 @@
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
-@using PhotinoNetAbpp
-@using PhotinoNetAbpp.Components
\ No newline at end of file
+@using PhotinoNetApp
+@using PhotinoNetApp.Components
\ No newline at end of file
diff --git a/NET8Blazor/PhotinoNetApp/PhotinoNetApp.csproj b/NET8Blazor/PhotinoNetApp/PhotinoNetApp.csproj
index f492da5..cab4fe3 100644
--- a/NET8Blazor/PhotinoNetApp/PhotinoNetApp.csproj
+++ b/NET8Blazor/PhotinoNetApp/PhotinoNetApp.csproj
@@ -2,17 +2,33 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
+        <OutputType>WinExe</OutputType>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <RootNamespace>PhotinoNetAbpp</RootNamespace>
+        <RootNamespace>PhotinoNetApp</RootNamespace>
+        <AssemblyName>PhotinoNetApp</AssemblyName>
+        <PublishSingleFile>true</PublishSingleFile>
+        <SelfContained>true</SelfContained>
+        <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
+        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+        <PublishTrimmed>false</PublishTrimmed>
     </PropertyGroup>
 
     <ItemGroup>
-      <None Remove="Properties\launchSettings.json" />
-    </ItemGroup>
-
-    <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.1" />
       <PackageReference Include="Photino.NET" Version="2.6.0" />
     </ItemGroup>
 
+    <ItemGroup>
+        <Content Update="wwwroot\**">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
+
+    <ItemGroup>
+<!--        <EmbeddedResource Include="EmbeddedFilesManifest.xml" />-->
+        <EmbeddedResource Include="wwwroot\**\*" />
+    </ItemGroup>
+
 </Project>
diff --git a/NET8Blazor/PhotinoNetApp/Program.cs b/NET8Blazor/PhotinoNetApp/Program.cs
index c0a76f6..896dd0a 100644
--- a/NET8Blazor/PhotinoNetApp/Program.cs
+++ b/NET8Blazor/PhotinoNetApp/Program.cs
@@ -1,24 +1,37 @@
 using System.Drawing;
+using System.Reflection;
+using Microsoft.Extensions.FileProviders;
 using PhotinoNET;
-using PhotinoNetAbpp.Components;
+using PhotinoNetApp.Components;
 
-var builder = WebApplication.CreateBuilder(args);
+var builder = WebApplication.CreateBuilder();
 
-// Add services to the container.
 builder.Services.AddRazorComponents()
     .AddInteractiveServerComponents();
+builder.Services.AddSingleton<IFileProvider>(new ManifestEmbeddedFileProvider(Assembly.GetAssembly(type: typeof(Program))!, "/", "Microsoft.Extensions.FileProviders.Embedded.Manifest.xml", DateTimeOffset.Now));
 
-builder.WebHost.UseWebRoot("wwwroot").UseStaticWebAssets();
+// builder.WebHost.UseWebRoot("wwwroot");
+builder.WebHost.UseStaticWebAssets();
 builder.WebHost.UseUrls("http://localhost:5000");
 
 var app = builder.Build();
 
-app.UseHttpsRedirection();
-app.UseStaticFiles();
+// app.UseStaticFiles();
+app.UseStaticFiles(new StaticFileOptions
+{
+    FileProvider = app.Services.GetService<IFileProvider>(),
+    // RequestPath = "/PhotinoNetApp",
+    ServeUnknownFileTypes = true,
+});
+
 app.UseAntiforgery();
 app.MapRazorComponents<App>()
     .AddInteractiveServerRenderMode();
 
+foreach (var file in Assembly.GetExecutingAssembly().GetManifestResourceNames())
+    if (file.Contains("wwwroot"))
+        app.Logger.LogWarning($"Public file: {file}");
+
 using var webServerCancellation = new CancellationTokenSource();
 var webServerTask = app.RunAsync(webServerCancellation.Token);