minor string changes, sdk version check (#3004)

* minor string changes, sdk version check * bump up dotnet-scaffold version
dotnet · Oct 9, 2024 · ba8c453 · ba8c453
1 parent 8118055
commit ba8c453
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 24 deletions.
diff --git a/eng/Versions.DotNetScaffold.props b/eng/Versions.DotNetScaffold.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <VersionPrefix>9.0.0</VersionPrefix>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>8</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration>9</PreReleaseVersionIteration>
     <IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
     <IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>
     <!--

diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.CodeModification/README.md b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.CodeModification/README.md
@@ -7,7 +7,7 @@ For example :
 var builder = Host.CreateScaffoldBuilder();
 var newScaffolder = builder.AddScaffolder("scaffolder");
 newScaffolder.WithCategory("Custom")
-    .WithDescription("Project for scaffolding!")
+    .WithDescription("Project for scaffolding.")
     .WithOption(projectOption)
     .WithStep<CodeModificationStep>(config =>
     {

diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/CommandLine/DotnetCommands.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/CommandLine/DotnetCommands.cs
@@ -45,7 +45,7 @@ public static bool AddPackage(string packageName, ILogger logger, string? projec
                     logger.LogInformation($"\n{stdErr}");
                 }
 
-                logger.LogInformation("Failed!");
+                logger.LogInformation("Failed.");
             }
             else
             {

diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/README.md b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Core/README.md
@@ -8,7 +8,7 @@ For example:
 var builder = Host.CreateScaffoldBuilder();
 var newScaffolder = builder.AddScaffolder("scaffolder");
 newScaffolder.WithCategory("Custom")
-    .WithDescription("Project for scaffolding!")
+    .WithDescription("Project for scaffolding.")
     .WithOption(projectOption)
     .WithStep<ScaffoldStep>(config =>
     {

diff --git a/...scaffolding/Microsoft.DotNet.Scaffolding.Internal/CliHelpers/ProcessOutputStreamReader.cs b/...scaffolding/Microsoft.DotNet.Scaffolding.Internal/CliHelpers/ProcessOutputStreamReader.cs
@@ -81,7 +81,7 @@ private void ThrowIfCaptureSet()
     {
         if (_capture != null)
         {
-            throw new InvalidOperationException("Already capturing stream!"); // TODO: Localize this?
+            throw new InvalidOperationException("Already capturing stream."); // TODO: Localize this?
         }
     }
 

diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Services/MsBuildInitializer.cs b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Services/MsBuildInitializer.cs
@@ -38,8 +38,10 @@ private void RegisterMsbuild()
 
             //register newest MSBuild from the newest dotnet sdk installed.
             var sdkPath = Directory.GetDirectories(sdkBasePath)
-                                  .OrderByDescending(d => new DirectoryInfo(d).Name)
-                                  .FirstOrDefault();
+                .Select(d => new DirectoryInfo(d).Name)
+                .Where(name => Version.TryParse(name.Split('-')[0], out _))
+                .OrderByDescending(name => name)
+                .FirstOrDefault();
 
             if (string.IsNullOrEmpty(sdkPath))
             {

diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.TextTemplating/README.md b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.TextTemplating/README.md
@@ -7,7 +7,7 @@ For example :
 var builder = Host.CreateScaffoldBuilder();
 var newScaffolder = builder.AddScaffolder("scaffolder");
 newScaffolder.WithCategory("Custom")
-    .WithDescription("Project for scaffolding!")
+    .WithDescription("Project for scaffolding.")
     .WithOption(projectOption)
     .WithStep<TextTemplatingStep>(config =>
     {

diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspire/Program.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspire/Program.cs
@@ -19,7 +19,7 @@
 
 var caching = builder.AddScaffolder("caching");
 caching.WithCategory("Aspire")
-       .WithDescription("Modified Aspire project to make it caching ready!")
+       .WithDescription("Modified Aspire project to make it caching ready.")
        .WithOption(cachingTypeOption)
        .WithOption(appHostProjectOption)
        .WithOption(projectOption)
@@ -33,7 +33,7 @@
 
 var database = builder.AddScaffolder("database");
 database.WithCategory("Aspire")
-        .WithDescription("Modifies Aspire project to make it database ready!")
+        .WithDescription("Modifies Aspire project to make it database ready.")
         .WithOption(databaseTypeOption)
         .WithOption(appHostProjectOption)
         .WithOption(projectOption)
@@ -49,7 +49,7 @@
 
 var storage = builder.AddScaffolder("storage");
 storage.WithCategory("Aspire")
-       .WithDescription("Modifies Aspire project to make it storage ready!")
+       .WithDescription("Modifies Aspire project to make it storage ready.")
        .WithOption(storageTypeOption)
        .WithOption(appHostProjectOption)
        .WithOption(projectOption)

diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Program.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Program.cs
@@ -26,7 +26,7 @@ public static void Main(string[] args)
             out var openApiOption, out var pageTypeOption, out var controllerNameOption, out var viewsOption, out var overwriteOption);
 
         builder.AddScaffolder("blazor-empty")
-            .WithDisplayName("Razor Component - Empty")
+            .WithDisplayName("Razor Component")
             .WithCategory("Blazor")
             .WithDescription("Add an empty razor component to a given project")
             .WithOption(projectOption)
@@ -70,8 +70,8 @@ public static void Main(string[] args)
                 step.CommandName = "page";
             });
 
-        builder.AddScaffolder("apicontroller-empty")
-            .WithDisplayName("API Controller - Empty")
+        builder.AddScaffolder("apicontroller")
+            .WithDisplayName("API Controller")
             .WithCategory("API")
             .WithDescription("Add an empty API Controller to a given project")
             .WithOptions([projectOption, fileNameOption, actionsOption])
@@ -85,8 +85,8 @@ public static void Main(string[] args)
                 step.CommandName = "apicontroller";
             });
 
-        builder.AddScaffolder("mvccontroller-empty")
-            .WithDisplayName("MVC Controller - Empty")
+        builder.AddScaffolder("mvccontroller")
+            .WithDisplayName("MVC Controller")
             .WithCategory("MVC")
             .WithDescription("Add an empty MVC Controller to a given project")
             .WithOptions([projectOption, fileNameOption, actionsOption])

diff --git a/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/CategoryPickerFlowStep.cs b/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/CategoryPickerFlowStep.cs
@@ -53,7 +53,7 @@ public ValueTask<FlowStepResult> RunAsync(IFlowContext context, CancellationToke
 
             if (string.IsNullOrEmpty(displayCategory))
             {
-                return new ValueTask<FlowStepResult>(FlowStepResult.Failure("Unable to find any component categories!"));
+                return new ValueTask<FlowStepResult>(FlowStepResult.Failure("Unable to find any component categories."));
             }
             else
             {
@@ -81,7 +81,7 @@ public ValueTask<FlowStepResult> ValidateUserInputAsync(IFlowContext context, Ca
             }
             else
             {
-                return new ValueTask<FlowStepResult>(FlowStepResult.Failure("No component (dotnet tool) provided!"));
+                return new ValueTask<FlowStepResult>(FlowStepResult.Failure("No component (dotnet tool) provided."));
             }
 
             if (commandInfo is null)

diff --git a/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/CommandPickerFlowStep.cs b/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/CommandPickerFlowStep.cs
@@ -62,7 +62,7 @@ public ValueTask<FlowStepResult> RunAsync(IFlowContext context, CancellationToke
 
             if (commandInfoKvp is null || !commandInfoKvp.HasValue || commandInfoKvp.Value.Value is null || string.IsNullOrEmpty(commandInfoKvp.Value.Key))
             {
-                return new ValueTask<FlowStepResult>(FlowStepResult.Failure("Unable to find any commands!"));
+                return new ValueTask<FlowStepResult>(FlowStepResult.Failure("Unable to find any commands."));
             }
             else
             {
@@ -104,7 +104,7 @@ public ValueTask<FlowStepResult> ValidateUserInputAsync(IFlowContext context, Ca
             }
             else
             {
-                return new ValueTask<FlowStepResult>(FlowStepResult.Failure("No component (dotnet tool) provided!"));
+                return new ValueTask<FlowStepResult>(FlowStepResult.Failure("No component (dotnet tool) provided."));
             }
 
             if (commandInfo is null)

diff --git a/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/ParameterDiscovery.cs b/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/ParameterDiscovery.cs
@@ -167,7 +167,7 @@ private ValidationResult Validate(IFlowContext context, string promptVal)
 
             if (!string.IsNullOrEmpty(promptVal) && !ParameterHelpers.CheckType(_parameter.Type, promptVal))
             {
-                return ValidationResult.Error("Invalid input, please try again!");
+                return ValidationResult.Error("Invalid input, please try again.");
             }
 
             return ValidationResult.Success();

diff --git a/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/StartupFlowStep.cs b/src/dotnet-scaffolding/dotnet-scaffold/Flow/Steps/StartupFlowStep.cs
@@ -59,7 +59,7 @@ public ValueTask<FlowStepResult> ValidateUserInputAsync(IFlowContext context, Ca
                 new FirstPartyComponentInitializer(_logger, _dotnetToolService).Initialize();
                 statusContext.Status = "Done\n";
                 //parse args passed
-                statusContext.Status = "Parsing args!";
+                statusContext.Status = "Parsing args.";
                 var remainingArgs = context.GetRemainingArgs();
                 if (remainingArgs != null)
                 {

diff --git a/src/dotnet-scaffolding/dotnet-scaffold/Services/FirstPartyComponentInitializer.cs b/src/dotnet-scaffolding/dotnet-scaffold/Services/FirstPartyComponentInitializer.cs
@@ -29,11 +29,11 @@ public void Initialize()
 
         foreach (var tool in toolsToInstall)
         {
-            _logger.LogInformation("Installing {tool}!", tool);
+            _logger.LogInformation("Installing {tool}.", tool);
             var successfullyInstalled = _dotnetToolService.InstallDotNetTool(tool, prerelease: true);
             if (!successfullyInstalled)
             {
-                _logger.LogInformation("Failed to install {tool}!", tool);
+                _logger.LogInformation("Failed to install {tool}.", tool);
             }
         }
     }