Skip to content

Remove file-dedup workaround #2233

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 1 commit into from
Apr 30, 2021
Merged

Remove file-dedup workaround #2233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 0 additions & 16 deletions src/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,6 @@
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
</ItemGroup>

<!-- This is an ugly workaround needed to be able to do r2r/single file on packages that reference TraceEvent as the package's props inject a double
write to the same relative path. This is related to https://github.com/microsoft/perfview/issues/1002 -->
<Target Name="RemoveDupeAssemblies"
Condition="'$(PublishSingleFile)' == 'true'"
AfterTargets="ComputeResolvedFilesToPublishList"
BeforeTargets="CopyFilesToPublishDirectory">

<PropertyGroup>
<ExcludedTraceEventPath>$([MSBuild]::NormalizeDirectory($(PkgMicrosoft_Diagnostics_Tracing_TraceEvent), 'lib/netstandard1.6'))</ExcludedTraceEventPath>
</PropertyGroup>
<ItemGroup>
<ResolvedFileToPublish Condition="$([MSBuild]::NormalizePath(%(ResolvedFileToPublish.Identity)).StartsWith($(ExcludedTraceEventPath)))"
ExcludeFromSingleFile="true"/>
</ItemGroup>
</Target>

<!-- We need this for the binplacing for testing assets.
This should be removed at some point as it's brittle (harcodes versions and creates native-managed coupling). -->
<Target Name="_PublishPackageReferences"
Expand Down
14 changes: 0 additions & 14 deletions src/Tools/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,4 @@
</ItemGroup>
<Message Importance="Low" Text="@(FilesInBundleToSign)"/>
</Target>

<Target Name="PrepareForBundling"
BeforeTargets="GenerateSingleFileBundle"
AfterTargets="_ComputeFilesToBundle"
DependsOnTargets="RemoveDupeAssemblies" />

<!-- Workaround for https://github.com/microsoft/perfview/issues/1002 -->
<Target Name="RemoveDupeAssemblies">
<ItemGroup>
<_FilesToBundle Remove="$(PkgMicrosoft_Diagnostics_Tracing_TraceEvent)\lib\netstandard1.6\Dia2Lib.dll" />
<_FilesToBundle Remove="$(PkgMicrosoft_Diagnostics_Tracing_TraceEvent)\lib\netstandard1.6\OSExtensions.dll" />
<_FilesToBundle Remove="$(PkgMicrosoft_Diagnostics_Tracing_TraceEvent)\lib\netstandard1.6\TraceReloggerLib.dll" />
</ItemGroup>
</Target>
</Project>