Merge branch 'release/8.0.1xx' into release/8.0.2xx

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.23551.2",
+      "version": "1.1.0-beta.23578.2",
       "commands": [
         "darc"
       ]

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>

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 -->

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json

@@ -0,0 +1,3 @@
+{
+  "files": []
+}

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",

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 -->