Merge pull request #6216 from dotnet/main

dotnet · Oct 5, 2023 · 3a7dee1 · 3a7dee1
2 parents 62e928a + 687a228
commit 3a7dee1
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 53 deletions.
diff --git a/core/tutorials/cli-templates-create-item-template/AdatumCorporation.Utility.Templates.csproj b/core/tutorials/cli-templates-create-item-template/AdatumCorporation.Utility.Templates.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <!-- 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>
+    <PackageProjectUrl>https://www.microsoft.com</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>net8.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\**" />
+    <Compile Remove="**\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="" />
+  </ItemGroup>
+
+</Project>
diff --git a/core/tutorials/cli-templates-create-item-template/README.md b/core/tutorials/cli-templates-create-item-template/README.md
@@ -0,0 +1,2 @@
+<!-- Provide an overview of what your template package does and how to get started.
+Consider previewing the README before uploading (https://learn.microsoft.com/en-us/nuget/nuget-org/package-readme-on-nuget-org#preview-your-readme). -->
diff --git a/...nsoleasync/.template.config/template.json → ...nsoleasync/.template.config/template.json b/...nsoleasync/.template.config/template.json → ...nsoleasync/.template.config/template.json
@@ -5,8 +5,9 @@
   "identity": "ExampleTemplate.AsyncProject",
   "name": "Example templates: async project",
   "shortName": "consoleasync",
+  "sourceName": "consoleasync",
   "tags": {
     "language": "C#",
     "type": "project"
   }
-}
+}
diff --git a/...emplate/templates/consoleasync/Program.cs → ...-template/content/consoleasync/Program.cs b/...emplate/templates/consoleasync/Program.cs → ...-template/content/consoleasync/Program.cs
diff --git a/...emplates/consoleasync/consoleasync.csproj → .../content/consoleasync/consoleasync.csproj b/...emplates/consoleasync/consoleasync.csproj → .../content/consoleasync/consoleasync.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/...extensions/.template.config/template.json → ...extensions/.template.config/template.json b/...extensions/.template.config/template.json → ...extensions/.template.config/template.json
@@ -8,5 +8,15 @@
   "tags": {
     "language": "C#",
     "type": "item"
+  },
+  "symbols": {
+    "ClassName":{
+      "type": "parameter",
+      "description": "The name of the code file and class.",
+      "datatype": "text",
+      "replaces": "StringExtensions",
+      "fileRename": "StringExtensions",
+      "defaultValue": "StringExtensions"
+    }
   }
-}
+}
diff --git a/core/tutorials/cli-templates-create-item-template/content/extensions/StringExtensions.cs b/core/tutorials/cli-templates-create-item-template/content/extensions/StringExtensions.cs
@@ -0,0 +1,11 @@
+namespace System;
+
+public static class StringExtensions
+{
+    public static string Reverse(this string value)
+    {
+        char[] tempArray = value.ToCharArray();
+        Array.Reverse(tempArray);
+        return new string(tempArray);
+    }
+}
diff --git a/core/tutorials/cli-templates-create-item-template/templatepack.csproj b/core/tutorials/cli-templates-create-item-template/templatepack.csproj
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
diff --git a/core/workers/windows-service/WindowsBackgroundService.cs b/core/workers/windows-service/WindowsBackgroundService.cs
@@ -22,7 +22,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                 await Task.Delay(TimeSpan.FromMinutes(1), stoppingToken);
             }
         }
-        catch (TaskCanceledException)
+        catch (OperationCanceledException)
         {
             // When the stopping token is canceled, for example, a call made from services.msc,
             // we shouldn't exit with a non-zero exit code. In other words, this is expected...

diff --git a/csharp/parallel/ParallelExtensionsExtras/Extensions/TaskExtrasExtensions.cs b/csharp/parallel/ParallelExtensionsExtras/Extensions/TaskExtrasExtensions.cs
@@ -52,7 +52,7 @@ public static Task<TNewResult> ContinueWith<TResult, TNewResult>(
 
         #region ToAsync(AsyncCallback, object)
         /// <summary>
-        /// Creates a Task that represents the completion of another Task, and 
+        /// Creates a Task that represents the completion of another Task, and
         /// that schedules an AsyncCallback to run upon completion.
         /// </summary>
         /// <param name="task">The antecedent Task.</param>
@@ -73,7 +73,7 @@ public static Task ToAsync(this Task task, AsyncCallback callback, object state)
         }
 
         /// <summary>
-        /// Creates a Task that represents the completion of another Task, and 
+        /// Creates a Task that represents the completion of another Task, and
         /// that schedules an AsyncCallback to run upon completion.
         /// </summary>
         /// <param name="task">The antecedent Task.</param>
@@ -140,7 +140,7 @@ public static void PropagateExceptions(this Task task)
         }
 
         /// <summary>Propagates any exceptions that occurred on the specified tasks.</summary>
-        /// <param name="task">The Tassk whose exceptions are to be propagated.</param>
+        /// <param name="task">The Task whose exceptions are to be propagated.</param>
         public static void PropagateExceptions(this Task[] tasks)
         {
             if (tasks == null) throw new ArgumentNullException(nameof(tasks));
@@ -169,13 +169,13 @@ private class TaskObservable<TResult> : IObservable<TResult>
 
             public IDisposable Subscribe(IObserver<TResult> observer)
             {
-                // Validate arguments
+                // Validate arguments.
                 if (observer == null) throw new ArgumentNullException("observer");
 
-                // Support cancelling the continuation if the observer is unsubscribed
+                // Support cancelling the continuation if the observer is unsubscribed.
                 var cts = new CancellationTokenSource();
 
-                // Create a continuation to pass data along to the observer
+                // Create a continuation to pass data along to the observer.
                 _task.ContinueWith(t =>
                 {
                     switch (t.Status)
@@ -190,7 +190,7 @@ public IDisposable Subscribe(IObserver<TResult> observer)
                             break;
 
                         case TaskStatus.Canceled:
-                            observer.OnError(new TaskCanceledException(t));
+                            observer.OnError(new OperationCanceledException("The operation was canceled."));
                             break;
                     }
                 }, cts.Token);
@@ -200,7 +200,7 @@ public IDisposable Subscribe(IObserver<TResult> observer)
             }
         }
 
-        /// <summary>Translate a call to IDisposable.Dispose to a CancellationTokenSource.Cancel.</summary>
+        /// <summary>Translates a call to IDisposable.Dispose to a CancellationTokenSource.Cancel.</summary>
         private class CancelOnDispose : IDisposable
         {
             internal CancellationTokenSource _source;

diff --git a/csharp/tutorials/AsyncStreams/finished/IssuePRreport/IssuePRreport/IssuePRreport.csproj b/csharp/tutorials/AsyncStreams/finished/IssuePRreport/IssuePRreport/IssuePRreport.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Octokit" Version="8.0.0" />
+    <PackageReference Include="Octokit" Version="8.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/tutorials/AsyncStreams/start/IssuePRreport/IssuePRreport/IssuePRreport.csproj b/csharp/tutorials/AsyncStreams/start/IssuePRreport/IssuePRreport/IssuePRreport.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Octokit" Version="8.0.0" />
+    <PackageReference Include="Octokit" Version="8.0.1" />
   </ItemGroup>
 
 </Project>