Skip to content
代码片段 群组 项目
未验证 提交 a1452da8 编辑于 作者: github-actions[bot]'s avatar github-actions[bot] 提交者: GitHub
浏览文件

[release/6.0] Explicitly de-dupe ReferenceCopyLocalPaths in...

[release/6.0] Explicitly de-dupe ReferenceCopyLocalPaths in Microsoft.AspNetCore.App.Runtime.csproj (#45333)

* Test removing dupe filenames

* Get it working

* Fixup

* Use _'d names

* Use MatchOnMetadata

* Change dependendsOn

Co-authored-by: default avatarWill Godbe <wigodbe@microsoft.com>
上级 2d551e37
No related branches found
No related tags found
无相关合并请求
...@@ -225,11 +225,22 @@ This package is an internal implementation of the .NET Core SDK and is not meant ...@@ -225,11 +225,22 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<!-- This project doesn't compile anything. --> <!-- This project doesn't compile anything. -->
<Target Name="CoreCompile" /> <Target Name="CoreCompile" />
<Target Name="FilterUnwantedContent"> <Target Name="FilterUnwantedContent"
DependsOnTargets="_ExpandRuntimePackageRoot">
<ItemGroup> <ItemGroup>
<!-- These files end up in this item group as a result of setting CopyLocalLockFileAssemblies, but shouldn't be. --> <!-- These files end up in this item group as a result of setting CopyLocalLockFileAssemblies, but shouldn't be. -->
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'apphost' OR '%(FileName)' == '$(LibPrefix)hostfxr' OR '%(FileName)' == '$(LibPrefix)hostpolicy' "/> <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'apphost' OR '%(FileName)' == '$(LibPrefix)hostfxr' OR '%(FileName)' == '$(LibPrefix)hostpolicy' "/>
</ItemGroup> </ItemGroup>
<ItemGroup>
<RuntimePackageFiles Include="$(RuntimePackageRoot)runtimes\**\*" />
<!--
Filter out any overlap between our SharedFx (ReferenceCopyLocalPaths) and dotnet/runtime's SharedFx (RuntimePackageFiles).
Most of the time there is no overlap, but in certain rare corner cases there can be.
See https://github.com/dotnet/aspnetcore/issues/45033 for more detail.
-->
<ReferenceCopyLocalPaths Remove="@(RuntimePackageFiles)" MatchOnMetadata="FileName"/>
</ItemGroup>
</Target> </Target>
<Target Name="_WarnAboutUnbuiltNativeDependencies" <Target Name="_WarnAboutUnbuiltNativeDependencies"
...@@ -369,7 +380,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant ...@@ -369,7 +380,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<Target Name="PrepareForCrossGen" <Target Name="PrepareForCrossGen"
Condition="'$(CrossgenOutput)' == 'true'" Condition="'$(CrossgenOutput)' == 'true'"
DependsOnTargets="_ExpandRuntimePackageRoot"> DependsOnTargets="FilterUnwantedContent">
<!-- The output directories of assemblies built in this repo contain a mix of ref and impl assemblies. Copy impl assemblies to a separate directory. --> <!-- The output directories of assemblies built in this repo contain a mix of ref and impl assemblies. Copy impl assemblies to a separate directory. -->
<RemoveDir Directories="$(CrossgenPlatformAssembliesDir)" /> <RemoveDir Directories="$(CrossgenPlatformAssembliesDir)" />
<Copy SourceFiles="@(ReferenceCopyLocalPaths)" DestinationFolder="$(CrossgenPlatformAssembliesDir)" Condition="'%(ReferenceCopyLocalPaths.ProjectPath)' != ''"/> <Copy SourceFiles="@(ReferenceCopyLocalPaths)" DestinationFolder="$(CrossgenPlatformAssembliesDir)" Condition="'%(ReferenceCopyLocalPaths.ProjectPath)' != ''"/>
...@@ -410,10 +421,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant ...@@ -410,10 +421,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
File="$(CrossgenToolDir)PlatformAssembliesPathsCrossgen2.rsp" File="$(CrossgenToolDir)PlatformAssembliesPathsCrossgen2.rsp"
Overwrite="true" /> Overwrite="true" />
<ItemGroup>
<RuntimePackageFiles Include="$(RuntimePackageRoot)runtimes\**\*" />
</ItemGroup>
<Error Text="Could not find crossgen2 $(CrossgenToolPath)" Condition=" ! Exists($(CrossgenToolPath))" /> <Error Text="Could not find crossgen2 $(CrossgenToolPath)" Condition=" ! Exists($(CrossgenToolPath))" />
<!-- Create tool directory with runtime assemblies --> <!-- Create tool directory with runtime assemblies -->
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册