From 5b7097330d57f974e6b37632ea50a68ba0e8a5be Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Thu, 4 Sep 2025 14:57:18 +0200 Subject: [PATCH 1/5] Update for Steeltoe 4.0 --- .../CSharp/.template.config/ide.host.json | 6 +++--- .../CSharp/.template.config/template.json | 4 ++-- .../NetCoreTool.Template.WebApi/CSharp/nuget.config | 13 +++++++++++-- 3 files changed, 16 insertions(+), 7 deletions(-) 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 cb69b62..4f23b24 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,9 +24,9 @@ } }, { - "id": "4.0.*-*", + "id": "4.0.*", "name": { - "text": "Steeltoe 4.0 (pre-release)" + "text": "Steeltoe 4.0" } }, { @@ -36,7 +36,7 @@ } } ], - "defaultValue": "4.0.*-*" + "defaultValue": "4.0.*" }, { "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 96d5c0e..8d227ea 100644 --- a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json +++ b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json @@ -115,7 +115,7 @@ "description": "The Steeltoe version to use.", "type": "parameter", "datatype": "string", - "defaultValue": "4.0.*-*", + "defaultValue": "4.0.*", "replaces": "$(SteeltoeVersionInCLI)" }, "IsSteeltoeV3InCLI": { @@ -153,7 +153,7 @@ "choice": "3.2.*" }, { - "choice": "4.0.*-*" + "choice": "4.0.*" }, { "choice": "4.*-main-*" diff --git a/src/Content/NetCoreTool.Template.WebApi/CSharp/nuget.config b/src/Content/NetCoreTool.Template.WebApi/CSharp/nuget.config index fe514da..5a432cb 100644 --- a/src/Content/NetCoreTool.Template.WebApi/CSharp/nuget.config +++ b/src/Content/NetCoreTool.Template.WebApi/CSharp/nuget.config @@ -1,7 +1,16 @@  - - + + + + + + + + + + + From c0d5d648bbc34b20a57578dd5fae71f7859f92c6 Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Thu, 4 Sep 2025 15:54:48 +0200 Subject: [PATCH 2/5] rename feed --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fed05e4..2f300db 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/ci/nuget/v3/index.json -n SteeltoeDev +$ dotnet nuget add source https://pkgs.dev.azure.com/dotnet/Steeltoe/_packaging/ci/nuget/v3/index.json -n Steeltoe-ci $ dotnet new install Steeltoe.NetCoreTool.Templates ``` From 27c9e1ea4feea2a33814584859817b0ad8431cf3 Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Thu, 4 Sep 2025 17:29:26 +0200 Subject: [PATCH 3/5] Delete root nuget.config --- nuget.config | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 nuget.config diff --git a/nuget.config b/nuget.config deleted file mode 100644 index 21cb6ef..0000000 --- a/nuget.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - From 40358294d0018a3a02f87e1a99a950c42b36f841 Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Thu, 4 Sep 2025 17:30:23 +0200 Subject: [PATCH 4/5] Diagnostic package restore --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c4877e..d657c1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v4 - name: Restore packages - run: dotnet restore --verbosity minimal + run: dotnet restore --verbosity diagnostic - name: Calculate package version (for release) if: ${{ github.event_name == 'release' }} From c3ce91dbeb55335f4ae7c3f0d6c6b97351fecc3b Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Thu, 4 Sep 2025 17:32:33 +0200 Subject: [PATCH 5/5] Revert "Diagnostic package restore" This reverts commit 40358294d0018a3a02f87e1a99a950c42b36f841. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d657c1e..9c4877e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v4 - name: Restore packages - run: dotnet restore --verbosity diagnostic + run: dotnet restore --verbosity minimal - name: Calculate package version (for release) if: ${{ github.event_name == 'release' }}