diff --git a/samples/todoapp/Samples.TodoApp.sln b/samples/todoapp/Samples.TodoApp.sln index c079eda2..8f91f421 100644 --- a/samples/todoapp/Samples.TodoApp.sln +++ b/samples/todoapp/Samples.TodoApp.sln @@ -21,8 +21,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoApp.Avalonia.Desktop", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoApp.Avalonia.iOS", "TodoApp.Avalonia\TodoApp.Avalonia.iOS\TodoApp.Avalonia.iOS.csproj", "{DFCE2057-9F7B-4E1A-9C83-B524D9A82FF1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoApp.Avalonia.Browser", "TodoApp.Avalonia\TodoApp.Avalonia.Browser\TodoApp.Avalonia.Browser.csproj", "{E8BB1310-477D-44B0-B13E-77F09433D0A3}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{E0CB420D-EEFC-415C-B10A-A01233115A3C}" ProjectSection(SolutionItems) = preProject ..\Directory.Packages.props = ..\Directory.Packages.props @@ -188,22 +186,6 @@ Global {DFCE2057-9F7B-4E1A-9C83-B524D9A82FF1}.Release|x64.Build.0 = Release|Any CPU {DFCE2057-9F7B-4E1A-9C83-B524D9A82FF1}.Release|x86.ActiveCfg = Release|Any CPU {DFCE2057-9F7B-4E1A-9C83-B524D9A82FF1}.Release|x86.Build.0 = Release|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Debug|ARM64.Build.0 = Debug|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Debug|x64.ActiveCfg = Debug|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Debug|x64.Build.0 = Debug|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Debug|x86.ActiveCfg = Debug|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Debug|x86.Build.0 = Debug|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Release|Any CPU.Build.0 = Release|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Release|ARM64.ActiveCfg = Release|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Release|ARM64.Build.0 = Release|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Release|x64.ActiveCfg = Release|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Release|x64.Build.0 = Release|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Release|x86.ActiveCfg = Release|Any CPU - {E8BB1310-477D-44B0-B13E-77F09433D0A3}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -218,7 +200,6 @@ Global {9C2BA2A4-4AD6-4B67-BB6B-29A9024C33C4} = {9A8B7D7F-1AF1-4C1C-A74A-E422BB680C6E} {3D741850-6FAA-4F36-BD58-F6ECE0CE55D7} = {9A8B7D7F-1AF1-4C1C-A74A-E422BB680C6E} {DFCE2057-9F7B-4E1A-9C83-B524D9A82FF1} = {9A8B7D7F-1AF1-4C1C-A74A-E422BB680C6E} - {E8BB1310-477D-44B0-B13E-77F09433D0A3} = {9A8B7D7F-1AF1-4C1C-A74A-E422BB680C6E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {91B9DE2A-8B79-4DC4-8235-216CD07F1CB2} diff --git a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/Program.cs b/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/Program.cs deleted file mode 100644 index 996ad395..00000000 --- a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/Program.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Runtime.Versioning; -using System.Threading.Tasks; -using Avalonia; -using Avalonia.Browser; -using TodoApp.Avalonia; - -[assembly: SupportedOSPlatform("browser")] - -internal sealed partial class Program -{ - private static Task Main(string[] args) => BuildAvaloniaApp() - .WithInterFont() - .StartBrowserAppAsync("out"); - - public static AppBuilder BuildAvaloniaApp() - => AppBuilder.Configure(); -} \ No newline at end of file diff --git a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/Properties/AssemblyInfo.cs b/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/Properties/AssemblyInfo.cs deleted file mode 100644 index f31aed8e..00000000 --- a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/Properties/AssemblyInfo.cs +++ /dev/null @@ -1 +0,0 @@ -[assembly: System.Runtime.Versioning.SupportedOSPlatform("browser")] \ No newline at end of file diff --git a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/Properties/launchSettings.json b/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/Properties/launchSettings.json deleted file mode 100644 index 19a2eadf..00000000 --- a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/Properties/launchSettings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "profiles": { - "TodoApp.Avalonia.Browser": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:7169;http://localhost:5235", - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - } - } -} diff --git a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/TodoApp.Avalonia.Browser.csproj b/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/TodoApp.Avalonia.Browser.csproj deleted file mode 100644 index 9879acbd..00000000 --- a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/TodoApp.Avalonia.Browser.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - net8.0-browser - Exe - true - - - - - - - - - - diff --git a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/runtimeconfig.template.json b/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/runtimeconfig.template.json deleted file mode 100644 index b96a9432..00000000 --- a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/runtimeconfig.template.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "wasmHostProperties": { - "perHostConfig": [ - { - "name": "browser", - "host": "browser" - } - ] - } -} \ No newline at end of file diff --git a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/wwwroot/app.css b/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/wwwroot/app.css deleted file mode 100644 index 1d6f754a..00000000 --- a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/wwwroot/app.css +++ /dev/null @@ -1,58 +0,0 @@ -/* 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; -} - -/* Light theme styles */ -@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; -} diff --git a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/wwwroot/favicon.ico b/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/wwwroot/favicon.ico deleted file mode 100644 index da8d49ff..00000000 Binary files a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/wwwroot/favicon.ico and /dev/null differ diff --git a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/wwwroot/index.html b/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/wwwroot/index.html deleted file mode 100644 index e98cc939..00000000 --- a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/wwwroot/index.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - TodoApp.Avalonia.Browser - - - - - - -
-
-

- Powered by - - - - - - - - - - - - - - -

-
-
- - - - diff --git a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/wwwroot/main.js b/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/wwwroot/main.js deleted file mode 100644 index bf1555e4..00000000 --- a/samples/todoapp/TodoApp.Avalonia/TodoApp.Avalonia.Browser/wwwroot/main.js +++ /dev/null @@ -1,13 +0,0 @@ -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]); diff --git a/samples/todoapp/TodoApp.MAUI/Platforms/MacCatalyst/AppDelegate.cs b/samples/todoapp/TodoApp.MAUI/Platforms/MacCatalyst/AppDelegate.cs deleted file mode 100644 index 82815a29..00000000 --- a/samples/todoapp/TodoApp.MAUI/Platforms/MacCatalyst/AppDelegate.cs +++ /dev/null @@ -1,12 +0,0 @@ -// 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 Foundation; - -namespace TodoApp.MAUI; -[Register("AppDelegate")] -public class AppDelegate : MauiUIApplicationDelegate -{ - protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); -} diff --git a/samples/todoapp/TodoApp.MAUI/Platforms/MacCatalyst/Entitlements.plist b/samples/todoapp/TodoApp.MAUI/Platforms/MacCatalyst/Entitlements.plist deleted file mode 100644 index de4adc94..00000000 --- a/samples/todoapp/TodoApp.MAUI/Platforms/MacCatalyst/Entitlements.plist +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - com.apple.security.app-sandbox - - - com.apple.security.network.client - - - - diff --git a/samples/todoapp/TodoApp.MAUI/Platforms/MacCatalyst/Info.plist b/samples/todoapp/TodoApp.MAUI/Platforms/MacCatalyst/Info.plist deleted file mode 100644 index 72689771..00000000 --- a/samples/todoapp/TodoApp.MAUI/Platforms/MacCatalyst/Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - UIDeviceFamily - - 2 - - UIRequiredDeviceCapabilities - - arm64 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - XSAppIconAssets - Assets.xcassets/appicon.appiconset - - diff --git a/samples/todoapp/TodoApp.MAUI/Platforms/MacCatalyst/Program.cs b/samples/todoapp/TodoApp.MAUI/Platforms/MacCatalyst/Program.cs deleted file mode 100644 index 73a49570..00000000 --- a/samples/todoapp/TodoApp.MAUI/Platforms/MacCatalyst/Program.cs +++ /dev/null @@ -1,18 +0,0 @@ -// 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 ObjCRuntime; -using UIKit; - -namespace TodoApp.MAUI; -public class Program -{ - // This is the main entry point of the application. - static void Main(string[] args) - { - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, typeof(AppDelegate)); - } -} diff --git a/samples/todoapp/TodoApp.MAUI/Platforms/Tizen/Main.cs b/samples/todoapp/TodoApp.MAUI/Platforms/Tizen/Main.cs deleted file mode 100644 index 5e9b619b..00000000 --- a/samples/todoapp/TodoApp.MAUI/Platforms/Tizen/Main.cs +++ /dev/null @@ -1,20 +0,0 @@ -// 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 Microsoft.Maui; -using Microsoft.Maui.Hosting; -using System; - -namespace TodoApp.MAUI; - -internal class Program : MauiApplication -{ - protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); - - static void Main(string[] args) - { - var app = new Program(); - app.Run(args); - } -} diff --git a/samples/todoapp/TodoApp.MAUI/Platforms/Tizen/tizen-manifest.xml b/samples/todoapp/TodoApp.MAUI/Platforms/Tizen/tizen-manifest.xml deleted file mode 100644 index bf392494..00000000 --- a/samples/todoapp/TodoApp.MAUI/Platforms/Tizen/tizen-manifest.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - maui-appicon-placeholder - - - - - http://tizen.org/privilege/internet - - - - \ No newline at end of file diff --git a/samples/todoapp/TodoApp.MAUI/TodoApp.MAUI.csproj b/samples/todoapp/TodoApp.MAUI/TodoApp.MAUI.csproj index c3973e5d..b779ddbe 100644 --- a/samples/todoapp/TodoApp.MAUI/TodoApp.MAUI.csproj +++ b/samples/todoapp/TodoApp.MAUI/TodoApp.MAUI.csproj @@ -1,72 +1,53 @@ - - - - net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 - - - - - - - Exe - TodoApp.MAUI - true - true - enable - enable - - - TodoApp.MAUI - - - com.companyname.todoapp.maui - - - 1.0 - 1 - - 11.0 - 13.1 - 21.0 - 10.0.17763.0 - 10.0.17763.0 - 6.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + net8.0-android;net8.0-ios + $(TargetFrameworks);net8.0-windows10.0.19041.0 + Exe + TodoApp.MAUI + true + true + enable + enable + TodoApp.MAUI + com.companyname.todoapp.maui + 1.0 + 1 + 11.0 + 21.0 + 10.0.17763.0 + 10.0.17763.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/todoapp/TodoApp.WinUI3/TodoApp.WinUI3.csproj b/samples/todoapp/TodoApp.WinUI3/TodoApp.WinUI3.csproj index 0b295a94..8eb289f7 100644 --- a/samples/todoapp/TodoApp.WinUI3/TodoApp.WinUI3.csproj +++ b/samples/todoapp/TodoApp.WinUI3/TodoApp.WinUI3.csproj @@ -1,7 +1,7 @@ WinExe - net8.0-windows10.0.19041.0 + net9.0-windows10.0.19041.0 10.0.17763.0 TodoApp.WinUI3 app.manifest @@ -10,6 +10,7 @@ win-$(Platform).pubxml true true + preview @@ -28,16 +29,14 @@ - - - - - - - - - - + + + + + + + + diff --git a/samples/todoapp/TodoApp.WinUI3/ViewModels/TodoItemViewModel.cs b/samples/todoapp/TodoApp.WinUI3/ViewModels/TodoItemViewModel.cs index ff41bc3f..7ec6548d 100644 --- a/samples/todoapp/TodoApp.WinUI3/ViewModels/TodoItemViewModel.cs +++ b/samples/todoapp/TodoApp.WinUI3/ViewModels/TodoItemViewModel.cs @@ -30,7 +30,7 @@ public string Version set => SetProperty(this._todoItem.Version, value, this._todoItem, (item, value) => item.Version = value); } - public string Id => _todoItem.Id; + public string Id => this._todoItem.Id; public DateTimeOffset? UpdatedAt { diff --git a/samples/todoapp/TodoApp.WinUI3/ViewModels/TodoListViewModel.cs b/samples/todoapp/TodoApp.WinUI3/ViewModels/TodoListViewModel.cs index 55a8793f..4d86b33a 100644 --- a/samples/todoapp/TodoApp.WinUI3/ViewModels/TodoListViewModel.cs +++ b/samples/todoapp/TodoApp.WinUI3/ViewModels/TodoListViewModel.cs @@ -23,13 +23,13 @@ public partial class TodoListViewModel(AppDbContext service) : ObservableRecipie internal event EventHandler NotificationHandler; [ObservableProperty] - private bool isRefreshing; + public partial bool IsRefreshing { get; set; } [ObservableProperty] - private ConcurrentObservableCollection items = []; + public partial ConcurrentObservableCollection Items { get; set; } = []; [ObservableProperty] - private string title = string.Empty; + public partial string Title { get; set; } = string.Empty; [RelayCommand] public async Task AddItemAsync(CancellationToken cancellationToken = default) diff --git a/samples/todoapp/TodoApp.WinUI3/Views/TodoListPage.xaml b/samples/todoapp/TodoApp.WinUI3/Views/TodoListPage.xaml index 6bffcfc6..5119aaca 100644 --- a/samples/todoapp/TodoApp.WinUI3/Views/TodoListPage.xaml +++ b/samples/todoapp/TodoApp.WinUI3/Views/TodoListPage.xaml @@ -1,28 +1,20 @@ - - - - - - @@ -52,14 +44,14 @@ Command="{Binding ViewModel.EditItemCommand, ElementName=ThisPage}" CommandParameter="{Binding Id}" Content="{Binding Title}" - IsChecked="{Binding IsComplete, Mode=TwoWay, UpdateSourceTrigger=Explicit}" /> + IsChecked="{Binding IsComplete, Mode=TwoWay, UpdateSourceTrigger=Explicit}" /> - + @@ -71,17 +63,13 @@ - - - - - - + Text="{x:Bind ViewModel.Title, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />