Merge pull request #1 from Applicita/csharp-markup-2-uno

Add WinUI 3 templates for Windows App SDK and Uno Platform
Applicita · Feb 28, 2023 · 16edee7 · 16edee7
2 parents 78d487f + b2844f5
commit 16edee7
Show file tree

Hide file tree

Showing 165 changed files with 4,467 additions and 7 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/Editorconfig/.template.config/template.json b/src/Editorconfig/.template.config/template.json
@@ -18,8 +18,17 @@
     "language": "C#",
     "type": "item"
   },
+  "symbols": {
+    "skipmanualinstructions": {
+      "type": "parameter",
+      "dataType": "bool",
+      "defaultValue": "false",
+      "description": "Skips displaying manual instructions when they are not necessary, e.g. when this template is used in combination with other mcs templates"
+    }
+  },
   "postActions": [
     {
+      "condition": "(!skipmanualinstructions)",
       "description": "Verify .csproj files",
       "manualInstructions": [
         {

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/Orleans.Multiservice/TemplatePostAction.ps1 b/src/Orleans.Multiservice/TemplatePostAction.ps1
@@ -2,4 +2,4 @@ Start-Sleep -seconds 1 # Workaround to prevent exception from lock on dotnet.exe
 dotnet add Apis/Apis.csproj reference LogicalserviceNameService/LogicalserviceNameService.csproj
 
 Write-Host "Use AddLogicalService.ps1 <name> to add more logical services" -ForegroundColor White -BackgroundColor DarkBlue
-Remove-Item $PSCommandPath -Force
+Remove-Item "$PSCommandPath" -Force
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/CSharp-Toolkit-Icon.png b/src/WinUI3-App/.template.config/CSharp-Toolkit-Icon.png
diff --git a/src/WinUI3-App/.template.config/dotnetcli.host.json b/src/WinUI3-App/.template.config/dotnetcli.host.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "http://json.schemastore.org/dotnetcli.host",
+  "symbolInfo": {
+    "WebAssembly": {
+      "longName": "webassembly",
+      "shortName": "wasm"
+    },
+    "mobile": {
+      "longName": "mobile",
+      "shortName": "mobile"
+    },
+    "Framework": {
+      "longName": "framework"
+    }
+  }
+}