[release/9.0-rc1] Template changes to consolidate to single package (#…

…6255) * WIP: Move net-8 templates into one package * Add donwlevel templates * Add workload constraint to downlevel templates * Remove Aspire.ProjectTemplates.net8 test references
dotnet · Oct 11, 2024 · 2c1822c · 2c1822c
1 parent ac669e0
commit 2c1822c
Show file tree

Hide file tree

Showing 378 changed files with 4,688 additions and 240 deletions.
diff --git a/Aspire.sln b/Aspire.sln
@@ -635,8 +635,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureContainerApps.ApiServi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.ProjectTemplates", "src\Aspire.ProjectTemplates\Aspire.ProjectTemplates.csproj", "{D07A8344-C61A-478A-92F0-E9B2DA00D647}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.ProjectTemplates.net8", "src\Aspire.ProjectTemplates.net8\Aspire.ProjectTemplates.net8.csproj", "{C75E1CE5-58E6-4D21-9422-7C9E17D71D67}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaitFor.Frontend", "playground\waitfor\WaitFor.Frontend\WaitFor.Frontend.csproj", "{C88BBF0B-7566-48BD-A2BC-05374B1A2B22}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HealthChecks", "HealthChecks", "{B7345F72-712F-436C-AE18-CAF7CDD4A990}"
@@ -1677,10 +1675,6 @@ Global
 		{D07A8344-C61A-478A-92F0-E9B2DA00D647}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D07A8344-C61A-478A-92F0-E9B2DA00D647}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D07A8344-C61A-478A-92F0-E9B2DA00D647}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C75E1CE5-58E6-4D21-9422-7C9E17D71D67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C75E1CE5-58E6-4D21-9422-7C9E17D71D67}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C75E1CE5-58E6-4D21-9422-7C9E17D71D67}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C75E1CE5-58E6-4D21-9422-7C9E17D71D67}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C88BBF0B-7566-48BD-A2BC-05374B1A2B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C88BBF0B-7566-48BD-A2BC-05374B1A2B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C88BBF0B-7566-48BD-A2BC-05374B1A2B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1994,7 +1988,6 @@ Global
 		{96A5B854-2C72-49C8-A91B-2643B814DB2A} = {D47C77F3-49F4-4741-9786-6F68FC50587E}
 		{683D8264-2755-4455-A6D4-14F7A6AC7B54} = {D47C77F3-49F4-4741-9786-6F68FC50587E}
 		{D07A8344-C61A-478A-92F0-E9B2DA00D647} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
-		{C75E1CE5-58E6-4D21-9422-7C9E17D71D67} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
 		{C88BBF0B-7566-48BD-A2BC-05374B1A2B22} = {3FF3F00C-95C0-46FC-B2BE-A3920C71E393}
 		{B7345F72-712F-436C-AE18-CAF7CDD4A990} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
 		{042DD8C6-A26C-4B06-80A1-FE7F8659C5BC} = {B7345F72-712F-436C-AE18-CAF7CDD4A990}

diff --git a/eng/Build.props b/eng/Build.props
@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true' and '$(DotNetBuild)' != 'true'">
-    <ProjectToBuild Include="$(RepoRoot)src\**\*.csproj" Exclude="$(RepoRoot)src\Aspire.ProjectTemplates.net8\templates\**\*.csproj;$(RepoRoot)src\Aspire.ProjectTemplates\templates\**\*.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)src\**\*.csproj" Exclude="$(RepoRoot)src\Aspire.ProjectTemplates\templates\**\*.csproj" />
     <ProjectToBuild Include="$(RepoRoot)eng\dcppack\**\*.csproj" />
     <ProjectToBuild Include="$(RepoRoot)eng\dashboardpack\**\*.csproj" />
     <ProjectToBuild Include="$(RepoRoot)playground\**\*.csproj" />

diff --git a/src/Aspire.ProjectTemplates.net8/Aspire.ProjectTemplates.net8.csproj b/src/Aspire.ProjectTemplates.net8/Aspire.ProjectTemplates.net8.csproj
diff --git a/src/Aspire.ProjectTemplates.net8/cgmanifest.json b/src/Aspire.ProjectTemplates.net8/cgmanifest.json
diff --git a/src/Aspire.ProjectTemplates/Aspire.ProjectTemplates.csproj b/src/Aspire.ProjectTemplates/Aspire.ProjectTemplates.csproj
@@ -56,6 +56,7 @@
     <WriteLinesToFile File="%(TemplateProjectFiles.DestinationFile)"
                       Lines="$([System.IO.File]::ReadAllText('%(TemplateProjectFiles.FullPath)')
                                                  .Replace('!!REPLACE_WITH_LATEST_VERSION!!', '$(PackageVersion)')
+                                                 .Replace('!!REPLACE_WITH_EXTENSIONS_8_VERSION!!', '$(MicrosoftExtensionsHttpResiliencePackageVersionForNet8)')
                                                  .Replace('!!REPLACE_WITH_EXTENSIONS_9_VERSION!!', '$(MicrosoftExtensionsHttpResiliencePackageVersionForNet9)'))"
                       Overwrite="true" />
   </Target>

diff --git a/...host/.template.config/dotnetcli.host.json → ...evel/.template.config/dotnetcli.host.json b/...host/.template.config/dotnetcli.host.json → ...evel/.template.config/dotnetcli.host.json
diff --git a/...re-apphost/.template.config/ide.host.json → ...-downlevel/.template.config/ide.host.json b/...re-apphost/.template.config/ide.host.json → ...-downlevel/.template.config/ide.host.json
diff --git a/...st/.template.config/ide/AspireAppHost.ico → ...el/.template.config/ide/AspireAppHost.ico b/...st/.template.config/ide/AspireAppHost.ico → ...el/.template.config/ide/AspireAppHost.ico
diff --git a/...ates/templates/aspire-apphost-downlevel/.template.config/localize/templatestrings.cs.json b/...ates/templates/aspire-apphost-downlevel/.template.config/localize/templatestrings.cs.json
@@ -0,0 +1,18 @@
+{
+  "author": "Microsoft",
+  "name": "Hostitel aplikací .NET Aspire 8",
+  "description": "Šablona projektu pro vytvoření projektu hostitele aplikace .NET Aspire 8 (orchestrator).",
+  "symbols/Framework/description": "Cílová architektura pro projekt",
+  "symbols/Framework/choices/net8.0/description": "Cílový net8.0",
+  "symbols/appHostHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP v launchSettings.json projektu AppHost.",
+  "symbols/appHostOtlpHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP OTLP v launchSettings.json projektu AppHost.",
+  "symbols/appHostResourceHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP služby prostředků v launchSettings.json projektu AppHost.",
+  "symbols/appHostHttpsPort/description": "Číslo portu, který se má použít pro koncový bod HTTPS v launchSettings.json projektu AppHost. Tato možnost se dá použít jenom v případě, že se nepoužívá parametr no-https.",
+  "symbols/appHostOtlpHttpsPort/description": "Číslo portu, který se má použít pro koncový bod HTTPS OTLP v launchSettings.json projektu AppHost.",
+  "symbols/appHostResourceHttpsPort/description": "Číslo portu, který se má použít pro koncový bod HTTPS služby prostředků v launchSettings.json projektu AppHost.",
+  "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
+  "symbols/NoHttps/description": "Určuje, jestli se má vypnout protokol HTTPS.",
+  "postActions/set-startup-project/description": "Nastaví projekt po spuštění v řešení",
+  "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
+  "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore"
+}
diff --git a/...ates/templates/aspire-apphost-downlevel/.template.config/localize/templatestrings.de.json b/...ates/templates/aspire-apphost-downlevel/.template.config/localize/templatestrings.de.json
@@ -0,0 +1,18 @@
+{
+  "author": "Microsoft",
+  "name": ".NET Aspire-App-Host 8",
+  "description": "Eine Projektvorlage zum Erstellen eines .NET Aspire-App-Hostprojekts 8 (Orchestrator).",
+  "symbols/Framework/description": "Das Zielframework für das Projekt.",
+  "symbols/Framework/choices/net8.0/description": "Ziel net8.0",
+  "symbols/appHostHttpPort/description": "Portnummer, die für den HTTP-Endpunkt in launchSettings.json des AppHost-Projekts verwendet werden soll.",
+  "symbols/appHostOtlpHttpPort/description": "Portnummer, die für den OTLP-HTTP-Endpunkt in launchSettings.json des AppHost-Projekts verwendet werden soll.",
+  "symbols/appHostResourceHttpPort/description": "Portnummer, die für den HTTP-Endpunkt des Ressourcendiensts in launchSettings.json des AppHost-Projekts verwendet werden soll.",
+  "symbols/appHostHttpsPort/description": "Portnummer, die für den HTTPS-Endpunkt in launchSettings.json des AppHost-Projekts verwendet werden soll. Diese Option ist nur anwendbar, wenn der Parameter no-https nicht verwendet wird.",
+  "symbols/appHostOtlpHttpsPort/description": "Portnummer, die für den OTLP-HTTPS-Endpunkt in launchSettings.json des AppHost-Projekts verwendet werden soll.",
+  "symbols/appHostResourceHttpsPort/description": "Portnummer, die für den HTTPS-Endpunkt des Ressourcendiensts in launchSettings.json des AppHost-Projekts verwendet werden soll.",
+  "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
+  "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll.",
+  "postActions/set-startup-project/description": "Legt das Startprojekt in der Lösung fest",
+  "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.",
+  "postActions/restore/manualInstructions/default/text": "\"dotnet restore\" ausführen"
+}
diff --git a/...ates/templates/aspire-apphost-downlevel/.template.config/localize/templatestrings.en.json b/...ates/templates/aspire-apphost-downlevel/.template.config/localize/templatestrings.en.json
@@ -0,0 +1,18 @@
+{
+  "author": "Microsoft",
+  "name": ".NET Aspire 8 App Host",
+  "description": "A project template for creating a .NET Aspire 8 app host (orchestrator) project.",
+  "symbols/Framework/description": "The target framework for the project.",
+  "symbols/Framework/choices/net8.0/description": "Target net8.0",
+  "symbols/appHostHttpPort/description": "Port number to use for the HTTP endpoint in launchSettings.json of the AppHost project.",
+  "symbols/appHostOtlpHttpPort/description": "Port number to use for the OTLP HTTP endpoint in launchSettings.json of the AppHost project.",
+  "symbols/appHostResourceHttpPort/description": "Port number to use for the resource service HTTP endpoint in launchSettings.json of the AppHost project.",
+  "symbols/appHostHttpsPort/description": "Port number to use for the HTTPS endpoint in launchSettings.json of the AppHost project. This option is only applicable when the parameter no-https is not used.",
+  "symbols/appHostOtlpHttpsPort/description": "Port number to use for the OTLP HTTPS endpoint in launchSettings.json of the AppHost project.",
+  "symbols/appHostResourceHttpsPort/description": "Port number to use for the resource service HTTPS endpoint in launchSettings.json of the AppHost project.",
+  "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
+  "symbols/NoHttps/description": "Whether to turn off HTTPS.",
+  "postActions/set-startup-project/description": "Sets the startup project in the solution",
+  "postActions/restore/description": "Restore NuGet packages required by this project.",
+  "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'"
+}
diff --git a/...ates/templates/aspire-apphost-downlevel/.template.config/localize/templatestrings.es.json b/...ates/templates/aspire-apphost-downlevel/.template.config/localize/templatestrings.es.json
@@ -0,0 +1,18 @@
+{
+  "author": "Microsoft",
+  "name": "Host de aplicación de .NET Runtime",
+  "description": "Una plantilla de proyecto para crear un proyecto host (orquestador) de aplicación .NET Aspire 8.",
+  "symbols/Framework/description": "Marco de destino del proyecto.",
+  "symbols/Framework/choices/net8.0/description": "NET8.0 de destino",
+  "symbols/appHostHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP en launchSettings.json del proyecto AppHost.",
+  "symbols/appHostOtlpHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP de OTLP en launchSettings.json del proyecto AppHost.",
+  "symbols/appHostResourceHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP del servicio de recursos en launchSettings.json del proyecto AppHost.",
+  "symbols/appHostHttpsPort/description": "Número de puerto que se va a usar para el punto de conexión HTTPS en launchSettings.json del proyecto AppHost. Esta opción solo es aplicable cuando no se usa el parámetro no-https.",
+  "symbols/appHostOtlpHttpsPort/description": "Número de puerto a usar para el punto de conexión HTTPS de la OTLP en launchSettings.json del proyecto AppHost.",
+  "symbols/appHostResourceHttpsPort/description": "Número de puerto a usar para el punto de conexión HTTPS del servicio de recursos en launchSettings.json del proyecto AppHost.",
+  "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.",
+  "symbols/NoHttps/description": "Si se va a desactivar HTTPS.",
+  "postActions/set-startup-project/description": "Establece el proyecto de inicio en la solución",
+  "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.",
+  "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\""
+}
diff --git a/...ates/templates/aspire-apphost-downlevel/.template.config/localize/templatestrings.fr.json b/...ates/templates/aspire-apphost-downlevel/.template.config/localize/templatestrings.fr.json
@@ -0,0 +1,18 @@
+{
+  "author": "Microsoft",
+  "name": "Hôte de l'application .NET Aspire 8",
+  "description": "Un modèle de projet pour créer un projet hôte (orchestrateur) d'application .NET Aspire 8.",
+  "symbols/Framework/description": "Framework cible du projet.",
+  "symbols/Framework/choices/net8.0/description": "Cible net8.0",
+  "symbols/appHostHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP dans launchSettings.json du projet AppHost.",
+  "symbols/appHostOtlpHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP OTLP dans launchSettings.json du projet AppHost.",
+  "symbols/appHostResourceHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP du service de ressources dans launchSettings.json du projet AppHost.",
+  "symbols/appHostHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS dans launchSettings.json du projet AppHost. Cette option n'est applicable que lorsque le paramètre no-https n'est pas utilisé.",
+  "symbols/appHostOtlpHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS OTLP dans launchSettings.json du projet AppHost.",
+  "symbols/appHostResourceHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS du service de ressources dans launchSettings.json du projet AppHost.",
+  "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.",
+  "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS.",
+  "postActions/set-startup-project/description": "Définit le projet de démarrage dans la solution",
+  "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.",
+  "postActions/restore/manualInstructions/default/text": "Exécutez 'dotnet restore'"
+}