From 9d6e3d71808815da6f49c7681c35858214d59103 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Wed, 1 Nov 2023 14:24:19 +0000
Subject: [PATCH] Merged PR 34956: Adding Aspire repo into source-build

Adding Aspire repo into source-build

cc: @<Matt Mitchell> @<Michael Simons (VISUAL STUDIO)> @<Matt Thalman>
---
 eng/Version.Details.xml                             |  5 +++++
 eng/Versions.props                                  |  2 +-
 src/SourceBuild/content/repo-projects/aspire.proj   | 13 +++++++++++++
 src/SourceBuild/content/repo-projects/dotnet.proj   |  1 +
 .../assets/baselines/licenses/Licenses.aspire.json  |  3 +++
 src/VirtualMonoRepo/source-mappings.json            |  7 +++++++
 src/redist/targets/BundledManifests.targets         |  2 +-
 7 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 src/SourceBuild/content/repo-projects/aspire.proj
 create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index db87639b4..1406f019d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -172,6 +172,11 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>2406616d0e3a31d80b326e27c156955bfa41c791</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23531.6">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspire</Uri>
+      <Sha>276cc28b03c11e2850546e604c707e664339fc15</Sha>
+      <SourceBuild RepoName="aspire" ManagedOnly="true" />
+    </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.0-rtm.23530.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>2406616d0e3a31d80b326e27c156955bfa41c791</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 02162e19f..e2c6743f4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -238,7 +238,7 @@
   <!-- Workload manifest package versions -->
   <PropertyGroup>
     <AspireFeatureBand>8.0.100</AspireFeatureBand>
-    <AspireWorkloadManifestVersion>8.0.0-preview.1.23526.4</AspireWorkloadManifestVersion>
+    <AspireWorkloadManifestVersion>8.0.0-preview.1.23531.6</AspireWorkloadManifestVersion>
     <MauiFeatureBand>8.0.100-rc.2</MauiFeatureBand>
     <MauiWorkloadManifestVersion>8.0.0-rc.2.9373</MauiWorkloadManifestVersion>
     <XamarinAndroidWorkloadManifestVersion>34.0.0-rc.2.468</XamarinAndroidWorkloadManifestVersion>
diff --git a/src/SourceBuild/content/repo-projects/aspire.proj b/src/SourceBuild/content/repo-projects/aspire.proj
new file mode 100644
index 000000000..7d41e5e5f
--- /dev/null
+++ b/src/SourceBuild/content/repo-projects/aspire.proj
@@ -0,0 +1,13 @@
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
+  <PropertyGroup>
+    <BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <RepositoryReference Include="arcade" />
+  </ItemGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>
\ No newline at end of file
diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj
index 23c5d842a..26ce0941f 100644
--- a/src/SourceBuild/content/repo-projects/dotnet.proj
+++ b/src/SourceBuild/content/repo-projects/dotnet.proj
@@ -45,6 +45,7 @@
     <RepositoryReference Include="fsharp" />
     <RepositoryReference Include="vstest" />
     <RepositoryReference Include="sdk" />
+    <RepositoryReference Include="aspire" />
     <RepositoryReference Include="installer" />
 
     <!-- Package source-build artifacts -->
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json
new file mode 100644
index 000000000..6941fa698
--- /dev/null
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json
@@ -0,0 +1,3 @@
+{
+  "files": []
+}
\ No newline at end of file
diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json
index 831fae959..7e6c1ccd5 100644
--- a/src/VirtualMonoRepo/source-mappings.json
+++ b/src/VirtualMonoRepo/source-mappings.json
@@ -60,6 +60,13 @@
                 "src/Microsoft.DotNet.SignTool.Tests/*.vsix"
             ]
         },
+        {
+            "name": "aspire",
+            "defaultRemote": "https://github.com/dotnet/aspire",
+            "exclude": [
+                "src/Aspire.Dashboard/**/*"
+            ]
+        },
         {
             "name": "aspnetcore",
             "defaultRemote": "https://github.com/dotnet/aspnetcore",
diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets
index d6db716b9..73402bced 100644
--- a/src/redist/targets/BundledManifests.targets
+++ b/src/redist/targets/BundledManifests.targets
@@ -4,7 +4,6 @@
   </PropertyGroup>
   <ItemGroup>
     <BundledManifests Include="Microsoft.NET.Sdk.Android" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinAndroidWorkloadManifestVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
-    <BundledManifests Include="Microsoft.NET.Sdk.Aspire" FeatureBand="$(AspireFeatureBand)" Version="$(AspireWorkloadManifestVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
     <BundledManifests Include="Microsoft.NET.Sdk.iOS" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinIOSWorkloadManifestVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
     <BundledManifests Include="Microsoft.NET.Sdk.MacCatalyst" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinMacCatalystWorkloadManifestVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
     <BundledManifests Include="Microsoft.NET.Sdk.macOS" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinMacOSWorkloadManifestVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
@@ -17,6 +16,7 @@
     <BundledManifests Include="Microsoft.NET.Workload.Emscripten.net7" FeatureBand="$(EmscriptenWorkloadFeatureBand)" Version="$(EmscriptenWorkloadManifestVersion)" />
     <BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net6" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
     <BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net7" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
+    <BundledManifests Include="Microsoft.NET.Sdk.Aspire" FeatureBand="$(AspireFeatureBand)" Version="$(AspireWorkloadManifestVersion)" />
   </ItemGroup>
 
   <!-- Calculate NuGet package IDs for bundled manifests -->