Skip to content

List Microsoft.AspNetCore.App in PackageOverrides.txt #60897

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
Mar 13, 2025
Merged

List Microsoft.AspNetCore.App in PackageOverrides.txt #60897

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
d41b93f
List Microsoft.AspNetCore.App in PackageOverrides.txt
wtgodbe Mar 12, 2025
45f9e68
Update package override to use SharedFrameworkName
wtgodbe Mar 12, 2025
b0cbdca
Update TargetingPackTests.cs
wtgodbe Mar 12, 2025
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
3 changes: 3 additions & 0 deletions src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@
<!-- Use shared framework version for project references. -->
<_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(ReferencePackSharedFxVersion)')"
Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' " />

<!-- Include Microsoft.AspNetCore.App for Package Pruning -->
<_AspNetCoreAppPackageOverrides Include="$(SharedFrameworkName)|$(ReferencePackSharedFxVersion)" />
</ItemGroup>

<WriteLinesToFile
Expand Down
5 changes: 3 additions & 2 deletions src/Framework/test/TargetingPackTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ public void PackageOverridesContainsCorrectEntries()
.Split(';', StringSplitOptions.RemoveEmptyEntries)
.ToHashSet();

Assert.Equal(packageOverrideFileLines.Length, runtimeDependencies.Count + aspnetcoreDependencies.Count);
// PackageOverrides will contain all Aspnetcore/Runtime ref pack libs, plus an entry for Microsoft.AspNetCore.App
Assert.Equal(packageOverrideFileLines.Length, runtimeDependencies.Count + aspnetcoreDependencies.Count + 1);

// PackageOverrides versions should remain at Major.Minor.0 while servicing.
var netCoreAppPackageVersion = TestData.GetMicrosoftNETCoreAppPackageVersion();
Expand Down Expand Up @@ -177,7 +178,7 @@ public void PackageOverridesContainsCorrectEntries()
{
Assert.Equal(netCoreAppPackageVersion, packageVersion);
}
else if (aspnetcoreDependencies.Contains(packageName))
else if (packageName.Equals("Microsoft.AspNetCore.App", StringComparison.Ordinal) || aspnetcoreDependencies.Contains(packageName))
{
Assert.Equal(aspNetCoreAppPackageVersion, packageVersion);
}
Expand Down
Loading