diff options
| author | Eric St. John <ericstj@microsoft.com> | 2017-04-11 01:07:57 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2017-04-12 23:42:48 +0300 |
| commit | 3ec0e74e4f4dabcb30852147ee6e1fc1af9b4346 (patch) | |
| tree | 3305e040ab9277264bad1900dc3b6a57d076715a /pkg | |
| parent | 83e91cb0284293e8954dbe83c080f537d6c79eac (diff) | |
Make BinPlaceProps understand ItemName, SaveItemName
ItemName was added previously to allow binplacing something other than
the default project output. Make BinPlaceProps understand this.
I also have a need to specify different item names for ref vs runtime so
I've added "SaveItemName" metadata to specify this. By default I use
LibFile for PackageFileRuntimePath and RefFile for PackageFileRefPath.
A BinPlaceConfiguration can specify a different SaveItemName to
override.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/frameworkPackage.targets | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkg/frameworkPackage.targets b/pkg/frameworkPackage.targets index 1ea4adedca..7b0a74482e 100644 --- a/pkg/frameworkPackage.targets +++ b/pkg/frameworkPackage.targets @@ -16,11 +16,11 @@ <Import Condition="'$(PackageTargetRuntime)' == ''" Project="$(RefBinDir)\*.props" /> <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> <!-- Include refs --> - <File Include="@(FileToPackage)"> - <TargetPath Condition="'%(File.TargetPath)' == ''">ref/$(TargetFramework)</TargetPath> + <File Include="@(RefFile)"> + <TargetPath Condition="'%(RefFile.TargetPath)' == ''">$(RefFileTargetPath)</TargetPath> </File> <!-- force a missing file if ref build is absent --> - <File Include="$(RefBinDir)/MISSING_REF_BUILD" Condition="'@(FileToPackage)' == ''" /> + <File Include="$(RefBinDir)/MISSING_REF_BUILD" Condition="'@(RefFile)' == ''" /> <_buildRIDWithMetadata Include="@(BuildRID)"> <TargetRuntime>%(Identity)</TargetRuntime> @@ -37,11 +37,11 @@ <Import Condition="'$(PackageTargetRuntime)' != ''" Project="$(LibBinDir)\*.props" /> <ItemGroup Condition="'$(PackageTargetRuntime)' != ''"> <!-- Include lib --> - <File Include="@(FileToPackage)"> - <TargetPath Condition="'%(File.TargetPath)' == ''">runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</TargetPath> + <File Include="@(LibFile)"> + <TargetPath Condition="'%(LibFile.TargetPath)' == ''">$(LibFileTargetPath)</TargetPath> </File> <!-- force a missing file if lib build is absent --> - <File Include="$(LibBinDir)/MISSING_LIB_BUILD" Condition="'@(FileToPackage)' == ''" /> + <File Include="$(LibBinDir)/MISSING_LIB_BUILD" Condition="'@(LibFile)' == ''" /> <!-- Include native --> <ExcludeNative Include="$(NativeBinDir)/*.lib" /> |