Skip to content

Commit 5685aa4

Browse files
author
John Luo
committed
Fix test
1 parent 84bf7e7 commit 5685aa4

File tree

4 files changed

+23
-1
lines changed

4 files changed

+23
-1
lines changed

src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
100100

101101
<!-- This target finds the reference assemblies. -->
102102
<Target Name="_ResolveTargetingPackContent"
103+
Returns="@(AspNetCoreReferenceAssemblyPath)"
103104
BeforeTargets="_GetPackageFiles"
104105
DependsOnTargets="ResolveReferences;FindReferenceAssembliesForReferences">
105106
<ItemGroup>

src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@
5353
</ItemGroup>
5454

5555
<Target Name="GenerateTestData" BeforeTargets="GetAssemblyAttributes" DependsOnTargets="InitializeSourceControlInformation">
56+
<!-- Use the ref pack logic to compute the list of expected targeting pack content -->
57+
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
58+
Targets="_ResolveTargetingPackContent"
59+
SkipNonexistentProjects="false">
60+
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackDependencies" />
61+
</MSBuild>
62+
5663
<!-- This target is defined in eng/targets/Packaging.targets and included in every C# and F# project. -->
5764
<MSBuild Projects="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj"
5865
Targets="_GetPackageVersionInfo"
@@ -68,6 +75,11 @@
6875
</MSBuild>
6976

7077
<ItemGroup>
78+
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
79+
<_Parameter1>TargetingPackDependencies</_Parameter1>
80+
<_Parameter2>@(_TargetingPackDependencies)</_Parameter2>
81+
</AssemblyAttribute>
82+
7183
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
7284
<_Parameter1>RepositoryCommit</_Parameter1>
7385
<_Parameter2>$(SourceRevisionId)</_Parameter2>

src/Framework/test/TargetingPackTests.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,15 @@ public void AssembliesAreReferenceAssemblies()
5959
public void PlatformManifestListsAllFiles()
6060
{
6161
var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");
62-
var expectedAssemblies = TestData.GetSharedFxDependencies()
62+
var expectedAssemblies = TestData.GetTargetingPackDependencies()
6363
.Split(';', StringSplitOptions.RemoveEmptyEntries)
64+
.Select(i =>
65+
{
66+
var fileName = Path.GetFileName(i);
67+
return fileName.EndsWith(".dll", StringComparison.Ordinal)
68+
? fileName.Substring(0, fileName.Length - 4)
69+
: fileName;
70+
})
6471
.ToHashSet();
6572

6673
_output.WriteLine("==== file contents ====");

src/Framework/test/TestData.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public class TestData
1818

1919
public static string GetSharedFxDependencies() => GetTestDataValue("SharedFxDependencies");
2020

21+
public static string GetTargetingPackDependencies() => GetTestDataValue("TargetingPackDependencies");
22+
2123
public static string GetTestDataValue(string key)
2224
=> typeof(TestData).Assembly.GetCustomAttributes<TestDataAttribute>().Single(d => d.Key == key).Value;
2325
}

0 commit comments

Comments
 (0)