Update version spec, replace deprecated command-line arguments (#13)

bart-vmware · web-flow · commit d3cfffd6e0c3 · 2025-07-21T15:41:00.000+02:00
diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,7 @@ RUN dotnet build src/NetCoreToolService --configuration Release --no-restore
 RUN dotnet publish src/NetCoreToolService --output /srv --no-build
 
 FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine
-ARG templates_version=1.4.1
+ARG templates_version=1.*-*
 ARG TEMPLATE_CHECKOUT_TARGET
 WORKDIR /srv
 COPY --from=build /srv .
diff --git a/install-template.sh b/install-template.sh
@@ -4,7 +4,7 @@ dotnet nuget add source https://pkgs.dev.azure.com/dotnet/Steeltoe/_packaging/ci
 
 if [[ -z "$TEMPLATE_CHECKOUT_TARGET" ]] ;then
     dotnet new install Steeltoe.NetCoreTool.Templates::${templates_version} &&\
-      dotnet new --list | grep steeltoe-webapi
+      dotnet new list | grep steeltoe-webapi
 else
     cd /usr/local/src
     git clone https://github.com/SteeltoeOSS/NetCoreToolTemplates
diff --git a/src/NetCoreToolService/Controllers/NewController.cs b/src/NetCoreToolService/Controllers/NewController.cs
@@ -67,9 +67,9 @@ public async Task<ActionResult> GetTemplates()
         [HttpPut("nuget/{nuGetId}")]
         public async Task<ActionResult> InstallTemplates(string nuGetId)
         {
-            await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new --uninstall {nuGetId}");
+            await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new uninstall {nuGetId}");
             var oldTemplates = await GetTemplateDictionary();
-            var installCommand = await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new --install {nuGetId}");
+            var installCommand = await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new install {nuGetId}");
             const string notFoundError = "error NU1101: ";
             if (installCommand.Output.Contains(notFoundError))
             {
@@ -98,7 +98,7 @@ public async Task<ActionResult> UninstallTemplates(string nuGetId)
         {
             var oldTemplates = await GetTemplateDictionary();
             var uninstallCommand =
-                await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new --uninstall {nuGetId}");
+                await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new uninstall {nuGetId}");
             if (uninstallCommand.Output.Contains($"Could not find something to uninstall"))
             {
                 return NotFound($"No templates with NuGet ID '{nuGetId}' installed.");
@@ -255,7 +255,7 @@ public async Task<ActionResult> GetTemplateProject(
 
         private async Task<TemplateDictionary> GetTemplateDictionary()
         {
-            var listCommand = await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new --list");
+            var listCommand = await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new list");
 
             var lines = listCommand.Output.Split('\n').ToList()
                 .FindAll(line => !string.IsNullOrWhiteSpace(line));
diff --git a/test/NetCoreToolService.Test/Controllers/NewControllerTest.cs b/test/NetCoreToolService.Test/Controllers/NewControllerTest.cs
@@ -24,7 +24,7 @@ public async Task GetTemplates_Should_Return_AllTemplates()
         {
             // Arrange
             var executor = new Mock<ICommandExecutor>();
-            executor.Setup(expression: c => c.ExecuteAsync($"{NetCoreTool.Command} new --list", null, -1))
+            executor.Setup(expression: c => c.ExecuteAsync($"{NetCoreTool.Command} new list", null, -1))
                 .ReturnsAsync(new CommandResult
                     {
                         ExitCode = 0,
@@ -59,7 +59,7 @@ public async Task InstallTemplates_Should_Return_InstalledTemplates()
         {
             // Arrange
             var executor = new Mock<ICommandExecutor>();
-            executor.SetupSequence(c => c.ExecuteAsync($"{NetCoreTool.Command} new --list", null, -1))
+            executor.SetupSequence(c => c.ExecuteAsync($"{NetCoreTool.Command} new list", null, -1))
                 .ReturnsAsync(new CommandResult
                     {
                         ExitCode = 0,
@@ -82,7 +82,7 @@ Other New Template   ont       bigtalk    otherstuff
 ",
                     }
                 );
-            executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new --install My.Templates", null, -1))
+            executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new install My.Templates", null, -1))
                 .ReturnsAsync(new CommandResult
                     {
                         ExitCode = 0,
@@ -111,7 +111,7 @@ public async Task UninstallTemplates_Should_Return_UninstalledTemplates()
         {
             // Arrange
             var executor = new Mock<ICommandExecutor>();
-            executor.SetupSequence(c => c.ExecuteAsync($"{NetCoreTool.Command} new --list", null, -1))
+            executor.SetupSequence(c => c.ExecuteAsync($"{NetCoreTool.Command} new list", null, -1))
                 .ReturnsAsync(new CommandResult
                     {
                         ExitCode = 0,
@@ -134,7 +134,7 @@ My Other Template    myot      otherlang  othertags
 ",
                     }
                 );
-            executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new --uninstall My.Templates", null, -1))
+            executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new uninstall My.Templates", null, -1))
                 .ReturnsAsync(new CommandResult
                     {
                         ExitCode = 0,
@@ -296,7 +296,7 @@ public async Task InstallTemplates_UnknownNuGet_Should_Return_BadRequest()
         {
             // Arrange
             var executor = new Mock<ICommandExecutor>();
-            executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new --list", null, -1))
+            executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new list", null, -1))
                 .ReturnsAsync(new CommandResult
                     {
                         ExitCode = 0,
@@ -308,7 +308,7 @@ My Other Template    myot      otherlang  othertags
                     }
                 );
             executor.Setup(c =>
-                    c.ExecuteAsync($"{NetCoreTool.Command} new --install No.Such.Template", null, -1))
+                    c.ExecuteAsync($"{NetCoreTool.Command} new install No.Such.Template", null, -1))
                 .ReturnsAsync(new CommandResult
                 {
                     ExitCode = 2,
@@ -335,7 +335,7 @@ public async Task UninstallTemplates_UnknownNuGet_Should_Return_NotFound()
         {
             // Arrange
             var executor = new Mock<ICommandExecutor>();
-            executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new --list", null, -1))
+            executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new list", null, -1))
                 .ReturnsAsync(new CommandResult
                     {
                         ExitCode = 0,
@@ -344,7 +344,7 @@ public async Task UninstallTemplates_UnknownNuGet_Should_Return_NotFound()
 ",
                     }
                 );
-            executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new --uninstall My.Templates", null, -1))
+            executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new uninstall My.Templates", null, -1))
                 .ReturnsAsync(new CommandResult
                     {
                         ExitCode = 0,

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,9 @@ public async Task<ActionResult> GetTemplates()`
`67`	`67`	`[HttpPut("nuget/{nuGetId}")]`
`68`	`68`	`public async Task<ActionResult> InstallTemplates(string nuGetId)`
`69`	`69`	`{`
`70`		`- await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new --uninstall {nuGetId}");`
	`70`	`+ await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new uninstall {nuGetId}");`
`71`	`71`	`var oldTemplates = await GetTemplateDictionary();`
`72`		`- var installCommand = await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new --install {nuGetId}");`
	`72`	`+ var installCommand = await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new install {nuGetId}");`
`73`	`73`	`const string notFoundError = "error NU1101: ";`
`74`	`74`	`if (installCommand.Output.Contains(notFoundError))`
`75`	`75`	`{`
`@@ -98,7 +98,7 @@ public async Task<ActionResult> UninstallTemplates(string nuGetId)`
`98`	`98`	`{`
`99`	`99`	`var oldTemplates = await GetTemplateDictionary();`
`100`	`100`	`var uninstallCommand =`
`101`		`- await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new --uninstall {nuGetId}");`
	`101`	`+ await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new uninstall {nuGetId}");`
`102`	`102`	`if (uninstallCommand.Output.Contains($"Could not find something to uninstall"))`
`103`	`103`	`{`
`104`	`104`	`return NotFound($"No templates with NuGet ID '{nuGetId}' installed.");`
`@@ -255,7 +255,7 @@ public async Task<ActionResult> GetTemplateProject(`
`255`	`255`
`256`	`256`	`private async Task<TemplateDictionary> GetTemplateDictionary()`
`257`	`257`	`{`
`258`		`- var listCommand = await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new --list");`
	`258`	`+ var listCommand = await _commandExecutor.ExecuteAsync($"{NetCoreTool.Command} new list");`
`259`	`259`
`260`	`260`	`var lines = listCommand.Output.Split('\n').ToList()`
`261`	`261`	`.FindAll(line => !string.IsNullOrWhiteSpace(line));`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public async Task GetTemplates_Should_Return_AllTemplates()`
`24`	`24`	`{`
`25`	`25`	`// Arrange`
`26`	`26`	`var executor = new Mock<ICommandExecutor>();`
`27`		`- executor.Setup(expression: c => c.ExecuteAsync($"{NetCoreTool.Command} new --list", null, -1))`
	`27`	`+ executor.Setup(expression: c => c.ExecuteAsync($"{NetCoreTool.Command} new list", null, -1))`
`28`	`28`	`.ReturnsAsync(new CommandResult`
`29`	`29`	`{`
`30`	`30`	`ExitCode = 0,`
`@@ -59,7 +59,7 @@ public async Task InstallTemplates_Should_Return_InstalledTemplates()`
`59`	`59`	`{`
`60`	`60`	`// Arrange`
`61`	`61`	`var executor = new Mock<ICommandExecutor>();`
`62`		`- executor.SetupSequence(c => c.ExecuteAsync($"{NetCoreTool.Command} new --list", null, -1))`
	`62`	`+ executor.SetupSequence(c => c.ExecuteAsync($"{NetCoreTool.Command} new list", null, -1))`
`63`	`63`	`.ReturnsAsync(new CommandResult`
`64`	`64`	`{`
`65`	`65`	`ExitCode = 0,`
`@@ -82,7 +82,7 @@ Other New Template ont bigtalk otherstuff`
`82`	`82`	`",`
`83`	`83`	`}`
`84`	`84`	`);`
`85`		`- executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new --install My.Templates", null, -1))`
	`85`	`+ executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new install My.Templates", null, -1))`
`86`	`86`	`.ReturnsAsync(new CommandResult`
`87`	`87`	`{`
`88`	`88`	`ExitCode = 0,`
`@@ -111,7 +111,7 @@ public async Task UninstallTemplates_Should_Return_UninstalledTemplates()`
`111`	`111`	`{`
`112`	`112`	`// Arrange`
`113`	`113`	`var executor = new Mock<ICommandExecutor>();`
`114`		`- executor.SetupSequence(c => c.ExecuteAsync($"{NetCoreTool.Command} new --list", null, -1))`
	`114`	`+ executor.SetupSequence(c => c.ExecuteAsync($"{NetCoreTool.Command} new list", null, -1))`
`115`	`115`	`.ReturnsAsync(new CommandResult`
`116`	`116`	`{`
`117`	`117`	`ExitCode = 0,`
`@@ -134,7 +134,7 @@ My Other Template myot otherlang othertags`
`134`	`134`	`",`
`135`	`135`	`}`
`136`	`136`	`);`
`137`		`- executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new --uninstall My.Templates", null, -1))`
	`137`	`+ executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new uninstall My.Templates", null, -1))`
`138`	`138`	`.ReturnsAsync(new CommandResult`
`139`	`139`	`{`
`140`	`140`	`ExitCode = 0,`
`@@ -296,7 +296,7 @@ public async Task InstallTemplates_UnknownNuGet_Should_Return_BadRequest()`
`296`	`296`	`{`
`297`	`297`	`// Arrange`
`298`	`298`	`var executor = new Mock<ICommandExecutor>();`
`299`		`- executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new --list", null, -1))`
	`299`	`+ executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new list", null, -1))`
`300`	`300`	`.ReturnsAsync(new CommandResult`
`301`	`301`	`{`
`302`	`302`	`ExitCode = 0,`
`@@ -308,7 +308,7 @@ My Other Template myot otherlang othertags`
`308`	`308`	`}`
`309`	`309`	`);`
`310`	`310`	`executor.Setup(c =>`
`311`		`- c.ExecuteAsync($"{NetCoreTool.Command} new --install No.Such.Template", null, -1))`
	`311`	`+ c.ExecuteAsync($"{NetCoreTool.Command} new install No.Such.Template", null, -1))`
`312`	`312`	`.ReturnsAsync(new CommandResult`
`313`	`313`	`{`
`314`	`314`	`ExitCode = 2,`
`@@ -335,7 +335,7 @@ public async Task UninstallTemplates_UnknownNuGet_Should_Return_NotFound()`
`335`	`335`	`{`
`336`	`336`	`// Arrange`
`337`	`337`	`var executor = new Mock<ICommandExecutor>();`
`338`		`- executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new --list", null, -1))`
	`338`	`+ executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new list", null, -1))`
`339`	`339`	`.ReturnsAsync(new CommandResult`
`340`	`340`	`{`
`341`	`341`	`ExitCode = 0,`
`@@ -344,7 +344,7 @@ public async Task UninstallTemplates_UnknownNuGet_Should_Return_NotFound()`
`344`	`344`	`",`
`345`	`345`	`}`
`346`	`346`	`);`
`347`		`- executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new --uninstall My.Templates", null, -1))`
	`347`	`+ executor.Setup(c => c.ExecuteAsync($"{NetCoreTool.Command} new uninstall My.Templates", null, -1))`
`348`	`348`	`.ReturnsAsync(new CommandResult`
`349`	`349`	`{`
`350`	`350`	`ExitCode = 0,`