Skip to content

Commit 437db19

Browse files
authored
Use Aspire 8.0 workload in the 9.0 SDK (#41562)
2 parents 02c06d3 + d37137c commit 437db19

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

eng/Version.Details.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -576,19 +576,20 @@
576576
<!--
577577
Aspire isn't really a toolset dependency. However, it only inserts a baseline manifest in installer,
578578
and if you squint at it, this means we can say that its specific dependency versions don't matter to installer.
579+
It also doesn't currently ship 9.0 preview versions, meaning the version is locked to the latest shipped from 8.0 era.
579580
Avoiding this as a product dependency avoids a long coherency path (aspnetcore->extensions->aspire->installer).
580581
**It is** of course possible that an incoherent aspire means that aspire depends on versions of extensions that
581582
aren't shipping, or those extensions packages depend on aspnetcore packages that won't ship. However, given the cost
582583
of maintaining this coherency path is high. This being toolset means that aspire is responsible for its own coherency.
583584
-->
584-
<Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-9.0.100-preview.1" Version="9.0.0-preview.2.24163.9">
585+
<Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.1">
585586
<Uri>https://github.com/dotnet/aspire</Uri>
586-
<Sha>9faf59f870abdeb427c51c1380fce84d8163f2f0</Sha>
587+
<Sha>a6e341ebbf956bbcec0dda304109815fcbae70c9</Sha>
587588
</Dependency>
588589
<!-- Intermediate is necessary for source build. -->
589-
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspire" Version="9.0.0-preview.2.24163.9">
590+
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspire" Version="8.0.1-preview.8.24267.1">
590591
<Uri>https://github.com/dotnet/aspire</Uri>
591-
<Sha>9faf59f870abdeb427c51c1380fce84d8163f2f0</Sha>
592+
<Sha>a6e341ebbf956bbcec0dda304109815fcbae70c9</Sha>
592593
<SourceBuild RepoName="aspire" ManagedOnly="true" />
593594
</Dependency>
594595
</ToolsetDependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,8 @@
338338
<DotNetExe>$(_DotNetHiveRoot)dotnet$(ExeExtension)</DotNetExe>
339339
</PropertyGroup>
340340
<PropertyGroup Label="Workload manifest package versions">
341-
<AspireFeatureBand>9.0.100-preview.1</AspireFeatureBand>
342-
<MicrosoftNETSdkAspireManifest90100preview1PackageVersion>9.0.0-preview.2.24163.9</MicrosoftNETSdkAspireManifest90100preview1PackageVersion>
341+
<AspireFeatureBand>8.0.100</AspireFeatureBand>
342+
<MicrosoftNETSdkAspireManifest80100PackageVersion>8.0.1</MicrosoftNETSdkAspireManifest80100PackageVersion>
343343
<MauiFeatureBand>9.0.100-preview.1</MauiFeatureBand>
344344
<MauiWorkloadManifestVersion>9.0.0-preview.1.9973</MauiWorkloadManifestVersion>
345345
<XamarinAndroidWorkloadManifestVersion>34.99.0-preview.1.151</XamarinAndroidWorkloadManifestVersion>

src/Installer/redist-installer/targets/BundledManifests.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net6" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
2121
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net7" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
2222
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net8" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
23-
<BundledManifests Include="Microsoft.NET.Sdk.Aspire" FeatureBand="$(AspireFeatureBand)" Version="$(MicrosoftNETSdkAspireManifest90100preview1PackageVersion)" />
23+
<BundledManifests Include="Microsoft.NET.Sdk.Aspire" FeatureBand="$(AspireFeatureBand)" Version="$(MicrosoftNETSdkAspireManifest80100PackageVersion)" />
2424
</ItemGroup>
2525

2626
<!-- Calculate NuGet package IDs for bundled manifests -->

src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/MergeAssetManifests.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ public class MergeAssetManifests : Task
3535

3636
private static readonly string _buildIdAttribute = "BuildId";
3737
private static readonly string _azureDevOpsBuildNumberAttribute = "AzureDevOpsBuildNumber";
38-
private static readonly string[] _ignoredAttributes = [_buildIdAttribute, _azureDevOpsBuildNumberAttribute, "IsReleaseOnlyPackageVersion"];
38+
private static readonly string[] _ignoredAttributes = [
39+
_buildIdAttribute,
40+
_azureDevOpsBuildNumberAttribute,
41+
"IsReleaseOnlyPackageVersion",
42+
"IsStable"
43+
];
3944

4045
public override bool Execute()
4146
{

0 commit comments

Comments
 (0)