An update to the WinUI sample. (#74)

Author: adrianhall

samples/todoapp/Samples.TodoApp.sln

@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TodoApp.WinUI3", "TodoApp.W
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Datasync.Client", "..\..\src\CommunityToolkit.Datasync.Client\CommunityToolkit.Datasync.Client.csproj", "{2AC73FBE-9E76-4702-B551-B5884383CC68}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Datasync.Server.Abstractions", "..\..\src\CommunityToolkit.Datasync.Server.Abstractions\CommunityToolkit.Datasync.Server.Abstractions.csproj", "{C99C342C-FDAC-46DC-89B2-A06CB008348E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,29 +61,12 @@ Global
 		{2AC73FBE-9E76-4702-B551-B5884383CC68}.Release|x64.Build.0 = Release|Any CPU
 		{2AC73FBE-9E76-4702-B551-B5884383CC68}.Release|x86.ActiveCfg = Release|Any CPU
 		{2AC73FBE-9E76-4702-B551-B5884383CC68}.Release|x86.Build.0 = Release|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Debug|x64.Build.0 = Debug|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Debug|x86.Build.0 = Debug|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Release|ARM64.Build.0 = Release|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Release|x64.ActiveCfg = Release|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Release|x64.Build.0 = Release|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Release|x86.ActiveCfg = Release|Any CPU
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{2AC73FBE-9E76-4702-B551-B5884383CC68} = {7183ECEC-9F44-48CE-BB97-AA2445170D5E}
-		{C99C342C-FDAC-46DC-89B2-A06CB008348E} = {7183ECEC-9F44-48CE-BB97-AA2445170D5E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {91B9DE2A-8B79-4DC4-8235-216CD07F1CB2}

samples/todoapp/TodoApp.WinUI3/App.xaml.cs

@@ -10,7 +10,6 @@
 using Microsoft.UI.Xaml.Controls;
 using System;
 using TodoApp.WinUI3.Database;
-using TodoApp.WinUI3.Services;
 using TodoApp.WinUI3.ViewModels;
 using TodoApp.WinUI3.Views;
 
@@ -30,11 +29,18 @@ public App()
         this.dbConnection.Open();
 
         IServiceCollection services = new ServiceCollection()
-            .AddSingleton<ITodoService, LocalTodoService>()
             .AddTransient<TodoListViewModel>()
+            .AddScoped<IDbInitializer, DbContextInitializer>()
             .AddDbContext<AppDbContext>(options => options.UseSqlite(this.dbConnection));
 
         Ioc.Default.ConfigureServices(services.BuildServiceProvider());
+
+        // Initialize the database
+        using (IServiceScope scope = Ioc.Default.CreateScope())
+        {
+            IDbInitializer initializer = scope.ServiceProvider.GetRequiredService<IDbInitializer>();
+            initializer.Initialize();
+        }
     }
 
     protected override void OnLaunched(LaunchActivatedEventArgs args)

samples/todoapp/TodoApp.WinUI3/Database/AppDbContext.cs

@@ -2,11 +2,37 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Datasync.Client.Offline;
 using Microsoft.EntityFrameworkCore;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace TodoApp.WinUI3.Database;
 
 public class AppDbContext(DbContextOptions<AppDbContext> options) : DbContext(options)
 {
     public DbSet<TodoItem> TodoItems => Set<TodoItem>();
+
+    //protected override void OnDatasyncInitialization(DatasyncOfflineOptionsBuilder optionsBuilder)
+    //{
+    //    _ = optionsBuilder.UseEndpoint(new Uri("https://myservice.azurewebsites.net"));
+    //}
+}
+
+/// <summary>
+/// Use this class to initialize the database.  In this sample, we just create
+/// the database using <see cref="DatabaseFacade.EnsureCreated"/>.  However, you
+/// may want to use migrations.
+/// </summary>
+/// <param name="context">The context for the database.</param>
+public class DbContextInitializer(AppDbContext context) : IDbInitializer
+{
+    /// <inheritdoc />
+    public void Initialize()
+        => context.Database.EnsureCreated();
+
+    /// <inheritdoc />
+    public Task InitializeAsync(CancellationToken cancellationToken = default)
+        => context.Database.EnsureCreatedAsync(cancellationToken);
 }

samples/todoapp/TodoApp.WinUI3/Database/IDbInitializer.cs

@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace TodoApp.WinUI3.Database;
+
+/// <summary>
+/// An interface to initialize a database.
+/// </summary>
+public interface IDbInitializer
+{
+    /// <summary>
+    /// Synchronously initialize the database.
+    /// </summary>
+    void Initialize();
+
+    /// <summary>
+    /// Asynchronously initialize the database.
+    /// </summary>
+    /// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe.</param>
+    /// <returns>A task that resolves when complete.</returns>
+    Task InitializeAsync(CancellationToken cancellationToken = default);
+}

samples/todoapp/TodoApp.WinUI3/Database/OfflineClientEntity.cs

@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace TodoApp.WinUI3.Database;
+
+/// <summary>
+/// An abstract class for working with offline entities.
+/// </summary>
+public abstract class OfflineClientEntity
+{
+    [Key]
+    public string Id { get; set; }
+    public DateTimeOffset? UpdatedAt { get; set; }
+    public string Version { get; set; }
+    public bool Deleted { get; set; }
+}

samples/todoapp/TodoApp.WinUI3/Database/TodoItem.cs

@@ -2,10 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using CommunityToolkit.Datasync.Client;
 using System.Text.Json;
 
-namespace TodoApp.WinUI3;
+namespace TodoApp.WinUI3.Database;
 
 public class TodoItem : OfflineClientEntity
 {