Skip to content

Commit b4d7560

Browse files
committed
Work around #1730
1 parent fca0630 commit b4d7560

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@
3030
<ItemGroup>
3131
<PackageReference Include="Microsoft.Build.Framework" Version="$(MsBuildPackagesVersion)" ExcludeAssets="Runtime" />
3232
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MsBuildPackagesVersion)" ExcludeAssets="Runtime" />
33-
<PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" />
34-
<PackageReference Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" ExcludeAssets="All" NoWarn="NU1701" />
33+
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" Condition=" '$(TargetFramework)' == 'netcoreapp2.0' " />
34+
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.0.0" Condition=" '$(TargetFramework)' == 'netcoreapp2.0' " />
35+
<PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" />
36+
3537
</ItemGroup>
3638

3739
<ItemGroup>
@@ -195,7 +197,7 @@
195197

196198
<!-- Remove files from copy local that would not be published as they are provided by the platform package -->
197199
<!-- https://github.com/dotnet/sdk/issues/933 tracks a first class feature for this -->
198-
<Target Name="FilterCopyLocal" DependsOnTargets="RunResolvePublishAssemblies" BeforeTargets="ResolveLockFileCopyLocalProjectDeps">
200+
<Target Name="FilterCopyLocal" DependsOnTargets="GetFrameworkPaths;GetReferenceAssemblyPaths;RunResolvePublishAssemblies" BeforeTargets="ResolveLockFileCopyLocalProjectDeps">
199201
<ItemGroup>
200202
<_CopyLocalButNotPublished Include="@(AllCopyLocalItems)" Exclude="@(ResolvedAssembliesToPublish)" />
201203
<AllCopyLocalItems Remove="@(_CopyLocalButNotPublished)" />

src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989

9090
<!-- Remove files from copy local that would not be published as they are provided by the platform package -->
9191
<!-- https://github.com/dotnet/sdk/issues/933 tracks a first class feature for this -->
92-
<Target Name="FilterCopyLocal" DependsOnTargets="RunResolvePublishAssemblies" BeforeTargets="ResolveLockFileCopyLocalProjectDeps">
92+
<Target Name="FilterCopyLocal" DependsOnTargets="GetFrameworkPaths;GetReferenceAssemblyPaths;RunResolvePublishAssemblies" BeforeTargets="ResolveLockFileCopyLocalProjectDeps">
9393
<ItemGroup>
9494
<_CopyLocalButNotPublished Include="@(AllCopyLocalItems)" Exclude="@(ResolvedAssembliesToPublish)" />
9595
<AllCopyLocalItems Remove="@(_CopyLocalButNotPublished)" />

0 commit comments

Comments
 (0)