From 68f2a515585b6fe3d107c4ef252a0cde98192c04 Mon Sep 17 00:00:00 2001
From: Phil Henning <phenning@microsoft.com>
Date: Wed, 29 Nov 2023 14:28:40 -0500
Subject: [PATCH] Update templates to require "aspire" workload to be installed
 (#1115)

* Use constraint in template.json rather than requiredComponents in host file
---
 .../templates/aspire-empty/.template.config/ide.host.json  | 7 -------
 .../templates/aspire-empty/.template.config/template.json  | 6 ++++++
 .../aspire-starter/.template.config/ide.host.json          | 7 -------
 .../aspire-starter/.template.config/template.json          | 6 ++++++
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/Aspire.ProjectTemplates/templates/aspire-empty/.template.config/ide.host.json b/src/Aspire.ProjectTemplates/templates/aspire-empty/.template.config/ide.host.json
index 5a1d6e2a0a..531740dae0 100644
--- a/src/Aspire.ProjectTemplates/templates/aspire-empty/.template.config/ide.host.json
+++ b/src/Aspire.ProjectTemplates/templates/aspire-empty/.template.config/ide.host.json
@@ -7,12 +7,5 @@
       "id": "vs",
       "version": "(,17.9)"
     }
-  ],
-  "requiredComponents": [
-    {
-      "hostId": "vs",
-      "componentType": "setupComponent",
-      "id": "aspire"
-    }
   ]
 }
diff --git a/src/Aspire.ProjectTemplates/templates/aspire-empty/.template.config/template.json b/src/Aspire.ProjectTemplates/templates/aspire-empty/.template.config/template.json
index 8fe00a17d2..1486d626aa 100644
--- a/src/Aspire.ProjectTemplates/templates/aspire-empty/.template.config/template.json
+++ b/src/Aspire.ProjectTemplates/templates/aspire-empty/.template.config/template.json
@@ -38,6 +38,12 @@
       ]
     }
   ],
+  "constraints": {
+    "aspire": {
+      "type": "workload",
+      "args": [ "aspire" ]
+    }
+  },
   "symbols": {
     "Framework": {
       "type": "parameter",
diff --git a/src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/ide.host.json b/src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/ide.host.json
index 0bbf44bc45..1db3059870 100644
--- a/src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/ide.host.json
+++ b/src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/ide.host.json
@@ -8,13 +8,6 @@
       "version": "(,17.9)"
     }
   ],
-  "requiredComponents": [
-    {
-      "hostId": "vs",
-      "componentType": "setupComponent",
-      "id": "aspire"
-    }
-  ],
   "symbolInfo": [
     {
       "id": "UseRedisCache",
diff --git a/src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/template.json b/src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/template.json
index 35d4b2ffc6..165fe36765 100644
--- a/src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/template.json
+++ b/src/Aspire.ProjectTemplates/templates/aspire-starter/.template.config/template.json
@@ -45,6 +45,12 @@
       ]
     }
   ],
+  "constraints": {
+    "aspire": {
+      "type": "workload",
+      "args": [ "aspire" ]
+    }
+  },
   "symbols": {
     "Framework": {
       "type": "parameter",