diff --git a/README.md b/README.md index 70cb057..27c8d1a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Promotes conciseness, readability and leveraging the latest language features. - **mcs-orleans-multiservice** [doc](https://github.com/Applicita/Orleans.Multiservice#readme)
*Prevent microservices pain with logical service separation for Microsoft Orleans 7* -These templates can be combined with [Orleans.Multitenant](https://github.com/Applicita/Orleans.Multitenant) for secure, flexible tenant separation in Microsoft Orleans 7 +The Orleans templates can be combined with [Orleans.Multitenant](https://github.com/Applicita/Orleans.Multitenant) for secure, flexible tenant separation in Microsoft Orleans 7 For how to install, see:
[![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/Modern.CSharp.Templates?color=gold&label=NuGet:%20Modern.CSharp.Templates&style=plastic)](https://www.nuget.org/packages/Modern.CSharp.Templates) diff --git a/src/Modern.CSharp.Templates.csproj b/src/Modern.CSharp.Templates.csproj index dbb9b36..ef594fa 100644 --- a/src/Modern.CSharp.Templates.csproj +++ b/src/Modern.CSharp.Templates.csproj @@ -2,7 +2,7 @@ Modern.CSharp.Templates - 1.2.0 + 1.3.0 Template Modern C# 11 Templates A toolkit of modern dotnet new templates for C# 11, .NET 7, Microsoft Orleans 7, Windows App SDK and Uno Platform diff --git a/src/Orleans.Multiservice/Apis/Apis.csproj b/src/Orleans.Multiservice/Apis/Apis.csproj index 2c70322..2a97c6a 100644 --- a/src/Orleans.Multiservice/Apis/Apis.csproj +++ b/src/Orleans.Multiservice/Apis/Apis.csproj @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/src/Orleans.Multiservice/Contracts/Contracts.csproj b/src/Orleans.Multiservice/Contracts/Contracts.csproj index de0dfdc..250ec9e 100644 --- a/src/Orleans.Multiservice/Contracts/Contracts.csproj +++ b/src/Orleans.Multiservice/Contracts/Contracts.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Orleans.Multiservice/LogicalserviceNameService/LogicalserviceNameService.csproj b/src/Orleans.Multiservice/LogicalserviceNameService/LogicalserviceNameService.csproj index 89d68e5..7302eef 100644 --- a/src/Orleans.Multiservice/LogicalserviceNameService/LogicalserviceNameService.csproj +++ b/src/Orleans.Multiservice/LogicalserviceNameService/LogicalserviceNameService.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/src/Orleans.Multiservice/Readme.md b/src/Orleans.Multiservice/Readme.md index 50b0597..d30a3a2 100644 --- a/src/Orleans.Multiservice/Readme.md +++ b/src/Orleans.Multiservice/Readme.md @@ -1,7 +1,7 @@ # MultiserviceName multiservice ## The multiservice pattern -This solution follows the [Multiservice pattern for Microsoft Orleans](https://github.com/Applicita/Orleans.Multiservice#readme); it was generated with [Modern.CSharp.Templates 1.1.0](https://www.nuget.org/packages/Modern.CSharp.Templates/1.1.0) by this command: +This solution follows the [Multiservice pattern for Microsoft Orleans](https://github.com/Applicita/Orleans.Multiservice#readme); it was generated with [Modern.CSharp.Templates 1.3.0](https://www.nuget.org/packages/Modern.CSharp.Templates/1.3.0) by this command: `dotnet new mcs-orleans-multiservice --RootNamespace RootNamespacePrefix --Multiservice MultiserviceName --Logicalservice LogicalserviceName` diff --git a/src/Readme.md b/src/Readme.md index 8f9e6cb..c09e866 100644 --- a/src/Readme.md +++ b/src/Readme.md @@ -1,23 +1,28 @@ 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)
+- **mcs-editorconfig** [doc](https://github.com/Applicita/Modern.CSharp.Templates/blob/main/Editorconfig.md) + *Settings for C# 11 code formatting, style, naming style and analysis. 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)
+- **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)
+- **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)
+- **mcs-orleans-results** [doc](https://github.com/Applicita/Orleans.Results#readme) + *Concise, version-tolerant result pattern implementation for Microsoft Orleans 7* -- **mcs-orleans-multiservice** [doc](https://github.com/Applicita/Orleans.Multiservice#readme)
+- **mcs-orleans-multiservice** [doc](https://github.com/Applicita/Orleans.Multiservice#readme) + *Prevent microservices pain with logical service separation for Microsoft Orleans 7* -These templates can be combined with [Orleans.Multitenant](https://github.com/Applicita/Orleans.Multitenant) for secure, flexible tenant separation in Microsoft Orleans 7 +The Orleans 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-2-0) \ No newline at end of file +[Release Notes](https://github.com/Applicita/Modern.CSharp.Templates/releases/tag/1-3-0) \ No newline at end of file diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Mobile/UnoWinUIQuickStart.Mobile.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Mobile/UnoWinUIQuickStart.Mobile.csproj index c9a017e..7467d93 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.Server/UnoWinUIQuickStart.Server.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Server/UnoWinUIQuickStart.Server.csproj index 870cb0e..eabe9d3 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart.Server/UnoWinUIQuickStart.Server.csproj +++ b/src/WinUI3-App/UnoWinUIQuickStart.Server/UnoWinUIQuickStart.Server.csproj @@ -16,7 +16,7 @@ - + #endif --> 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 c71eabe..97b37f5 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart.Skia.Gtk/UnoWinUIQuickStart.Skia.Gtk.csproj +++ b/src/WinUI3-App/UnoWinUIQuickStart.Skia.Gtk/UnoWinUIQuickStart.Skia.Gtk.csproj @@ -15,11 +15,11 @@ - - - - - + + + + + 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 513cd3a..02d1106 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 @@ -15,11 +15,11 @@ - - - - - + + + + + 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 91eaccd..243aaf4 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart.Skia.WPF/UnoWinUIQuickStart.Skia.WPF.csproj +++ b/src/WinUI3-App/UnoWinUIQuickStart.Skia.WPF/UnoWinUIQuickStart.Skia.WPF.csproj @@ -23,11 +23,11 @@ - - - - - + + + + + diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Wasm/UnoWinUIQuickStart.Wasm.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Wasm/UnoWinUIQuickStart.Wasm.csproj index f7322e5..43e34ab 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart.Wasm/UnoWinUIQuickStart.Wasm.csproj +++ b/src/WinUI3-App/UnoWinUIQuickStart.Wasm/UnoWinUIQuickStart.Wasm.csproj @@ -59,15 +59,15 @@ - - + + - - - - - - + + + + + + diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj index f1c1e9b..2a4799f 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj +++ b/src/WinUI3-App/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj @@ -23,11 +23,9 @@ - - - - - + + + diff --git a/src/WinUI3-App/UnoWinUIQuickStart/Core/BaseViewModel.cs b/src/WinUI3-App/UnoWinUIQuickStart/Core/BaseViewModel.cs index 023f726..9987784 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart/Core/BaseViewModel.cs +++ b/src/WinUI3-App/UnoWinUIQuickStart/Core/BaseViewModel.cs @@ -2,7 +2,7 @@ namespace UnoWinUIQuickStart.Core; -public class BaseViewModel : INotifyPropertyChanged +public partial class BaseViewModel : INotifyPropertyChanged { #pragma warning disable CS0067 // Justification: event is used by assembly weaver PropertyChanged.Fody public event PropertyChangedEventHandler? PropertyChanged; diff --git a/src/WinUI3-App/UnoWinUIQuickStart/Styles.cs b/src/WinUI3-App/UnoWinUIQuickStart/Styles.cs index ba67fec..f6f58bf 100644 --- a/src/WinUI3-App/UnoWinUIQuickStart/Styles.cs +++ b/src/WinUI3-App/UnoWinUIQuickStart/Styles.cs @@ -6,16 +6,18 @@ namespace UnoWinUIQuickStart; public static class Styles { - public static void ClearStyles() => Implicit.ClearStyles(); - - // Explicit styles go here - they can follow the same pattern as implicit styles below. - // Since Styles is a global static using, you can then e.g. do: Button("<") .Style(HeaderButton) - // Note: // - You can use XAML styles in C# Markup - no need to translate existing XAML styles to C#. // - Consider using native C# reuse mechanisms, such as builder functions or classes, instead of C# WinUI styles; // WinUI styles are a primary reuse mechanism in XAML, but C# has more developer friendly alternatives + public static void ClearStyles() => Implicit.ClearStyles(); + +#pragma warning disable IDE0002 // Simplify Member Access. Justification: allow to repeat the target class of the style in every setter, for better readability and quicker writing + + // Explicit styles go here - they can follow the same pattern as implicit styles below. + // Since Styles is a global static using, you can then e.g. do: Button("<") .Style(HeaderButton) + public static class Implicit { static UI.ResourceDictionary? dictionary; @@ -27,8 +29,8 @@ public static class Implicit ); public static Style