update to C#11, .NET 7 and Orleans 7 rc2

Applicita · Oct 25, 2022 · 5bd0daf · 5bd0daf
1 parent 876735b
commit 5bd0daf
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 24 deletions.
diff --git a/Editorconfig.md b/Editorconfig.md
@@ -1,7 +1,8 @@
 # <img src="src/CSharp-Toolkit-Icon.png" alt="C# Toolkit" width="64px" /> Modern.CSharp.Templates - Editorconfig
 
-Settings for C# 10 code formatting, style, naming style and analysis.
+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)
 
 Noteworthy: the naming styles do *not* allow an underscore prefix for private fields.
 
@@ -20,6 +21,7 @@ It is recommended to include below settings are in all `.csproj` files that are
   <PropertyGroup>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <AnalysisLevel>preview-All</AnalysisLevel>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
 ```

diff --git a/README.md b/README.md
@@ -1,17 +1,13 @@
 # <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# 10, .NET 6 and Microsoft Orleans 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
 
 Templates:
 - Editorconfig [doc](Editorconfig.md)
 - Orleans.Results [doc](https://github.com/Applicita/Orleans.Results)
 
-To install, type this on the command line:
-```
-dotnet new --install Modern.CSharp.Templates::1.0.0-preview.2
-```
-
+For how to install, see:<br />
 [![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)
 
-More templates are coming (in Aug-Sept 2022):
-- Orleans.Multitenant (separate grain state storage and grain/stream communication per tenant)
-- Orleans.Multiservice (use a single Orleans service with multiple logical services inside it as an alternative to separate microservices)
+More templates are coming (in Oct 2022):
+- Orleans.Multiservice (use a single Orleans service with multiple logical services inside it as an alternative to separate microservices)
+- Orleans.Multitenant (uses [Orleans.Multitenant](https://github.com/Applicita/Orleans.Multitenant) to separate grain state storage and grain/stream communication per tenant)
diff --git a/src/Editorconfig/.template.config/template.json b/src/Editorconfig/.template.config/template.json
@@ -5,14 +5,14 @@
     "Modern",
     "CSharp",
     "C#",
-    "10",
+    "11",
     "editorconfig"
   ],
   "identity": "Modern.CSharp.editorconfig",
-  "name": "Modern C# 10 .editorconfig",
+  "name": "Modern C# 11 .editorconfig",
   "shortName": "mcs-editorconfig",
   "defaultName": ".editorconfig",
-  "description": "Settings for C# 10 code formatting, style, naming style and analysis. Promotes conciseness, readability and leveraging the latest language features.",
+  "description": "Settings for C# 11 code formatting, style, naming style and analysis. Promotes conciseness, readability and leveraging the latest language features.",
   "tags": {
     "language": "C#",
     "type": "item"
@@ -22,7 +22,7 @@
       "description": "Verify .csproj files",
       "manualInstructions": [
         {
-          "text": "ensure that below recommended settings are in all .csproj files that are in or below the folder where you created the .editorconfig file:\n\t<PropertyGroup>\n\t\t<Nullable>enable</Nullable>\n\t\t<TreatWarningsAsErrors>true</TreatWarningsAsErrors>\n\t\t<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>\n\t</PropertyGroup>"
+          "text": "ensure that below recommended settings are in all .csproj files that are in or below the folder where you created the .editorconfig file:\n\t<PropertyGroup>\n\t\t<Nullable>enable</Nullable>\n\t\t<TreatWarningsAsErrors>true</TreatWarningsAsErrors>\n\t\t<AnalysisLevel>preview-All</AnalysisLevel>\n\t\t<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>\n\t</PropertyGroup>"
         }
       ],
       "actionId": "AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C",

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.0.0-preview.2</PackageVersion>
+        <PackageVersion>1.0.0-rc2</PackageVersion>
         <PackageType>Template</PackageType>
-        <Title>Modern C# 10 Templates</Title>
-        <Description>A toolkit of modern dotnet new templates for C# 10, .NET 6 and Microsoft Orleans 4</Description>
+        <Title>Modern C# 11 Templates</Title>
+        <Description>A toolkit of modern dotnet new templates for C# 11, .NET 7 and Microsoft Orleans 7</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 10;templates;editorconfig;Orleans;Orleans 4;results;pattern;Applicita</PackageTags>
+        <PackageTags>dotnet-new;modern;csharp;csharp 11;templates;editorconfig;Orleans;Orleans 7;results;pattern;Applicita</PackageTags>
         <TargetFramework>netstandard2.0</TargetFramework>
 
         <IncludeContentInPack>true</IncludeContentInPack>

diff --git a/src/Orleans.Results/.template.config/template.json b/src/Orleans.Results/.template.config/template.json
@@ -5,16 +5,16 @@
     "Modern",
     "CSharp",
     "C#",
-    "10",
+    "11",
     "Orleans",
-    "Orleans 4",
+    "Orleans 7",
     "Results",
     "Pattern"
   ],
   "identity": "Modern.CSharp.Orleans.Results",
-  "name": "Modern C# 10 result pattern for Orleans 4",
+  "name": "Modern C# 11 result pattern for Orleans 7",
   "shortName": "mcs-orleans-results",
-  "description": "Concise, version-tolerant result pattern implementation for Microsoft Orleans 4",
+  "description": "Concise, version-tolerant result pattern implementation for Microsoft Orleans 7",
   "tags": {
     "language": "C#",
     "type": "item"

diff --git a/src/Readme.md b/src/Readme.md
@@ -1,9 +1,9 @@
-A toolkit of modern dotnet new templates for C# 10, .NET 6 and Microsoft Orleans 4
+A toolkit of modern dotnet new templates for C# 11, .NET 7 and Microsoft Orleans 7
 
 Templates:
 - Editorconfig 
 - Orleans.Results
 
 Docs: see the [repo readme](https://github.com/Applicita/Modern.CSharp.Templates#readme)
 
-[Release Notes](https://github.com/Applicita/Modern.CSharp.Templates/releases/tag/1-0-0-preview-2)
+[Release Notes](https://github.com/Applicita/Modern.CSharp.Templates/releases/tag/1-0-0-rc2)