diff --git a/README.md b/README.md index 265c9bc..7467008 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ $ dotnet new install Steeltoe.NetCoreTool.Templates ### From .NET Foundation (staging) ``` -$ dotnet nuget add source https://pkgs.dev.azure.com/dotnet/Steeltoe/_packaging/dev/nuget/v3/index.json -n SteeltoeDev +$ dotnet nuget add source https://pkgs.dev.azure.com/dotnet/Steeltoe/_packaging/ci/nuget/v3/index.json -n SteeltoeDev $ dotnet new install Steeltoe.NetCoreTool.Templates ``` diff --git a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json index a79554d..274e902 100644 --- a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json +++ b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json @@ -24,13 +24,13 @@ } }, { - "id": "4.0.*-*", + "id": "4.0.*-main-*", "name": { "text": "Steeltoe 4.0" } } ], - "defaultValue": "4.0.*-*" + "defaultValue": "4.0.*-main-*" }, { "id": "DescriptionOption", diff --git a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json index e78a485..9bc2656 100644 --- a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json +++ b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json @@ -109,7 +109,7 @@ "description": "The Steeltoe version to use.", "type": "parameter", "datatype": "string", - "defaultValue": "4.0.*-*", + "defaultValue": "4.0.*-main-*", "replaces": "$(SteeltoeVersionInCLI)" }, "IsSteeltoeV3InCLI": { @@ -138,7 +138,7 @@ "choice": "3.2.*" }, { - "choice": "4.0.*-*" + "choice": "4.0.*-main-*" } ], "replaces": "$(ChosenSteeltoeVersionInIDE)" diff --git a/src/Content/NetCoreTool.Template.WebApi/CSharp/nuget.config b/src/Content/NetCoreTool.Template.WebApi/CSharp/nuget.config index 7a8af6c..fe514da 100644 --- a/src/Content/NetCoreTool.Template.WebApi/CSharp/nuget.config +++ b/src/Content/NetCoreTool.Template.WebApi/CSharp/nuget.config @@ -1,7 +1,7 @@  - + diff --git a/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs b/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs index 5579950..36de9bb 100644 --- a/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs +++ b/test/NetCoreTool.Template.WebApi.Test/Models/TemplateOptions.cs @@ -14,8 +14,8 @@ public IEnumerator GetEnumerator() new object[] { "3.2.8", "net6.0", "C#", }, new object[] { "3.2.8", "net8.0", "C#", }, new object[] { "3.2.8", "net9.0", "C#", }, - new object[] { "4.0.*-*", "net8.0", "C#", }, - new object[] { "4.0.*-*", "net9.0", "C#", } + new object[] { "4.0.*-main-*", "net8.0", "C#", }, + new object[] { "4.0.*-main-*", "net9.0", "C#", } }.GetEnumerator(); } diff --git a/test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs b/test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs index c5adfc0..2a33a4f 100644 --- a/test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs +++ b/test/NetCoreTool.Template.WebApi.Test/SteeltoeParameterTest.cs @@ -7,7 +7,7 @@ public class SteeltoeParameterTest : ParameterTest public SteeltoeParameterTest(ITestOutputHelper logger) : base("steeltoe", "The Steeltoe version to use.", logger) { Values.Add("3.2.*"); - Values.Add("4.0.*-*"); + Values.Add("4.0.*-main-*"); } } }