diff --git a/README.md b/README.md index 6e00066..70cb057 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # C# Toolkit Modern.CSharp.Templates -A toolkit of modern [dotnet new templates](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-new) for C# 11, .NET 7 and Microsoft Orleans 7 +A toolkit of modern [dotnet new templates](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-new) for C# 11, .NET 7, Microsoft Orleans 7, Windows App SDK and Uno Platform Templates: - **mcs-editorconfig** [doc](https://github.com/Applicita/Modern.CSharp.Templates/blob/main/Editorconfig.md)
@@ -7,6 +7,12 @@ Templates: Promotes conciseness, readability and leveraging the latest language features. (can also be used with C# 10)* +- **mcs-winui3-app** [doc](https://github.com/VincentH-Net/CSharpForMarkup#readme)
+ *WinUI 3 C# Markup 2 application solution template for building browser / native UI with Windows App SDK and/or Uno Platform* + +- **mcs-winui3-view** [doc](https://github.com/VincentH-Net/CSharpForMarkup#readme)
+ *WinUI 3 C# Markup 2 view item template, for use with the `mcs-winui3-app` template via it's `New-View.ps1` command* + - **mcs-orleans-results** [doc](https://github.com/Applicita/Orleans.Results#readme)
*Concise, version-tolerant result pattern implementation for Microsoft Orleans 7* diff --git a/src/Modern.CSharp.Templates.csproj b/src/Modern.CSharp.Templates.csproj index 4b216db..dbb9b36 100644 --- a/src/Modern.CSharp.Templates.csproj +++ b/src/Modern.CSharp.Templates.csproj @@ -2,10 +2,10 @@ Modern.CSharp.Templates - 1.1.0 + 1.2.0 Template Modern C# 11 Templates - A toolkit of modern dotnet new templates for C# 11, .NET 7 and Microsoft Orleans 7 + A toolkit of modern dotnet new templates for C# 11, .NET 7, Microsoft Orleans 7, Windows App SDK and Uno Platform VincentH.NET;Applicita Applicita Copyright © Applicita @@ -15,7 +15,7 @@ Readme.md See source repository for release notes https://github.com/Applicita/Modern.CSharp.Templates - dotnet-new;modern;csharp;csharp 11;templates;editorconfig;Orleans;Orleans 7;results;multiservice;microservice;service;pattern;Applicita + dotnet-new;modern;csharp;csharp 11;templates;editorconfig;Orleans;Orleans 7;results;multiservice;microservice;service;pattern;csharpformarkup,csharpmarkup,markup,csharp,ui,winui,windowsappsdk,uno,webassembly,windows,desktop,Applicita netstandard2.0 true diff --git a/src/Readme.md b/src/Readme.md index 01171b1..8f9e6cb 100644 --- a/src/Readme.md +++ b/src/Readme.md @@ -1,4 +1,4 @@ -A toolkit of modern [dotnet new templates](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-new) for C# 11, .NET 7 and Microsoft Orleans 7 +A toolkit of modern [dotnet new templates](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-new) for C# 11, .NET 7, Microsoft Orleans 7, Windows App SDK and Uno Platform Templates: - **mcs-editorconfig** [doc](https://github.com/Applicita/Modern.CSharp.Templates/blob/main/Editorconfig.md)
@@ -6,6 +6,12 @@ Templates: Promotes conciseness, readability and leveraging the latest language features. (can also be used with C# 10)* +- **mcs-winui3-app** [doc](https://github.com/VincentH-Net/CSharpForMarkup#readme)
+ *WinUI 3 C# Markup 2 application solution template for building browser / native UI with Windows App SDK and/or Uno Platform* + +- **mcs-winui3-view** [doc](https://github.com/VincentH-Net/CSharpForMarkup#readme)
+ *WinUI 3 C# Markup 2 view item template, for use with the `mcs-winui3-app` template via it's `New-View.ps1` command* + - **mcs-orleans-results** [doc](https://github.com/Applicita/Orleans.Results#readme)
*Concise, version-tolerant result pattern implementation for Microsoft Orleans 7* @@ -14,4 +20,4 @@ Promotes conciseness, readability and leveraging the latest language features. These templates can be combined with [Orleans.Multitenant](https://github.com/Applicita/Orleans.Multitenant) for secure, flexible tenant separation in Microsoft Orleans 7 -[Release Notes](https://github.com/Applicita/Modern.CSharp.Templates/releases/tag/1-1-0) \ No newline at end of file +[Release Notes](https://github.com/Applicita/Modern.CSharp.Templates/releases/tag/1-2-0) \ No newline at end of file diff --git a/src/WinUI3-App/.template.config/template.json b/src/WinUI3-App/.template.config/template.json index ade455b..5834b11 100644 --- a/src/WinUI3-App/.template.config/template.json +++ b/src/WinUI3-App/.template.config/template.json @@ -24,7 +24,7 @@ ], "name": "Multi-Platform App (WinUI 3 with C# Markup 2)", "identity": "Modern.CSharp.WinUI3.App", - "description": "Template for creating a WinUI 3 C# application that targets Windows and/or (via Uno Platform) Android, iOS, Mac Catalyst, WebAssembly, Skia/Tizen, Skia/WPF, and Skia/GTK for Linux.", + "description": "WinUI 3 C# Markup 3 template for creating a C# application that targets Windows (with Windows App SDK) and/or (with Uno Platform) Android, iOS, Mac Catalyst, WebAssembly, Skia/Tizen, Skia/WPF, and Skia/GTK for Linux.", "precedence": "6001", "tags": { "language": "C#", diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Mobile/UnoWinUIQuickStart.Mobile.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Mobile/UnoWinUIQuickStart.Mobile.csproj index 4f6200b..c9a017e 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart.Mobile/UnoWinUIQuickStart.Mobile.csproj +++ b/src/WinUI3-App/UnoWinUIQuickStart.Mobile/UnoWinUIQuickStart.Mobile.csproj @@ -48,11 +48,11 @@ true - - - + + + - + diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Skia.Gtk/UnoWinUIQuickStart.Skia.Gtk.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Skia.Gtk/UnoWinUIQuickStart.Skia.Gtk.csproj index a47bde7..c71eabe 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart.Skia.Gtk/UnoWinUIQuickStart.Skia.Gtk.csproj +++ b/src/WinUI3-App/UnoWinUIQuickStart.Skia.Gtk/UnoWinUIQuickStart.Skia.Gtk.csproj @@ -16,10 +16,10 @@ - - - - + + + + diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Skia.Linux.FrameBuffer/UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Skia.Linux.FrameBuffer/UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj index 4bed1a8..513cd3a 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart.Skia.Linux.FrameBuffer/UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj +++ b/src/WinUI3-App/UnoWinUIQuickStart.Skia.Linux.FrameBuffer/UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj @@ -16,10 +16,10 @@ - - - - + + + + diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Skia.WPF/UnoWinUIQuickStart.Skia.WPF.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Skia.WPF/UnoWinUIQuickStart.Skia.WPF.csproj index 1dce03c..91eaccd 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart.Skia.WPF/UnoWinUIQuickStart.Skia.WPF.csproj +++ b/src/WinUI3-App/UnoWinUIQuickStart.Skia.WPF/UnoWinUIQuickStart.Skia.WPF.csproj @@ -24,10 +24,10 @@ - - - - + + + + diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Wasm/UnoWinUIQuickStart.Wasm.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Wasm/UnoWinUIQuickStart.Wasm.csproj index 6597c03..f7322e5 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart.Wasm/UnoWinUIQuickStart.Wasm.csproj +++ b/src/WinUI3-App/UnoWinUIQuickStart.Wasm/UnoWinUIQuickStart.Wasm.csproj @@ -62,12 +62,12 @@ - - - + + + - + diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj index ead3333..f1c1e9b 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj +++ b/src/WinUI3-App/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj @@ -23,11 +23,11 @@ - + - + diff --git a/src/WinUI3-App/UnoWinUIQuickStart/Core/MarkupExtensions.cs b/src/WinUI3-App/UnoWinUIQuickStart/Core/MarkupExtensions.cs index 346751c..37c07b8 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart/Core/MarkupExtensions.cs +++ b/src/WinUI3-App/UnoWinUIQuickStart/Core/MarkupExtensions.cs @@ -10,12 +10,6 @@ namespace UnoWinUIQuickStart.Core; static class MarkupExtensions { - public static Page Content(this Controls.Page page, UI.UIElement content) // TODO: move to NuGet - { - page.Content = content; - return page; - } - public static UIElement HotReloadOverlay(this Frame rootFrame) { #if !DEBUG diff --git a/src/WinUI3-App/UnoWinUIQuickStart/UnoWinUIQuickStart.csproj b/src/WinUI3-App/UnoWinUIQuickStart/UnoWinUIQuickStart.csproj index c40f6bf..5c2079a 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart/UnoWinUIQuickStart.csproj +++ b/src/WinUI3-App/UnoWinUIQuickStart/UnoWinUIQuickStart.csproj @@ -35,13 +35,13 @@ - - + + - +