Release 1.2.0

Applicita · Feb 28, 2023 · b2844f5 · b2844f5
1 parent 96a2457
commit b2844f5
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,18 @@
 # <img src="src/CSharp-Toolkit-Icon.png" alt="C# Toolkit" width="64px" /> 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)<br />
   *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)<br />
+  *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)<br />
+  *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)<br />
   *Concise, version-tolerant result pattern implementation for Microsoft Orleans 7*
 

diff --git a/src/Modern.CSharp.Templates.csproj b/src/Modern.CSharp.Templates.csproj
@@ -2,10 +2,10 @@
 
     <PropertyGroup>
         <PackageId>Modern.CSharp.Templates</PackageId>
-        <PackageVersion>1.1.0</PackageVersion>
+        <PackageVersion>1.2.0</PackageVersion>
         <PackageType>Template</PackageType>
         <Title>Modern C# 11 Templates</Title>
-        <Description>A toolkit of modern dotnet new templates for C# 11, .NET 7 and Microsoft Orleans 7</Description>
+        <Description>A toolkit of modern dotnet new templates for C# 11, .NET 7, Microsoft Orleans 7, Windows App SDK and Uno Platform</Description>
         <Authors>VincentH.NET;Applicita</Authors>
         <Company>Applicita</Company>
 		<Copyright>Copyright © Applicita</Copyright>
@@ -15,7 +15,7 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
 		<PackageReleaseNotes>See source repository for release notes</PackageReleaseNotes>
 		<RepositoryUrl>https://github.com/Applicita/Modern.CSharp.Templates</RepositoryUrl>
-        <PackageTags>dotnet-new;modern;csharp;csharp 11;templates;editorconfig;Orleans;Orleans 7;results;multiservice;microservice;service;pattern;Applicita</PackageTags>
+        <PackageTags>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</PackageTags>
         <TargetFramework>netstandard2.0</TargetFramework>
 
         <IncludeContentInPack>true</IncludeContentInPack>

diff --git a/src/Readme.md b/src/Readme.md
@@ -1,11 +1,17 @@
-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)<br />
   *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)<br />
+  *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)<br />
+  *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)<br />
   *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)
+[Release Notes](https://github.com/Applicita/Modern.CSharp.Templates/releases/tag/1-2-0)
diff --git 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
@@ -48,11 +48,11 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.WinUI" Version="4.7.37" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.37" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.37" />
+    <PackageReference Include="Uno.WinUI" Version="4.7.44" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.44" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.44" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.37" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.44" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(TargetFramework)'=='net7.0-android'">

diff --git 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 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.7.37" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.37" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.37" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.37" />
+    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.7.44" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.44" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.44" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.44" />
     <PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
     <PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
   </ItemGroup>

diff --git a/...noWinUIQuickStart.Skia.Linux.FrameBuffer/UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj b/...noWinUIQuickStart.Skia.Linux.FrameBuffer/UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj
@@ -16,10 +16,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.7.37" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.37" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.37" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.37" />
+    <PackageReference Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.7.44" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.44" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.44" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.44" />
     <PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
     <PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
   </ItemGroup>

diff --git 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 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.7.37" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.37" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.37" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.37" />
+    <PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.7.44" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.44" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.44" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.44" />
     <PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
     <PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
   </ItemGroup>

diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Wasm/UnoWinUIQuickStart.Wasm.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Wasm/UnoWinUIQuickStart.Wasm.csproj
@@ -62,12 +62,12 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
     <PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
-    <PackageReference Include="Uno.WinUI.WebAssembly" Version="4.7.37" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.37" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.37" />
+    <PackageReference Include="Uno.WinUI.WebAssembly" Version="4.7.44" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.44" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.44" />
     <PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.11" />
     <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.11" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.37" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.7.44" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\UnoWinUIQuickStart\UnoWinUIQuickStart.csproj" />

diff --git a/src/WinUI3-App/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj b/src/WinUI3-App/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj
@@ -23,11 +23,11 @@
     <Content Include="Images\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230217.4" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
-    <PackageReference Include="Uno.WinUI" Version="4.7.37" />
+    <PackageReference Include="Uno.WinUI" Version="4.7.44" />
 	<PackageReference Include="KeyboardHookLite" Version="1.1.3" Condition=" '$(Configuration)' == 'Debug' " />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>

diff --git 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
@@ -35,13 +35,13 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
-    <PackageReference Include="Uno.WinUI" Version="4.7.37" />
-	<PackageReference Include="CSharpMarkup.WinUI" Version="0.8.3-dev.7" />
+    <PackageReference Include="Uno.WinUI" Version="4.7.44" />
+	<PackageReference Include="CSharpMarkup.WinUI" Version="2.0.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0-windows10.0.18362'">
-	<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" />
+	<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230217.4" />
 	<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22621.28" />
 	<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22621.28" />
   </ItemGroup>