diff options
author | Eric St. John <ericstj@microsoft.com> | 2017-02-24 08:12:07 +0300 |
---|---|---|
committer | Eric St. John <ericstj@microsoft.com> | 2017-02-24 22:00:03 +0300 |
commit | 4224a038d999f7fb9fe6e0d74017c8c6ad7437c0 (patch) | |
tree | 7442685bd178aefc8a03f7f02077913af892348f /pkg | |
parent | 91e96b438310574ca18b9d2daa9e8ce195105bcc (diff) |
Use file lists for packaging rather than copies
Avoid an unnecessary copy for packaging.
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj | 20 | ||||
-rw-r--r-- | pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj index dcab73cccc..cd0fc6613b 100644 --- a/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj +++ b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj @@ -42,30 +42,30 @@ <NETStandardVersion>2.0</NETStandardVersion> </PropertyGroup> + <Import Condition="'$(PackageTargetRuntime)' == ''" Project="$(RefBinDir)\*.props" /> <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> <ProjectReference Include="@(Project)" /> <!-- Include refs --> - <RefFile Include="$(RefBinDir)/*.*"> - <TargetPath>ref/$(TargetFramework)</TargetPath> - </RefFile> - <File Include="@(RefFile)" /> + <File Include="@(FileToPackage)"> + <TargetPath Condition="'%(File.TargetPath)' == ''">ref/$(TargetFramework)</TargetPath> + </File> <!-- force a missing file if ref build is absent --> - <File Include="$(RefBinDir)/MISSING_REF_BUILD" Condition="'@(RefFile)' == ''" /> + <File Include="$(RefBinDir)/MISSING_REF_BUILD" Condition="'@(FileToPackage)' == ''" /> <FilePackageDependency Include="Microsoft.NETCore.Platforms"> <Version>$(PlatformPackageVersion)</Version> </FilePackageDependency> </ItemGroup> + <Import Condition="'$(PackageTargetRuntime)' != ''" Project="$(LibBinDir)\*.props" /> <ItemGroup Condition="'$(PackageTargetRuntime)' != ''"> <!-- Include lib --> - <LibFile Include="$(LibBinDir)/*.*"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</TargetPath> - </LibFile> - <File Include="@(LibFile)" /> + <File Include="@(FileToPackage)"> + <TargetPath Condition="'%(File.TargetPath)' == ''">runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</TargetPath> + </File> <!-- force a missing file if lib build is absent --> - <File Include="$(LibBinDir)/MISSING_LIB_BUILD" Condition="'@(LibFile)' == ''" /> + <File Include="$(LibBinDir)/MISSING_LIB_BUILD" Condition="'@(FileToPackage)' == ''" /> <!-- Include native --> <ExcludeNative Include="$(NativeBinDir)/*.lib" /> diff --git a/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj index d86f52c6c1..7999a1df8b 100644 --- a/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj +++ b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj @@ -20,30 +20,30 @@ <NETStandardVersion>2.0</NETStandardVersion> </PropertyGroup> + <Import Condition="'$(PackageTargetRuntime)' == ''" Project="$(RefBinDir)\*.props" /> <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> <ProjectReference Include="@(Project)" /> <!-- Include refs --> - <RefFile Include="$(RefBinDir)/*.*"> - <TargetPath>ref/$(TargetFramework)</TargetPath> - </RefFile> - <File Include="@(RefFile)" /> + <File Include="@(FileToPackage)"> + <TargetPath Condition="'%(File.TargetPath)' == ''">ref/$(TargetFramework)</TargetPath> + </File> <!-- force a missing file if ref build is absent --> - <File Include="$(RefBinDir)/MISSING_REF_BUILD" Condition="'@(RefFile)' == ''" /> + <File Include="$(RefBinDir)/MISSING_REF_BUILD" Condition="'@(FileToPackage)' == ''" /> <FilePackageDependency Include="Microsoft.NETCore.Platforms"> <Version>$(PlatformPackageVersion)</Version> </FilePackageDependency> </ItemGroup> + <Import Condition="'$(PackageTargetRuntime)' != ''" Project="$(LibBinDir)\*.props" /> <ItemGroup Condition="'$(PackageTargetRuntime)' != ''"> <!-- Include lib --> - <LibFile Include="$(LibBinDir)/*.*"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</TargetPath> - </LibFile> - <File Include="@(LibFile)" /> + <File Include="@(FileToPackage)"> + <TargetPath Condition="'%(File.TargetPath)' == ''">runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</TargetPath> + </File> <!-- force a missing file if lib build is absent --> - <File Include="$(LibBinDir)/MISSING_LIB_BUILD" Condition="'@(LibFile)' == ''" /> + <File Include="$(LibBinDir)/MISSING_LIB_BUILD" Condition="'@(FileToPackage)' == ''" /> <!-- Include native --> <ExcludeNative Include="$(NativeBinDir)/*.lib" /> |