sync

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc.Browser/AA05_CommandParCalc.Browser.csproj

@@ -0,0 +1,24 @@
+<Project>
+	<Import Project="..\Application.props" />
+	<PropertyGroup>
+		<TargetFramework>net10.0-browser</TargetFramework>
+		<OutputType>Exe</OutputType>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+	<Import Sdk="Microsoft.NET.Sdk.WebAssembly" Project="Sdk.props" />
+	<Import Sdk="Microsoft.NET.Sdk.WebAssembly" Project="Sdk.targets" />
+	<ItemGroup>
+		<Compile Remove="obj\**" />
+		<Content Remove="obj\**" />
+		<EmbeddedResource Remove="obj\**" />
+		<None Remove="obj\**" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Avalonia.Browser" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\AA05_CommandParCalc\AA05_CommandParCalc.csproj" />
+	</ItemGroup>
+</Project>

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc.Browser/Program.cs

@@ -0,0 +1,22 @@
+using AA05_CommandParCalc;
+using Avalonia;
+using Avalonia.Browser;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
+
+[assembly: SupportedOSPlatform("browser")]
+
+internal sealed partial class Program
+{
+    private static async Task Main(string[] args)
+    {
+        await BrowserAppBuilder.StartBrowserAppAsync(
+            BuildAvaloniaApp()
+                .WithInterFont(),
+            "out",
+            new BrowserPlatformOptions());
+    }
+
+    public static AppBuilder BuildAvaloniaApp()
+        => AppBuilder.Configure<App>();
+}

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc.Browser/Properties/AssemblyInfo.cs

@@ -0,0 +1 @@
+[assembly:System.Runtime.Versioning.SupportedOSPlatform("browser")]

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc.Browser/Properties/launchSettings.json

@@ -0,0 +1,38 @@
+{
+  "profiles": {
+    "AA05_CommandParCalc.Browser": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:7170;http://localhost:5236",
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}"
+    },
+    "WSL": {
+      "commandName": "WSL2",
+      "launchBrowser": true,
+      "launchUrl": "https://localhost:7170",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "ASPNETCORE_URLS": "https://localhost:7170;http://localhost:5236"
+      },
+      "distributionName": ""
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  },
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:57862/",
+      "sslPort": 44327
+    }
+  }
+}

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc.Browser/runtimeconfig.template.json

@@ -0,0 +1,10 @@
+{
+    "wasmHostProperties": {
+        "perHostConfig": [
+            {
+                "name": "browser",
+                "host": "browser"
+            }
+        ]
+    }
+}

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc.Browser/wwwroot/app.css

@@ -0,0 +1,57 @@
+/* HTML styles for the splash screen */
+.avalonia-splash {
+    position: absolute;
+    height: 100%;
+    width: 100%;
+    background: white;
+    font-family: 'Outfit', sans-serif;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+    pointer-events: none;
+}
+
+@media (prefers-color-scheme: light) {
+    .avalonia-splash {
+        background: white;
+    }
+
+    .avalonia-splash h2 {
+        color: #1b2a4e;
+    }
+
+    .avalonia-splash a {
+        color: #0D6EFD;
+    }
+}
+
+@media (prefers-color-scheme: dark) {
+    .avalonia-splash {
+        background: #1b2a4e;
+    }
+
+    .avalonia-splash h2 {
+        color: white;
+    }
+
+    .avalonia-splash a {
+        color: white;
+    }
+}
+
+.avalonia-splash h2 {
+    font-weight: 400;
+    font-size: 1.5rem;
+}
+
+.avalonia-splash a {
+    text-decoration: none;
+    font-size: 2.5rem;
+    display: block;
+}
+
+.avalonia-splash.splash-close {
+    transition: opacity 200ms, display 200ms;
+    display: none;
+    opacity: 0;
+}

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc.Browser/wwwroot/index.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>AA05_CommandParCalc.Browser</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="./app.css" />
+</head>
+<body style="margin: 0; overflow: hidden">
+<div id="out">
+    <div class="avalonia-splash">
+        <h2>AA05 CommandParCalc is loading...</h2>
+    </div>
+</div>
+<script type='module' src="./main.js"></script>
+</body>
+</html>

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc.Browser/wwwroot/main.js

@@ -0,0 +1,13 @@
+import { dotnet } from './_framework/dotnet.js'
+
+const is_browser = typeof window != "undefined";
+if (!is_browser) throw new Error(`Expected to be running in a browser`);
+
+const dotnetRuntime = await dotnet
+    .withDiagnosticTracing(false)
+    .withApplicationArgumentsFromQuery()
+    .create();
+
+const config = dotnetRuntime.getConfig();
+
+await dotnetRuntime.runMain(config.mainAssemblyName, [globalThis.location.href]);

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc.Desktop/AA05_CommandParCalc.Desktop.csproj

@@ -0,0 +1,32 @@
+<Project>
+  <Import Project="..\Application.props" />
+  <PropertyGroup>
+	<OutputType>WinExe</OutputType>
+	<TargetFrameworks>net8.0</TargetFrameworks>
+	<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+	<ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+	<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0.100'))">
+		<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
+	</PropertyGroup>
+	<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '10.0.100'))">
+		<TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
+	</PropertyGroup>
+	<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '11.0.100'))">
+		<TargetFrameworks>$(TargetFrameworks);net11.0</TargetFrameworks>
+	</PropertyGroup>
+
+	<ItemGroup>
+	<PackageReference Include="Avalonia.Desktop" />
+	<PackageReference Include="Avalonia.Diagnostics">
+	  <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
+	  <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
+	</PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+	<ProjectReference Include="..\AA05_CommandParCalc\AA05_CommandParCalc.csproj" />
+  </ItemGroup>
+</Project>

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc.Desktop/Program.cs

@@ -0,0 +1,20 @@
+using AA05_CommandParCalc;
+using Avalonia;
+using System;
+
+namespace AA05_CommandParCalc.Desktop;
+
+sealed class Program
+{
+    // Initialization code. Don't use any Avalonia, third-party APIs or any
+    // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
+    // yet and stuff might break.
+    [STAThread]
+    public static void Main(string[] args) => BuildAvaloniaApp()
+        .StartWithClassicDesktopLifetime(args);
+
+    // Avalonia configuration, don't remove; also used by visual designer.
+    public static AppBuilder BuildAvaloniaApp()
+        => AppBuilderFactory.BuildAvaloniaApp()
+            .UsePlatformDetect();
+}

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc.Desktop/app.manifest

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="AA05_CommandParCalc.Desktop"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+	<application>
+	  <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+	</application>
+  </compatibility>
+</assembly>

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc/AA05_CommandParCalc.csproj

@@ -1,10 +1,8 @@
 <Project>
   <Import Project="..\Application.props" />
   <PropertyGroup>
-    <OutputType>WinExe</OutputType>
     <TargetFrameworks>net8.0</TargetFrameworks>
-    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Nullable>enable</Nullable>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
@@ -21,15 +19,9 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia" />
-    <PackageReference Include="Avalonia.Desktop" />
     <PackageReference Include="Svg.Controls.Skia.Avalonia" />
     <PackageReference Include="Avalonia.Themes.Fluent" />
     <PackageReference Include="Avalonia.Fonts.Inter" />
-    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia.Diagnostics">
-      <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
-      <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
   </ItemGroup>

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc/App.axaml.cs

@@ -2,7 +2,6 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Avalonia.Platform;
 using AA05_CommandParCalc.Models;
 using AA05_CommandParCalc.Models.Interfaces;
 using AA05_CommandParCalc.ViewModels;
@@ -14,38 +13,44 @@ namespace AA05_CommandParCalc;
 
 public partial class App : Application
 {
+    public IServiceProvider? Services { get; private set; }
+
     public override void Initialize()
     {
         AvaloniaXamlLoader.Load(this);
     }
 
     public override void OnFrameworkInitializationCompleted()
     {
+        Services = CreateServices();
+
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            InitDesktopApp(desktop);
+            desktop.MainWindow = new MainWindow
+            {
+                DataContext = Services.GetRequiredService<ICommandParCalcViewModel>()
+            };
+        }
+        else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
+        {
+            singleViewPlatform.MainView = new CommandParCalcView
+            {
+                DataContext = Services.GetRequiredService<ICommandParCalcViewModel>()
+            };
         }
 
         base.OnFrameworkInitializationCompleted();
     }
 
-    protected void InitDesktopApp(IClassicDesktopStyleApplicationLifetime desktop)
+    private static IServiceProvider CreateServices()
     {
         var services = new ServiceCollection();
 
         services.AddTransient<ICommandParCalcViewModel, CommandParCalcViewModel>()
         .AddTransient<ISysTime, SysTime>()
         .AddTransient<ICyclTimer, TimerProxy>()
-        .AddSingleton<IPlatformHandle>((s)=>null!)
         .AddSingleton<ICommandParCalcModel, CommandParCalcModel>();
 
-        Services = services.BuildServiceProvider();
-
-        desktop.MainWindow = new MainWindow
-        {
-            DataContext = Services.GetRequiredService<ICommandParCalcViewModel>()
-        };
+        return services.BuildServiceProvider();
     }
-
-    public IServiceProvider? Services { get; private set; }
 }

Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc/Models/CommandParCalcModel.cs

@@ -11,16 +11,9 @@
 // </copyright>
 // <summary></summary>
 // ***********************************************************************
-using Avalonia.Platform;
 using AA05_CommandParCalc.Models.Interfaces;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Timers;
 
 /// <summary>
 /// The Models namespace.
@@ -32,21 +25,15 @@ namespace AA05_CommandParCalc.Models;
 /// </summary>
 public partial class CommandParCalcModel : ObservableObject, ICommandParCalcModel
 {
-    /// <summary>
-    /// The platform handle
-    /// </summary>
-    private IPlatformHandle _platformHandle;
-    private ISysTime _sysTime;
-    private ICyclTimer _timer;
+    private readonly ISysTime _sysTime;
+    private readonly ICyclTimer _timer;
 
     public DateTime Now => _sysTime.Now;
     /// <summary>
     /// Initializes a new instance of the <see cref="CommandParCalcModel"/> class.
     /// </summary>
-    /// <param name="platformHandle">The platform handle.</param>
-    public  CommandParCalcModel(IPlatformHandle platformHandle, ISysTime sysTime, ICyclTimer timer)
+    public CommandParCalcModel(ISysTime sysTime, ICyclTimer timer)
     {
-        _platformHandle = platformHandle;
         _sysTime = sysTime;
         _timer = timer;
         _timer.Interval = 1000;