Skip to content

Commit 27e808a

Browse files
author
John Luo
committed
Fix up data/ artifacts
1 parent 748b7ad commit 27e808a

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant
4141
<!-- Platform manifest data -->
4242
<FrameworkListFileName>FrameworkList.xml</FrameworkListFileName>
4343
<FrameworkListOutputPath>$(ArtifactsObjDir)$(FrameworkListFileName)</FrameworkListOutputPath>
44+
45+
<!-- Platform manifest and package override metatdata -->
46+
<ReferencePackSharedFxVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0</ReferencePackSharedFxVersion>
47+
<ReferencePlatformManifestOutputPath>$(ArtifactsObjDir)ref\PlatformManifest.txt</ReferencePlatformManifestOutputPath>
4448
</PropertyGroup>
4549

4650
<ItemGroup>
@@ -122,17 +126,28 @@ This package is an internal implementation of the .NET Core SDK and is not meant
122126
<RefPackContent Include="@(AspNetCoreReferenceAssemblyPath)" PackagePath="$(RefAssemblyPackagePath)" />
123127
<RefPackContent Include="@(AspNetCoreReferenceDocXml)" PackagePath="$(RefAssemblyPackagePath)" />
124128
<RefPackContent Include="$(TargetDir)$(PackageConflictManifestFileName)" PackagePath="$(ManifestsPackagePath)" />
125-
<RefPackContent Include="$(PlatformManifestOutputPath)" PackagePath="$(ManifestsPackagePath)" />
129+
<RefPackContent Include="$(ReferencePlatformManifestOutputPath)" PackagePath="$(ManifestsPackagePath)" />
126130
</ItemGroup>
131+
132+
<RepoTasks.GenerateSharedFrameworkDepsFile
133+
DepsFilePath="$(ProjectDepsFilePath)"
134+
TargetFramework="$(TargetFramework)"
135+
FrameworkName="$(TargetingPackName)"
136+
FrameworkVersion="$(ReferencePackSharedFxVersion)"
137+
References="@(AspNetCoreReferenceAssemblyPath)"
138+
RuntimeIdentifier="$(TargetRuntimeIdentifier)"
139+
RuntimePackageName="$(PackageId)"
140+
PlatformManifestOutputPath="$(ReferencePlatformManifestOutputPath)" />
127141
</Target>
128142

129143
<Target Name="GeneratePackageConflictManifest"
130144
DependsOnTargets="ResolveReferences"
131145
Inputs="$(MSBuildAllProjects)"
132146
Outputs="$(TargetDir)$(PackageConflictManifestFileName)">
147+
133148
<ItemGroup>
134149
<_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition=" '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " />
135-
<_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(SharedFxVersion)')" Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' AND '%(ReferencePath.IsReferenceAssembly)' == 'true' " />
150+
<_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(ReferencePackSharedFxVersion)')" Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' AND '%(ReferencePath.IsReferenceAssembly)' == 'true' " />
136151
</ItemGroup>
137152

138153
<WriteLinesToFile

0 commit comments

Comments
 (0)