Skip to content

[release/9.0.1xx-preview6] Use Aspire 8.0 workload in the 9.0 SDK #41792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 25, 2024
Merged

[release/9.0.1xx-preview6] Use Aspire 8.0 workload in the 9.0 SDK #41792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddc71fe
Use Aspire 8.0 workload in the 9.0 SDK
joperezr Jun 12, 2024
53a9b6a
Fixed missing property rename
joperezr Jun 12, 2024
2599c2a
Ignore IsStable
mmitche Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,19 +576,20 @@
<!--
Aspire isn't really a toolset dependency. However, it only inserts a baseline manifest in installer,
and if you squint at it, this means we can say that its specific dependency versions don't matter to installer.
It also doesn't currently ship 9.0 preview versions, meaning the version is locked to the latest shipped from 8.0 era.
Avoiding this as a product dependency avoids a long coherency path (aspnetcore->extensions->aspire->installer).
**It is** of course possible that an incoherent aspire means that aspire depends on versions of extensions that
aren't shipping, or those extensions packages depend on aspnetcore packages that won't ship. However, given the cost
of maintaining this coherency path is high. This being toolset means that aspire is responsible for its own coherency.
-->
<Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-9.0.100-preview.1" Version="9.0.0-preview.2.24163.9">
<Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.1">
<Uri>https://github.com/dotnet/aspire</Uri>
<Sha>9faf59f870abdeb427c51c1380fce84d8163f2f0</Sha>
<Sha>a6e341ebbf956bbcec0dda304109815fcbae70c9</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspire" Version="9.0.0-preview.2.24163.9">
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspire" Version="8.0.1-preview.8.24267.1">
<Uri>https://github.com/dotnet/aspire</Uri>
<Sha>9faf59f870abdeb427c51c1380fce84d8163f2f0</Sha>
<Sha>a6e341ebbf956bbcec0dda304109815fcbae70c9</Sha>
<SourceBuild RepoName="aspire" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,8 @@
<DotNetExe>$(_DotNetHiveRoot)dotnet$(ExeExtension)</DotNetExe>
</PropertyGroup>
<PropertyGroup Label="Workload manifest package versions">
<AspireFeatureBand>9.0.100-preview.1</AspireFeatureBand>
<MicrosoftNETSdkAspireManifest90100preview1PackageVersion>9.0.0-preview.2.24163.9</MicrosoftNETSdkAspireManifest90100preview1PackageVersion>
<AspireFeatureBand>8.0.100</AspireFeatureBand>
<MicrosoftNETSdkAspireManifest80100PackageVersion>8.0.1</MicrosoftNETSdkAspireManifest80100PackageVersion>
<MauiFeatureBand>9.0.100-preview.1</MauiFeatureBand>
<MauiWorkloadManifestVersion>9.0.0-preview.1.9973</MauiWorkloadManifestVersion>
<XamarinAndroidWorkloadManifestVersion>34.99.0-preview.1.151</XamarinAndroidWorkloadManifestVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/targets/BundledManifests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<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.Workload.Mono.ToolChain.net8" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
<BundledManifests Include="Microsoft.NET.Sdk.Aspire" FeatureBand="$(AspireFeatureBand)" Version="$(MicrosoftNETSdkAspireManifest90100preview1PackageVersion)" />
<BundledManifests Include="Microsoft.NET.Sdk.Aspire" FeatureBand="$(AspireFeatureBand)" Version="$(MicrosoftNETSdkAspireManifest80100PackageVersion)" />
</ItemGroup>

<!-- Calculate NuGet package IDs for bundled manifests -->
Expand Down
7 changes: 6 additions & 1 deletion ...eBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/MergeAssetManifests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,12 @@ public class MergeAssetManifests : Task

private static readonly string _buildIdAttribute = "BuildId";
private static readonly string _azureDevOpsBuildNumberAttribute = "AzureDevOpsBuildNumber";
private static readonly string[] _ignoredAttributes = [_buildIdAttribute, _azureDevOpsBuildNumberAttribute, "IsReleaseOnlyPackageVersion"];
private static readonly string[] _ignoredAttributes = [
_buildIdAttribute,
_azureDevOpsBuildNumberAttribute,
"IsReleaseOnlyPackageVersion",
"IsStable"
];

public override bool Execute()
{
Expand Down
Loading