Skip to content

Reference Roslyn ref assemblies when available when building a targeting pack #15209

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 2 commits into from
Oct 30, 2024
Merged

Reference Roslyn ref assemblies when available when building a targeting pack #15209

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e89923
Reference Roslyn ref assemblies when available when building a target…
jkoritzinsky Oct 30, 2024
d2a494d
Search for doc files next to the referenced assemblies
jkoritzinsky Oct 30, 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
13 changes: 10 additions & 3 deletions src/Microsoft.DotNet.SharedFramework.Sdk/targets/sharedfx.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
ResolveFrameworkReferences;
ResolveLockFileCopyLocalFiles;
ResolveReferences;
FindReferenceAssembliesForReferences;
_ReadyToRunSharedFramework;
_FindSymbolFilesForSharedFrameworkFiles"
Returns="@(FilesToPackage)">
Expand All @@ -122,12 +123,18 @@
</ItemGroup>

<ItemGroup Condition="'$(PlatformPackageType)' == 'TargetingPack'">
<FilesToPackage Include="@(ReferencePath)" Condition="'%(ReferencePath.FrameworkReferenceName)' == ''">
<!-- include all doc files from explicitly added files to package -->
<DocFilesToPackage Include="%(FilesToPackage.RootDir)%(FilesToPackage.Directory)**\%(FilesToPackage.FileName).xml" />

<FilesToPackage Include="@(ReferencePath->Metadata('ReferenceAssembly'))" Condition="'%(ReferencePath.FrameworkReferenceName)' == ''">
<TargetPath>ref/$(TargetFramework)</TargetPath>
</FilesToPackage>

<!-- include all doc files -->
<DocFilesToPackage Include="%(FilesToPackage.RootDir)%(FilesToPackage.Directory)**\%(FilesToPackage.FileName).xml" />
<!--
Include all doc files from referenced assemblies.
We need to do this separately as the Roslyn-generated ref assembly is in the wrong folder, so we wouldn't find doc files in that case.
-->
<DocFilesToPackage Include="%(ReferencePath.RootDir)%(ReferencePath.Directory)**\%(ReferencePath.FileName).xml" />

<FilesToPackage Include="@(DocFilesToPackage)">
<TargetPath>ref/$(TargetFramework)/%(RecursiveDir)</TargetPath>
Expand Down
Loading