From b32b679544631c7c74860fd1436aa5956e892d8a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 16 Jul 2024 00:49:07 +0200
Subject: [PATCH 1/5] fix: added appsettings intellisence to show Parameters
 json property

---
 src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj  | 2 +-
 .../AspireAppHostConfiguration.json                       | 8 ++++++++
 .../build/Aspire.Hosting.AppHost.targets                  | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 src/Aspire.Hosting.AppHost/AspireAppHostConfiguration.json

diff --git a/src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj b/src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj
index 2aeec50c373..24cecbe1eee 100644
--- a/src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj
+++ b/src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="**/*.props;**/*.targets" Pack="true" PackagePath="%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="**/*.props;**/*.targets;*.json" Pack="true" PackagePath="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Aspire.Hosting.AppHost/AspireAppHostConfiguration.json b/src/Aspire.Hosting.AppHost/AspireAppHostConfiguration.json
new file mode 100644
index 00000000000..a8b78c56f24
--- /dev/null
+++ b/src/Aspire.Hosting.AppHost/AspireAppHostConfiguration.json
@@ -0,0 +1,8 @@
+{
+  "type": "object",
+  "properties": {
+    "Parameters": {
+      "type": "object"
+    }
+  }
+}
diff --git a/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.targets b/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.targets
index 4d159721f71..c2486c4ee15 100644
--- a/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.targets
+++ b/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.targets
@@ -12,6 +12,11 @@
     <ProjectCapability Include="Aspire" Condition=" '$(IsAspireHost)' == 'true' " />
   </ItemGroup>
 
+  <ItemGroup>
+    <JsonSchemaSegment Include="$(MSBuildThisFileDirectory)..\AspireAppHostConfiguration.json"
+                       FilePathPattern="appsettings\..*json" />
+  </ItemGroup>
+
   <Target Name="_CreateAspireProjectResources">
 
     <ItemGroup>

From 9c0cb89aaf031403c66b5884560f067fd1f76a2a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 16 Jul 2024 00:49:55 +0200
Subject: [PATCH 2/5] feat: added Aspire Hosting Azure json schema

---
 .../Aspire.Hosting.Azure.csproj               |  6 ++-
 .../AspireAzureConfigurationSchema.json       | 43 +++++++++++++++++++
 .../build/Aspire.Hosting.Azure.targets        |  6 +++
 .../Aspire.Hosting.Azure.targets              |  3 ++
 .../Aspire.Hosting.Azure.targets              |  3 ++
 5 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 src/Aspire.Hosting.Azure/AspireAzureConfigurationSchema.json
 create mode 100644 src/Aspire.Hosting.Azure/build/Aspire.Hosting.Azure.targets
 create mode 100644 src/Aspire.Hosting.Azure/buildMultiTargeting/Aspire.Hosting.Azure.targets
 create mode 100644 src/Aspire.Hosting.Azure/buildTransitive/Aspire.Hosting.Azure.targets

diff --git a/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj b/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj
index be7f63072eb..3eb663bdc08 100644
--- a/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj
+++ b/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj
@@ -19,11 +19,15 @@
     <Compile Include="..\Aspire.Hosting\Dcp\Process\ProcessUtil.cs" Link="Provisioning\Utils\ProcessUtil.cs" />
     <Compile Include="..\Shared\Cosmos\CosmosConstants.cs" Link="Shared\CosmosConstants.cs" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <EmbeddedResource Include="Bicep\*.bicep" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="**/*.targets;AspireAzureConfigurationSchema.json" Pack="true" PackagePath="%(RecursiveDir)%(Filename)%(Extension)"  />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Aspire.Hosting\Aspire.Hosting.csproj" />
     <PackageReference Include="System.IO.Hashing" />
diff --git a/src/Aspire.Hosting.Azure/AspireAzureConfigurationSchema.json b/src/Aspire.Hosting.Azure/AspireAzureConfigurationSchema.json
new file mode 100644
index 00000000000..9edce8184d2
--- /dev/null
+++ b/src/Aspire.Hosting.Azure/AspireAzureConfigurationSchema.json
@@ -0,0 +1,43 @@
+{
+  "type": "object",
+  "properties": {
+    "Azure": {
+      "type": "object",
+      "properties": {
+        "SubscriptionId": {
+          "description": "Azure Subscription Id that will be used to host aspire app",
+          "type": "string"
+        },
+        "ResourceGroup": {
+          "description": "Azure Resource Group name where to create resources",
+          "type": "string"
+        },
+        "ResourceGroupPrefix": {
+          "description": "Azure Resource Group prefix used in resource groups names created",
+          "type": "string"
+        },
+        "AllowResourceGroupCreation": {
+          "description": "Flag that shows if it is allowed to create a resource group if not exists",
+          "type": "boolean"
+        },
+        "Location": {
+          "description": "Azure Location that will be used to create resources",
+          "type": "string"
+        },
+        "CredentialSource": {
+          "description": "Shows where to look for Azure credentials",
+          "enum": [
+            "AzureCli",
+            "AzurePowerShell",
+            "VisualStudio",
+            "VisualStudioCode",
+            "AzureDeveloperCli",
+            "InteractiveBrowser",
+            "Default"
+          ],
+          "default": "Default"
+        }
+      }
+    }
+  }
+}
diff --git a/src/Aspire.Hosting.Azure/build/Aspire.Hosting.Azure.targets b/src/Aspire.Hosting.Azure/build/Aspire.Hosting.Azure.targets
new file mode 100644
index 00000000000..43be5a0642c
--- /dev/null
+++ b/src/Aspire.Hosting.Azure/build/Aspire.Hosting.Azure.targets
@@ -0,0 +1,6 @@
+<Project>
+  <ItemGroup>
+    <JsonSchemaSegment Include="$(MSBuildThisFileDirectory)..\AspireAzureConfigurationSchema.json"
+                       FilePathPattern="appsettings\..*json" />
+  </ItemGroup>
+</Project>
diff --git a/src/Aspire.Hosting.Azure/buildMultiTargeting/Aspire.Hosting.Azure.targets b/src/Aspire.Hosting.Azure/buildMultiTargeting/Aspire.Hosting.Azure.targets
new file mode 100644
index 00000000000..4fa6ab44bc0
--- /dev/null
+++ b/src/Aspire.Hosting.Azure/buildMultiTargeting/Aspire.Hosting.Azure.targets
@@ -0,0 +1,3 @@
+<Project>
+    <Import Project="..\build\Aspire.Hosting.Azure.targets" />
+</Project>
diff --git a/src/Aspire.Hosting.Azure/buildTransitive/Aspire.Hosting.Azure.targets b/src/Aspire.Hosting.Azure/buildTransitive/Aspire.Hosting.Azure.targets
new file mode 100644
index 00000000000..a0ad52ed8ef
--- /dev/null
+++ b/src/Aspire.Hosting.Azure/buildTransitive/Aspire.Hosting.Azure.targets
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\build\Aspire.Hosting.Azure.targets" />
+</Project>

From 8d8e1e416a577535a15fce17b8cac9eb80f2f9b9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 17 Jul 2024 21:46:16 +0200
Subject: [PATCH 3/5] fixed PR comments

---
 src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj    | 2 +-
 src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj        | 2 +-
 src/Aspire.Hosting.Azure/build/Aspire.Hosting.Azure.targets | 6 ------
 .../buildMultiTargeting/Aspire.Hosting.Azure.targets        | 3 ---
 .../buildTransitive/Aspire.Hosting.Azure.targets            | 5 ++++-
 5 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 src/Aspire.Hosting.Azure/build/Aspire.Hosting.Azure.targets
 delete mode 100644 src/Aspire.Hosting.Azure/buildMultiTargeting/Aspire.Hosting.Azure.targets

diff --git a/src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj b/src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj
index 24cecbe1eee..48ec6bee401 100644
--- a/src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj
+++ b/src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="**/*.props;**/*.targets;*.json" Pack="true" PackagePath="%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="**/*.props;**/*.targets;AspireAppHostConfiguration.json" Pack="true" PackagePath="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj b/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj
index 3eb663bdc08..b8397c38f37 100644
--- a/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj
+++ b/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj
@@ -42,4 +42,4 @@
     <InternalsVisibleTo Include="Aspire.Hosting.Tests" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Aspire.Hosting.Azure/build/Aspire.Hosting.Azure.targets b/src/Aspire.Hosting.Azure/build/Aspire.Hosting.Azure.targets
deleted file mode 100644
index 43be5a0642c..00000000000
--- a/src/Aspire.Hosting.Azure/build/Aspire.Hosting.Azure.targets
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project>
-  <ItemGroup>
-    <JsonSchemaSegment Include="$(MSBuildThisFileDirectory)..\AspireAzureConfigurationSchema.json"
-                       FilePathPattern="appsettings\..*json" />
-  </ItemGroup>
-</Project>
diff --git a/src/Aspire.Hosting.Azure/buildMultiTargeting/Aspire.Hosting.Azure.targets b/src/Aspire.Hosting.Azure/buildMultiTargeting/Aspire.Hosting.Azure.targets
deleted file mode 100644
index 4fa6ab44bc0..00000000000
--- a/src/Aspire.Hosting.Azure/buildMultiTargeting/Aspire.Hosting.Azure.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project>
-    <Import Project="..\build\Aspire.Hosting.Azure.targets" />
-</Project>
diff --git a/src/Aspire.Hosting.Azure/buildTransitive/Aspire.Hosting.Azure.targets b/src/Aspire.Hosting.Azure/buildTransitive/Aspire.Hosting.Azure.targets
index a0ad52ed8ef..43be5a0642c 100644
--- a/src/Aspire.Hosting.Azure/buildTransitive/Aspire.Hosting.Azure.targets
+++ b/src/Aspire.Hosting.Azure/buildTransitive/Aspire.Hosting.Azure.targets
@@ -1,3 +1,6 @@
 <Project>
-  <Import Project="..\build\Aspire.Hosting.Azure.targets" />
+  <ItemGroup>
+    <JsonSchemaSegment Include="$(MSBuildThisFileDirectory)..\AspireAzureConfigurationSchema.json"
+                       FilePathPattern="appsettings\..*json" />
+  </ItemGroup>
 </Project>

From 2873b0259061bdfaceff9d3139e4ceedff5920e2 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 17 Jul 2024 21:50:48 +0200
Subject: [PATCH 4/5] fixed intendence

---
 src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj b/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj
index b8397c38f37..5fbb7532335 100644
--- a/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj
+++ b/src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj
@@ -19,7 +19,7 @@
     <Compile Include="..\Aspire.Hosting\Dcp\Process\ProcessUtil.cs" Link="Provisioning\Utils\ProcessUtil.cs" />
     <Compile Include="..\Shared\Cosmos\CosmosConstants.cs" Link="Shared\CosmosConstants.cs" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <EmbeddedResource Include="Bicep\*.bicep" />
   </ItemGroup>
@@ -42,4 +42,4 @@
     <InternalsVisibleTo Include="Aspire.Hosting.Tests" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>

From 2fb9228942ea028ad65b0f11824123feb9b875d0 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Mon, 26 Aug 2024 15:35:13 -0500
Subject: [PATCH 5/5] PR feedback

Add some more descriptions and tweak wording.
---
 .../AspireAppHostConfiguration.json                 |  1 +
 .../AspireAzureConfigurationSchema.json             | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Aspire.Hosting.AppHost/AspireAppHostConfiguration.json b/src/Aspire.Hosting.AppHost/AspireAppHostConfiguration.json
index a8b78c56f24..c0278619618 100644
--- a/src/Aspire.Hosting.AppHost/AspireAppHostConfiguration.json
+++ b/src/Aspire.Hosting.AppHost/AspireAppHostConfiguration.json
@@ -2,6 +2,7 @@
   "type": "object",
   "properties": {
     "Parameters": {
+      "description": ".NET Aspire parameter configuration. A parameter's value will be retrieved from the property with the same name.",
       "type": "object"
     }
   }
diff --git a/src/Aspire.Hosting.Azure/AspireAzureConfigurationSchema.json b/src/Aspire.Hosting.Azure/AspireAzureConfigurationSchema.json
index 9edce8184d2..cb56857f97d 100644
--- a/src/Aspire.Hosting.Azure/AspireAzureConfigurationSchema.json
+++ b/src/Aspire.Hosting.Azure/AspireAzureConfigurationSchema.json
@@ -2,30 +2,31 @@
   "type": "object",
   "properties": {
     "Azure": {
+      "description": "Azure provisioning information. This section is used to create Azure resources for the app.",
       "type": "object",
       "properties": {
         "SubscriptionId": {
-          "description": "Azure Subscription Id that will be used to host aspire app",
+          "description": "Azure Subscription Id that will be used to host the resources.",
           "type": "string"
         },
         "ResourceGroup": {
-          "description": "Azure Resource Group name where to create resources",
+          "description": "Azure Resource Group name where to create resources.",
           "type": "string"
         },
         "ResourceGroupPrefix": {
-          "description": "Azure Resource Group prefix used in resource groups names created",
+          "description": "Azure Resource Group prefix used in resource groups names created.",
           "type": "string"
         },
         "AllowResourceGroupCreation": {
-          "description": "Flag that shows if it is allowed to create a resource group if not exists",
+          "description": "Flag that shows if it is allowed to create a resource group if not exists. Defaults to false if ResourceGroup is provided.",
           "type": "boolean"
         },
         "Location": {
-          "description": "Azure Location that will be used to create resources",
+          "description": "Azure Location that will be used to create resources.",
           "type": "string"
         },
         "CredentialSource": {
-          "description": "Shows where to look for Azure credentials",
+          "description": "Configures which Azure credential to use for provisioning.",
           "enum": [
             "AzureCli",
             "AzurePowerShell",