aspire icon indicating copy to clipboard operation
aspire copied to clipboard

Update template ids, names etc

Open radical opened this issue 1 year ago • 1 comments

  • Change shortName to ["foo", "foo-9"]
  • Rename template nuget package ids Aspire.ProjectTemplates.9.0.net9 -> Aspire.ProjectTemplates Aspire.ProjectTemplates.9.0.net8 -> Aspire.ProjectTemplates.net8
  • Update Name, and description to include the version
  • Track naming changes in the tests
Microsoft Reviewers: Open in CodeFlow

radical avatar Oct 04 '24 20:10 radical

I could not figure out what to change for the description in these two:

diff --git a/src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/localize/templatestrings.tr.json b/src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/localize/templatestring>
index 737c96ed81..1791ad243e 100644
--- a/src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/localize/templatestrings.tr.json
+++ b/src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/localize/templatestrings.tr.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": ".NET Aspire Starter Uygulaması",
+  "name": ".NET Aspire 9 Starter Uygulaması",
   "description": "Blazor web ön ucu ve web API'si arka uç hizmetiyle ve önbelleğe alırken isteğe bağlı olarak Redis'i kullanarak bir .NET Çalışanı uygulaması oluşturmak için proje şablonu.",
   "symbols/Framework/description": "Projenin hedef çerçevesi.",
   "symbols/Framework/choices/net9.0/description": "Target net9.0",

.. and ..

diff --git a/src/Aspire.ProjectTemplates/templates/aspire-apphost/.template.config/localize/templatestrings.ko.json b/src/Aspire.ProjectTemplates/templates/aspire-apphost/.template.config/localize/templatestring>
index dd835619c6..ee76f5d588 100644
--- a/src/Aspire.ProjectTemplates/templates/aspire-apphost/.template.config/localize/templatestrings.ko.json
+++ b/src/Aspire.ProjectTemplates/templates/aspire-apphost/.template.config/localize/templatestrings.ko.json
@@ -1,6 +1,6 @@
 {
   "author": "Microsoft",
-  "name": ".NET Aspire 앱 호스트",
+  "name": ".NET Aspire 9 앱 호스트",
   "description": ".NET 사용자 앱 호스트(오케스트레이터) 프로젝트를 만들기 위한 프로젝트 템플릿입니다.",
   "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
   "symbols/Framework/choices/net9.0/description": "Target net9.0",

radical avatar Oct 04 '24 21:10 radical

ah, I see how I missed them. I'll fix that. Also, some have names like .NET Aspire App-Host, which I changed to .NET Aspire 9-App-Host.

And there is:

diff --git a/src/Aspire.ProjectTemplates.net8/templates/aspire-apphost/.template.config/localize/templatestrings.pl.json b/src/Aspire.ProjectTemplates.net8/templates/aspire-apphost/.template.config/localize/templatestrings.pl.json
index bad2df717..10e245051 100644
--- a/src/Aspire.ProjectTemplates.net8/templates/aspire-apphost/.template.config/localize/templatestrings.pl.json
+++ b/src/Aspire.ProjectTemplates.net8/templates/aspire-apphost/.template.config/localize/templatestrings.pl.json
@@ -1,7 +1,7 @@
-{
+{
   "author": "Microsoft",
-  "name": "Host aplikacji Aspire platformy .NET",
-  "description": "Szablon projektu służący do tworzenia projektu hosta aplikacji Aspire (orkiestrator) platformy .NET.",
+  "name": "Host aplikacji Aspire 9 platformy .NET",
+  "description": "Szablon projektu służący do tworzenia projektu hosta aplikacji Aspire 9 (orkiestrator) platformy .NET.",
   "symbols/Framework/description": "Platforma docelowa dla tego projektu.",
   "symbols/Framework/choices/net8.0/description": "Docelowa platforma net8.0",
   "symbols/appHostHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP w pliku launchSettings.json projektu AppHost.",
@@ -15,4 +15,4 @@
   "postActions/set-startup-project/description": "Ustawia projekt startowy w rozwiązaniu",
   "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.",
   "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\""

For some others I don't see "aspire" in the description or name, like:

 $ cat Aspire.ProjectTemplates/templates/aspire-xunit/.template.config/localize/templatestrings.ko.json
{
  "author": "Microsoft",
  "name": ".NET 검증 테스트 프로젝트(xUnit)",
  "description": ".NET 표시 AppHost 프로젝트의 xUnit.net 통합 테스트를 포함하는 프로젝트입니다.",
...

radical avatar Oct 05 '24 01:10 radical

/backport to release/9.0-rc1

radical avatar Oct 07 '24 23:10 radical

Started backporting to release/9.0-rc1: https://github.com/dotnet/aspire/actions/runs/11225652720

github-actions[bot] avatar Oct 07 '24 23:10 github-actions[bot]

@radical backporting to release/9.0-rc1 failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Change shortName to ["foo", "foo-9"]
Applying: Rename template nuget package ids
Using index info to reconstruct a base tree...
M	Aspire.sln
Falling back to patching base and 3-way merge...
Auto-merging Aspire.sln
CONFLICT (content): Merge conflict in Aspire.sln
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 Rename template nuget package ids
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions[bot] avatar Oct 07 '24 23:10 github-actions[bot]

@radical an error occurred while backporting to release/9.0-rc1, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

github-actions[bot] avatar Oct 07 '24 23:10 github-actions[bot]