Merge pull request #28 from egvijayanand/working

v1.8.0
egvijayanand · Jun 21, 2024 · df9e030 · df9e030
2 parents 2429dd7 + 87ac540
commit df9e030
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 24 deletions.
diff --git a/src/FormsTemplatesCLI/FormsClassLib/.template.config/dotnetcli.host.json b/src/FormsTemplatesCLI/FormsClassLib/.template.config/dotnetcli.host.json
@@ -1,12 +1,16 @@
 {
-  "$schema": "http://json.schemastore.org/dotnetcli.host",
-  "symbolInfo": {
-    "Framework": {
-      "longName": "framework"
-    }
-  },
-  "usageExamples": [
-    "--framework netstandard2.0",
-    "-f netstandard2.1"
-  ]
+    "$schema": "http://json.schemastore.org/dotnetcli.host",
+    "symbolInfo": {
+        "Framework": {
+            "longName": "framework"
+        },
+        "Preview": {
+            "longName": "preview",
+            "shortName": "pre"
+        }
+    },
+    "usageExamples": [
+        "--framework netstandard2.0",
+        "-f netstandard2.1"
+    ]
 }
diff --git a/src/FormsTemplatesCLI/FormsClassLib/.template.config/ide.host.json b/src/FormsTemplatesCLI/FormsClassLib/.template.config/ide.host.json
@@ -5,7 +5,7 @@
         {
             "id": "all-supported-packages",
             "name": {
-                "text": "_Add all supported NuGet package reference"
+                "text": "_Add all supported NuGet package reference (Essentials Interfaces is explicit)"
             },
             "isVisible": true,
             "defaultValue": "false"
@@ -53,7 +53,15 @@
         {
             "id": "include-shared-toolkit",
             "name": {
-                "text": "Add and configure VijayAnand.Toolkit.Markup (_Shared) NuGet package reference"
+                "text": "Add and configure VijayAnand.Toolkit.Markup (_Shared Toolkit) NuGet package reference"
+            },
+            "isVisible": true,
+            "defaultValue": "false"
+        },
+        {
+            "id": "central-pkg-mgmt",
+            "name": {
+                "text": "Use _NuGet Central Package Management (CPM)"
             },
             "isVisible": true,
             "defaultValue": "false"

diff --git a/src/FormsTemplatesCLI/FormsClassLib/.template.config/template.json b/src/FormsTemplatesCLI/FormsClassLib/.template.config/template.json
@@ -18,7 +18,8 @@
     "sourceName": "FormsClassLib.1",
     "tags": {
         "language": "C#",
-        "type": "project"
+        "type": "solution",
+        "vs_parametersToHide": "no-solution-file"
     },
     "guids": [
         "104D078F-F441-4A4A-A89B-21C40D7B8C10",
@@ -44,11 +45,18 @@
             "replaces": "LIB_TFM",
             "defaultValue": "netstandard2.0"
         },
+        "central-pkg-mgmt": {
+            "type": "parameter",
+            "datatype": "bool",
+            "defaultValue": "false",
+            "description": "Option to configure NuGet Central Package Management (CPM).",
+            "displayName": "Option to configure _NuGet Central Package Management (CPM)"
+        },
         "all-supported-packages": {
             "type": "parameter",
             "datatype": "bool",
             "defaultValue": "false",
-            "description": "Option to add all supported NuGet package reference.",
+            "description": "Option to add all supported NuGet package reference (Essentials Interfaces is explicit).",
             "displayName": "_Add all supported NuGet package reference"
         },
         "include-toolkit": {
@@ -85,15 +93,15 @@
             "type": "parameter",
             "datatype": "bool",
             "defaultValue": "false",
-            "description": "Option to add VijayAnand.Toolkit.Markup NuGet package reference.",
+            "description": "Option to add VijayAnand.Toolkit.Markup (Shared Toolkit) NuGet package reference.",
             "displayName": "Add VijayAnand.Toolkit.Markup NuGet package reference"
         },
-        "central-pkg-mgmt": {
+        "Preview": {
             "type": "parameter",
             "datatype": "bool",
             "defaultValue": "false",
-            "description": "Option to configure NuGet Central Package Management (CPM).",
-            "displayName": "Option to configure NuGet Central Package Management (CPM)"
+            "description": "Option to add preview version of VijayAnand.Toolkit.Markup NuGet package reference.",
+            "displayName": "Add preview version of VijayAnand.Toolkit.Markup NuGet package reference"
         },
         "no-solution-file": {
             "type": "parameter",
@@ -143,13 +151,13 @@
         {
             "modifiers": [
                 {
-                    "condition": "(no-solution-file || !(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\"))",
+                    "condition": "(no-solution-file)",
                     "exclude": [
                         "FormsClassLib.1.sln"
                     ]
                 },
                 {
-                    "condition": "(!CentralPkgMgmt || !(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\"))",
+                    "condition": "(!CentralPkgMgmt)",
                     "exclude": [
                         "Directory.Packages.props"
                     ]

diff --git a/src/FormsTemplatesCLI/FormsClassLib/Directory.Packages.props b/src/FormsTemplatesCLI/FormsClassLib/Directory.Packages.props
@@ -3,7 +3,7 @@
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
     <ItemGroup>
-        <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2622" />
+        <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2662" />
         <!--#if (AddEssentials)-->
         <PackageVersion Include="Xamarin.Essentials" Version="1.8.1" />
         <!--#endif-->
@@ -20,7 +20,11 @@
         <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
         <!--#endif-->
         <!--#if (AddSharedToolkit)-->
-        <PackageVersion Include="VijayAnand.Toolkit.Markup" Version="3.2.0" />
+        <!--#if (Preview)-->
+        <PackageVersion Include="VijayAnand.Toolkit.Markup" Version="4.0.0-preview.3" />
+        <!--#else-->
+        <PackageVersion Include="VijayAnand.Toolkit.Markup" Version="3.4.0" />
+        <!--#endif-->
         <!--#endif-->
     </ItemGroup>
 </Project>
diff --git a/src/FormsTemplatesCLI/FormsClassLib/FormsClassLib.1.csproj b/src/FormsTemplatesCLI/FormsClassLib/FormsClassLib.1.csproj
@@ -4,10 +4,21 @@
         <TargetFramework>LIB_TFM</TargetFramework>
         <!-- Project Options -->
         <Nullable>enable</Nullable>
+        <!--#if (Preview)-->
+        <LangVersion>preview</LangVersion>
+        <!--#else-->
         <LangVersion>latest</LangVersion>
+        <!--#endif-->
         <ImplicitUsings>enable</ImplicitUsings>
         <RootNamespace>FormsClassLib._1</RootNamespace>
     </PropertyGroup>
+    <!--#if (CentralPkgMgmt)-->
+
+    <ItemGroup>
+        <None Remove="Directory.Packages.props" />
+    </ItemGroup>
+    <!--#endif-->
+
     <ItemGroup>
         <!--#if (CentralPkgMgmt)-->
         <PackageReference Include="Xamarin.Forms" />
@@ -47,8 +58,12 @@
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.*" />
         <!--#endif-->
         <!--#if (AddSharedToolkit)-->
+        <!--#if (Preview)-->
+        <PackageReference Include="VijayAnand.Toolkit.Markup" Version="4.*-*" />
+        <!--#else-->
         <PackageReference Include="VijayAnand.Toolkit.Markup" Version="3.*" />
         <!--#endif-->
         <!--#endif-->
+        <!--#endif-->
     </ItemGroup>
 </Project>
diff --git a/src/FormsTemplatesCLI/release-notes.txt b/src/FormsTemplatesCLI/release-notes.txt
@@ -1,8 +1,12 @@
 Join me on Developer Thoughts (https://egvijayanand.in/), an exclusive blog for articles on Xamarin.Forms, .NET MAUI and Blazor.
 
-What's new in ver. 1.7.0:
+What's new in ver. 1.8.0:
 -------------------------
-1. A revolutionary generic item template, in XAML and C#, for creating items of any type.
+Introduced using the NuGet CPM feature from within Visual Studio IDE.
+
+v1.7.0
+
+1. An innovative generic item template, in XAML and C#, for creating items of any type.
 
 And it is named forms-item and forms-item-cs