Merge pull request #6 from seionmoya/main

Move from Avalonia to WPF

.github/workflows/dotnet.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     env:
       DOTNET_NOLOGO: true

Fuyu.Launcher/App.xaml

@@ -0,0 +1,9 @@
+<Application x:Class="Fuyu.Launcher.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Fuyu.Launcher"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+
+    </Application.Resources>
+</Application>

Fuyu.Launcher/App.xaml.cs

@@ -0,0 +1,10 @@
+using System.Configuration;
+using System.Data;
+using System.Windows;
+
+namespace Fuyu.Launcher
+{
+    public partial class App : Application
+    {
+    }
+}

Fuyu.Launcher/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly:ThemeInfo(
+    ResourceDictionaryLocation.None,            //where theme specific resource dictionaries are located
+                                                //(used if a resource is not found in the page,
+                                                // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly   //where the generic resource dictionary is located
+                                                //(used if a resource is not found in the page,
+                                                // app, or any theme specific resource dictionaries)
+)]

Fuyu.Launcher/Fuyu.Launcher.csproj

@@ -1,35 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <OutputType>WinExe</OutputType>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
 
   <PropertyGroup>
-    <OutputType>WinExe</OutputType>
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
     <PublishSingleFile>true</PublishSingleFile>
-    <SelfContained>true</SelfContained>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.1.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.1.0" />
-    <PackageReference Include="BlazorWebView.Avalonia" Version="11.0.0.1" />
-    <PackageReference Include="WebView.Avalonia.Desktop" Version="11.0.0.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="8.0.80" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="../Fuyu.Platform.Launcher/Fuyu.Platform.Launcher.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+		<Content Update="wwwroot\**">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+
 </Project>

Fuyu.Launcher/MainWindow.xaml

@@ -0,0 +1,17 @@
+<Window x:Class="Fuyu.Launcher.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:blazor="clr-namespace:Microsoft.AspNetCore.Components.WebView.Wpf;assembly=Microsoft.AspNetCore.Components.WebView.Wpf"
+        xmlns:local="clr-namespace:Fuyu.Launcher"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="450" Width="800">
+    <Grid>
+        <blazor:BlazorWebView HostPage="wwwroot\index.html" Services="{DynamicResource services}">
+            <blazor:BlazorWebView.RootComponents>
+                <blazor:RootComponent Selector="#app" ComponentType="{x:Type local:Routes}" />
+            </blazor:BlazorWebView.RootComponents>
+        </blazor:BlazorWebView>
+    </Grid>
+</Window>

Fuyu.Launcher/MainWindow.xaml.cs

@@ -0,0 +1,20 @@
+using System.Windows;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Fuyu.Launcher
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+
+            ServiceCollection serviceCollection = new ServiceCollection();
+			serviceCollection.AddWpfBlazorWebView();
+#if DEBUG
+			serviceCollection.AddBlazorWebViewDeveloperTools();
+#endif
+			Resources.Add("services", serviceCollection.BuildServiceProvider());
+        }
+    }
+}

Fuyu.Platform.Launcher/Routes.razor → Fuyu.Launcher/Routes.razor

@@ -1,11 +1,11 @@
-@namespace Fuyu.Platform.Launcher
+@namespace Fuyu.Launcher
 
-@using Fuyu.Platform.Launcher.Layout
 @using Microsoft.AspNetCore.Components.Routing
+@using Fuyu.Platform.Launcher.Layout
 
-<Router AppAssembly="typeof(Layout.MainLayout).Assembly">
+<Router AppAssembly="typeof(MainLayout).Assembly">
     <Found Context="routeData">
-        <RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)" />
+        <RouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)" />
         <FocusOnNavigate RouteData="routeData" Selector="h1" />
     </Found>
 </Router>

Fuyu.Platform.Launcher/Fuyu.Platform.Launcher.csproj

@@ -8,10 +8,4 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebView" Version="8.0.8" />
   </ItemGroup>
 
-  <ItemGroup>
-		<Content Update="wwwroot\**">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-
 </Project>

Fuyu.Platform.Launcher/Layout/MainLayout.razor

@@ -1,4 +1,6 @@
-@inherits LayoutComponentBase
+@namespace Fuyu.Platform.Launcher.Layout
+
+@inherits LayoutComponentBase
 
 <div class="page">
     <main>

Fuyu.Platform.Launcher/README.md

@@ -3,12 +3,12 @@
 The actual launcher pages and functionality.
 Can be used as a starting point if you want to make your own launcher.
 
-## Fuyu.Launcher.Services
+## Fuyu.Platform.Launcher.Services
 
-### EftProcess
+### ProcessService
 
-`EftProcess` is a quick way to get a new EFT instance up and running. There are
-a couple of things you need to provide:
+`ProcessService` is a quick way to get a new EFT instance up and running. There
+are a couple of things you need to provide:
 
 - `cwd`: Current working directory. This is also where `EscapeFromTarkov.exe`
   must be located.
@@ -17,7 +17,7 @@ a couple of things you need to provide:
 
 ```cs
 using System;
-using Fuyu.Platform.Launcher.Services;
+using Fuyu.Platform.Launcher;
 
 public class Program
 {
@@ -27,7 +27,7 @@ public class Program
         var accountId = 480892;
         var address = "http://localhost:8000";
 
-        using (var process = EftProcess.Get(cwd, accountId, address))
+        using (var process = ProcessService.StartEft(cwd, accountId, address))
         {
             process.Start();
         }

Fuyu.code-workspace

@@ -51,16 +51,8 @@
 				},
 				"program": "OVERWRITTEN_BY_OS_SPECIFIC",
 				"windows": {
-					"program": "${workspaceFolder}/Fuyu.Launcher/bin/Debug/net8.0/win-x64/Fuyu.Launcher.dll",
-					"cwd": "${workspaceFolder}/Fuyu.Launcher/bin/Debug/net8.0/win-x64/",
-				},
-				"linux": {
-					"program": "${workspaceFolder}/Fuyu.Launcher/bin/Debug/net8.0/linux-x64/Fuyu.Launcher.dll",
-					"cwd": "${workspaceFolder}/Fuyu.Launcher/bin/Debug/net8.0/linux-x64/",
-				},
-				"osx": {
-					"program": "${workspaceFolder}/Fuyu.Launcher/bin/Debug/net8.0/osx-x64/Fuyu.Launcher.dll",
-					"cwd": "${workspaceFolder}/Fuyu.Launcher/bin/Debug/net8.0/osx-x64/",
+					"program": "${workspaceFolder}/Fuyu.Launcher/bin/Debug/net8.0-windows/win-x64/Fuyu.Launcher.dll",
+					"cwd": "${workspaceFolder}/Fuyu.Launcher/bin/Debug/net8.0-windows/win-x64/",
 				}
 			}
 		]