From 201e5883566d09d291e1907e4ffdb5b8a1fc0e87 Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
Date: Wed, 28 Jun 2023 12:09:09 +0200
Subject: [PATCH 1/3] Update templatepack.csproj according to authoring
 template

---
 .../templatepack.csproj                       | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/core/tutorials/cli-templates-create-item-template/templatepack.csproj b/core/tutorials/cli-templates-create-item-template/templatepack.csproj
index 1a1efa784f8..f57031bb3a3 100644
--- a/core/tutorials/cli-templates-create-item-template/templatepack.csproj
+++ b/core/tutorials/cli-templates-create-item-template/templatepack.csproj
@@ -1,25 +1,41 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <PackageType>Template</PackageType>
-    <PackageVersion>1.0</PackageVersion>
+    <!-- The package metadata. Fill in the properties marked as TODO below -->
+    <!-- Follow the instructions on https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices -->
     <PackageId>AdatumCorporation.Utility.Templates</PackageId>
+    <PackageVersion>1.0</PackageVersion>
     <Title>AdatumCorporation Templates</Title>
     <Authors>Me</Authors>
     <Description>Templates to use when creating an application for Adatum Corporation.</Description>
     <PackageTags>dotnet-new;templates;contoso</PackageTags>
-
-    <TargetFramework>netstandard2.0</TargetFramework>
-
+    <PackageProjectUrl>https://github.com/dotnet/samples/tree/main/core/tutorials/cli-templates-create-item-template</PackageProjectUrl>
+    
+    <!-- Keep package type as 'Template' to show the package as a template package on nuget.org and make your template available in dotnet new search.-->
+    <PackageType>Template</PackageType>
+    <TargetFramework>net7.0</TargetFramework>
     <IncludeContentInPack>true</IncludeContentInPack>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <ContentTargetFolders>content</ContentTargetFolders>
     <NoWarn>$(NoWarn);NU5128</NoWarn>
+    <NoDefaultExcludes>true</NoDefaultExcludes>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <LocalizeTemplates>false</LocalizeTemplates>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.TemplateEngine.Tasks" Version="*" PrivateAssets="all" IsImplicitlyDefined="true"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="content\**\*" Exclude="content\**\bin\**;content\**\obj\**" />
+  </ItemGroup>
+
   <ItemGroup>
-    <Content Include="templates\**\*" Exclude="templates\**\bin\**;templates\**\obj\**" />
-    <Compile Remove="**\*" />
+    <None Include="README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 
 </Project>

From e9f1a6e11d19d7f18de1279f229ab8902c8ead50 Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
Date: Wed, 28 Jun 2023 12:11:59 +0200
Subject: [PATCH 2/3] Create README.md

---
 core/tutorials/cli-templates-create-item-template/README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 core/tutorials/cli-templates-create-item-template/README.md

diff --git a/core/tutorials/cli-templates-create-item-template/README.md b/core/tutorials/cli-templates-create-item-template/README.md
new file mode 100644
index 00000000000..6a3db8366d4
--- /dev/null
+++ b/core/tutorials/cli-templates-create-item-template/README.md
@@ -0,0 +1 @@
+Template packaging sample.

From ca6a13ca3ae7e3eee3f970f545450f5f13868455 Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Wed, 28 Jun 2023 15:46:35 +0200
Subject: [PATCH 3/3] fix compilation errors

---
 .../templates/consoleasync/Program.cs                 | 11 ++++++++++-
 .../templates/extensions/CommonExtensions.cs          |  4 +---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/tutorials/cli-templates-create-item-template/templates/consoleasync/Program.cs b/core/tutorials/cli-templates-create-item-template/templates/consoleasync/Program.cs
index 49e2878498d..89683398a6c 100644
--- a/core/tutorials/cli-templates-create-item-template/templates/consoleasync/Program.cs
+++ b/core/tutorials/cli-templates-create-item-template/templates/consoleasync/Program.cs
@@ -1,3 +1,12 @@
 // See https://aka.ms/new-console-template for more information
 
-await Console.Out.WriteAsync("Hello World with C#");
+using System;
+using System.Threading.Tasks;
+
+class Program
+{
+    static async Task Main()
+    {
+        await Console.Out.WriteAsync("Hello World with C#");
+    }
+}
diff --git a/core/tutorials/cli-templates-create-item-template/templates/extensions/CommonExtensions.cs b/core/tutorials/cli-templates-create-item-template/templates/extensions/CommonExtensions.cs
index 4839118580a..be21adbfc7b 100644
--- a/core/tutorials/cli-templates-create-item-template/templates/extensions/CommonExtensions.cs
+++ b/core/tutorials/cli-templates-create-item-template/templates/extensions/CommonExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace System
+namespace System
 {
     public static class StringExtensions
     {