diff options
| author | Eric St. John <ericstj@microsoft.com> | 2017-04-08 03:07:59 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2017-04-08 03:07:59 +0300 |
| commit | 9eafe499fd58447ecea75dead4602d1f8faedc33 (patch) | |
| tree | 263ea80501608de44a20fe479bc1814b230f0a03 /pkg | |
| parent | cf28f5105ac4bbcb9d19fa71a90fe4a219e0994b (diff) | |
Share more of the common framework package props
Diffstat (limited to 'pkg')
3 files changed, 13 insertions, 14 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 fc5a63c9e8..fea86aa1b1 100644 --- a/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj +++ b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj @@ -3,22 +3,16 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <IsLineupPackage Condition="'$(PackageTargetRuntime)' == ''">true</IsLineupPackage> - <PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference> <TargetFrameworkName>netcoreapp</TargetFrameworkName> <TargetFrameworkVersion>2.0</TargetFrameworkVersion> <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <SkipValidatePackage>true</SkipValidatePackage> <RefBinDir>$(NETCoreAppPackageRefPath)</RefBinDir> <LibBinDir>$(NETCoreAppPackageRuntimePath)</LibBinDir> - <NETStandardVersion>2.0</NETStandardVersion> - <IsFrameworkPackage>true</IsFrameworkPackage> - <!-- Include symbols in package by default--> + <!-- Private packages need symbols --> <IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage> </PropertyGroup> 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 d01d4e674e..b2304799ec 100644 --- a/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj +++ b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj @@ -3,23 +3,17 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <IsLineupPackage Condition="'$(PackageTargetRuntime)' == ''">true</IsLineupPackage> - <PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference> <TargetFrameworkName>uap</TargetFrameworkName> <TargetFrameworkVersion>10.1</TargetFrameworkVersion> <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <SkipValidatePackage>true</SkipValidatePackage> <RefBinDir>$(UAPPackageRefPath)</RefBinDir> <LibBinDir>$(UAPPackageRuntimePath)</LibBinDir> <LibBinDir Condition="$(PackageTargetRuntime.EndsWith('-aot'))">$(UAPAOTPackageRuntimePath)</LibBinDir> - <NETStandardVersion>2.0</NETStandardVersion> - <IsFrameworkPackage>true</IsFrameworkPackage> - <!-- Include symbols in package by default--> + <!-- Private packages need symbols --> <IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage> </PropertyGroup> diff --git a/pkg/frameworkPackage.targets b/pkg/frameworkPackage.targets index 33bf916aee..e4f32593e9 100644 --- a/pkg/frameworkPackage.targets +++ b/pkg/frameworkPackage.targets @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" InitialTargets="CheckForBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <IsLineupPackage Condition="'$(PackageTargetRuntime)' == ''">true</IsLineupPackage> + <PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference> + + <!-- these packages don't follow the patterns expected by package validation --> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <SkipValidatePackage>true</SkipValidatePackage> + + <NETStandardVersion Condition="'$(NETStandardVersion)' == ''">2.0</NETStandardVersion> + </PropertyGroup> + <!-- Bring in ref content from binplaced ref props --> <Import Condition="'$(PackageTargetRuntime)' == ''" Project="$(RefBinDir)\*.props" /> <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> |