Merge pull request #32 from alex-oswald/change-sample

alex-oswald · web-flow · commit c935d31fc281 · 2025-02-15T14:42:34.000-08:00
Update .NET
diff --git a/TestWindowsFormsLifetime.yml b/TestWindowsFormsLifetime.yml
@@ -15,9 +15,9 @@ variables:
 
 steps:
 - task: UseDotNet@2
-  displayName: 'Use .NET 8.x SDK'
+  displayName: 'Use .NET 9.x SDK'
   inputs:
-    version: 8.x
+    version: 9.x
 
 - task: DotNetCoreCLI@2
   displayName: 'Restore Solution'
diff --git a/samples/AppContext/AppContext.csproj b/samples/AppContext/AppContext.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net8.0-windows</TargetFramework>
+		<TargetFramework>net9.0-windows</TargetFramework>
 		<UseWindowsForms>true</UseWindowsForms>
 		<IsPackable>false</IsPackable>
 		<Nullable>enable</Nullable>
diff --git a/samples/BlazorHybrid/BlazorHybrid.csproj b/samples/BlazorHybrid/BlazorHybrid.csproj
@@ -1,17 +1,17 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="7.0.49" />
-    <PackageReference Include="MudBlazor" Version="6.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="9.0.40" />
+    <PackageReference Include="MudBlazor" Version="8.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/SampleApp/Form1.Designer.cs b/samples/SampleApp/Form1.Designer.cs
diff --git a/samples/SampleApp/Form1.cs b/samples/SampleApp/Form1.cs
@@ -8,13 +8,23 @@ public partial class Form1 : Form
     private readonly ILogger<Form1> _logger;
     private readonly IFormProvider _formProvider;
 
-    public Form1(ILogger<Form1> logger, IFormProvider formProvider)
+    public Form1(
+        ILogger<Form1> logger,
+        IFormProvider formProvider,
+        TickBag tickBag)
     {
         InitializeComponent();
         _logger = logger;
         _formProvider = formProvider;
+        tickBag.OnTick += TickBag_OnTick;
 
-        ThreadLabel.Text = $"{Thread.CurrentThread.ManagedThreadId} {Thread.CurrentThread.Name}";
+        ThreadLabel.Text = $"Thread id = {Environment.CurrentManagedThreadId}, Thread name = {Thread.CurrentThread.Name}";
+        TickLabel.Text = $"Tick = {tickBag.CurrentTick}";
+    }
+
+    private void TickBag_OnTick(object? sender, int e)
+    {
+        TickLabel.Text = $"Tick: {e}";
     }
 
     private async void button1_Click(object sender, EventArgs e)
diff --git a/samples/SampleApp/Form1.resx b/samples/SampleApp/Form1.resx
@@ -1,4 +1,64 @@
-﻿<root>
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/samples/SampleApp/Form2.cs b/samples/SampleApp/Form2.cs
@@ -27,8 +27,9 @@ private void button1_Click(object sender, EventArgs e)
         Task.Run(() =>
         {
             _logger.LogInformation($"Task.Run Thread {Thread.CurrentThread.ManagedThreadId}  {Thread.CurrentThread.Name}");
-            _guiContext.Invoke(new Action(() =>
+            _guiContext.Invoke(new Action(async () =>
             {
+                await Task.Delay(1000);
                 _logger.LogInformation($"GuiContext Thread {Thread.CurrentThread.ManagedThreadId}  {Thread.CurrentThread.Name}");
                 button1.Text = new Random().Next(1, 10).ToString();
             }));
diff --git a/samples/SampleApp/FormSpawnHostedService.cs b/samples/SampleApp/FormSpawnHostedService.cs
@@ -26,7 +26,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         while (!stoppingToken.IsCancellationRequested)
         {
             await Task.Delay(5000, stoppingToken);
-            if (count < 5)
+            if (count < 2)
             {
                 // Fetch the form here using IFormProvider
                 // The form provider will get the form from the DI container on the gui thread
diff --git a/samples/SampleApp/Program.cs b/samples/SampleApp/Program.cs
@@ -8,6 +8,7 @@
 builder.Services.AddHostedService<FormSpawnHostedService>();
 builder.Services.AddHostedService<TickingHostedService>();
 builder.Services.AddTransient<Form2>();
+builder.Services.AddSingleton<TickBag>();
 
 var app = builder.Build();
 app.Run();
diff --git a/samples/SampleApp/SampleApp.csproj b/samples/SampleApp/SampleApp.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0-windows</TargetFramework>
+		<TargetFramework>net9.0-windows</TargetFramework>
 		<UseWindowsForms>true</UseWindowsForms>
 		<IsPackable>false</IsPackable>
 		<Nullable>enable</Nullable>
diff --git a/samples/SampleApp/TickBag.cs b/samples/SampleApp/TickBag.cs
@@ -0,0 +1,15 @@
+namespace SampleApp;
+public class TickBag
+{
+    private int _currentTick = 0;
+
+    public event EventHandler<int>? OnTick;
+
+    public int CurrentTick => _currentTick;
+
+    public void Increment()
+    {
+        Interlocked.Increment(ref _currentTick);
+        OnTick?.Invoke(this, _currentTick);
+    }
+}
diff --git a/samples/SampleApp/TickingHostedService.cs b/samples/SampleApp/TickingHostedService.cs
@@ -6,18 +6,23 @@ namespace SampleApp;
 public class TickingHostedService : BackgroundService
 {
     private readonly ILogger _logger;
+    private readonly TickBag _tickBag;
 
-    public TickingHostedService(ILogger<TickingHostedService> logger)
+    public TickingHostedService(ILogger<TickingHostedService> logger, TickBag tickBag)
     {
         _logger = logger;
+        _tickBag = tickBag;
     }
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
         while (!stoppingToken.IsCancellationRequested)
         {
-            await Task.Delay(2000);
-            _logger.LogInformation($"Tick 2000ms {Thread.CurrentThread.ManagedThreadId} {Thread.CurrentThread.Name}");
+            await Task.Delay(2000, stoppingToken);
+            _tickBag.Increment();
+            _logger.LogInformation(
+                "Tick 2000ms, thread id = {threadId}, thread name = {threadName}, tick value={value}",
+                Thread.CurrentThread.ManagedThreadId, Thread.CurrentThread.Name, _tickBag.CurrentTick);
         }
     }
 }
diff --git a/src/WindowsFormsLifetime/HostBuilderExtensions.cs b/src/WindowsFormsLifetime/HostBuilderExtensions.cs
@@ -41,63 +41,8 @@ public static IHostBuilder UseWindowsFormsLifetime<TAppContext, TStartForm>(
         this IHostBuilder hostBuilder, Func<TStartForm, TAppContext> applicationContextFactory, Action<WindowsFormsLifetimeOptions> configure = null)
         where TAppContext : ApplicationContext
         where TStartForm : Form
-        => hostBuilder.ConfigureServices(services => services.AddWindowsFormsLifetime(applicationContextFactory, configure));
-
-#if NET7_0_OR_GREATER
-    /// <summary>
-    /// Enables Windows Forms support, builds and starts the host, starts the startup <see cref="Form"/>,
-    /// then waits for the startup form to close before shutting down.
-    /// </summary>
-    /// <param name="hostAppBuilder">The <see cref="HostApplicationBuilder" /> to configure.</param>
-    /// <param name="configure">The delegate for configuring the <see cref="WindowsFormsLifetimeOptions"/>.</param>
-    /// <returns>The same instance of the <see cref="HostApplicationBuilder"/> for chaining.</returns>
-    public static HostApplicationBuilder UseWindowsFormsLifetime<TStartForm>(
-        this HostApplicationBuilder hostAppBuilder, Action<WindowsFormsLifetimeOptions> configure = null)
-        where TStartForm : Form
-    {
-        hostAppBuilder.Services.AddWindowsFormsLifetime<TStartForm>(configure);
-
-        return hostAppBuilder;
-    }
-
-    /// <summary>
-    /// Enables Windows Forms support, builds and starts the host, starts the startup <see cref="ApplicationContext"/>,
-    /// then waits for the startup context to close before shutting down.
-    /// </summary>
-    /// <param name="hostAppBuilder">The <see cref="HostApplicationBuilder" /> to configure.</param>
-    /// <param name="applicationContextFactory">The <see cref="ApplicationContext"/> factory.</param>
-    /// <param name="configure">The delegate for configuring the <see cref="WindowsFormsLifetimeOptions"/>.</param>
-    /// <returns>The same instance of the <see cref="HostApplicationBuilder"/> for chaining.</returns>
-    public static HostApplicationBuilder UseWindowsFormsLifetime<TAppContext>(
-        this HostApplicationBuilder hostAppBuilder, Func<TAppContext> applicationContextFactory = null, Action<WindowsFormsLifetimeOptions> configure = null)
-        where TAppContext : ApplicationContext
-    {
-        hostAppBuilder.Services.AddWindowsFormsLifetime(applicationContextFactory, configure);
-
-        return hostAppBuilder;
-    }
-
-    /// <summary>
-    /// Enables Windows Forms support, builds and starts the host, starts the startup <see cref="ApplicationContext"/>,
-    /// then waits for the startup context to close before shutting down.
-    /// </summary>
-    /// <param name="hostAppBuilder">The <see cref="HostApplicationBuilder" /> to configure.</param>
-    /// <param name="applicationContextFactory">The <see cref="ApplicationContext"/> factory.</param>
-    /// <param name="configure">The delegate for configuring the <see cref="WindowsFormsLifetimeOptions"/>.</param>
-    /// <returns>The same instance of the <see cref="HostApplicationBuilder"/> for chaining.</returns>
-    public static HostApplicationBuilder UseWindowsFormsLifetime<TAppContext, TStartForm>(
-        this HostApplicationBuilder hostAppBuilder
-        , Func<TStartForm, TAppContext> applicationContextFactory, Action<WindowsFormsLifetimeOptions> configure = null)
-        where TAppContext : ApplicationContext
-        where TStartForm : Form
-    {
-        hostAppBuilder.Services.AddWindowsFormsLifetime(applicationContextFactory, configure);
-
-        return hostAppBuilder;
-    }
-#endif
+        => hostBuilder.ConfigureServices(services => services.AddWindowsFormsLifetime<TAppContext, TStartForm>(applicationContextFactory, configure));
 
-#if NET8_0_OR_GREATER
     /// <summary>
     /// Enables Windows Forms support, builds and starts the host, starts the startup <see cref="Form"/>,
     /// then waits for the startup form to close before shutting down.
@@ -149,5 +94,4 @@ this IHostApplicationBuilder hostAppBuilder
 
         return hostAppBuilder;
     }
-#endif
 }
diff --git a/src/WindowsFormsLifetime/WindowsFormsLifetime.csproj b/src/WindowsFormsLifetime/WindowsFormsLifetime.csproj
diff --git a/tests/WindowsFormsLifetime.Tests/FormProviderTests.cs b/tests/WindowsFormsLifetime.Tests/FormProviderTests.cs
diff --git a/tests/WindowsFormsLifetime.Tests/WindowsFormsLifetimeTests.csproj b/tests/WindowsFormsLifetime.Tests/WindowsFormsLifetimeTests.csproj

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,9 @@ private void button1_Click(object sender, EventArgs e)`
`27`	`27`	`Task.Run(() =>`
`28`	`28`	`{`
`29`	`29`	`_logger.LogInformation($"Task.Run Thread {Thread.CurrentThread.ManagedThreadId} {Thread.CurrentThread.Name}");`
`30`		`- _guiContext.Invoke(new Action(() =>`
	`30`	`+ _guiContext.Invoke(new Action(async () =>`
`31`	`31`	`{`
	`32`	`+ await Task.Delay(1000);`
`32`	`33`	`_logger.LogInformation($"GuiContext Thread {Thread.CurrentThread.ManagedThreadId} {Thread.CurrentThread.Name}");`
`33`	`34`	`button1.Text = new Random().Next(1, 10).ToString();`
`34`	`35`	`}));`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)`
`26`	`26`	`while (!stoppingToken.IsCancellationRequested)`
`27`	`27`	`{`
`28`	`28`	`await Task.Delay(5000, stoppingToken);`
`29`		`- if (count < 5)`
	`29`	`+ if (count < 2)`
`30`	`30`	`{`
`31`	`31`	`// Fetch the form here using IFormProvider`
`32`	`32`	`// The form provider will get the form from the DI container on the gui thread`