diff options
author | Eric Mellino <erme@microsoft.com> | 2016-02-26 03:33:01 +0300 |
---|---|---|
committer | Eric Mellino <erme@microsoft.com> | 2016-02-26 03:33:01 +0300 |
commit | e54f1b90d016cf1601afa3f8284dccc049b6d64b (patch) | |
tree | c47fb2fd5125b39ead34ca44e0a5ccbc8197f24c /dir.targets | |
parent | 52b7ca946eda509e47039267f21e14c3f362e33b (diff) | |
parent | 5fe085b1840047c928d5c0f8a617da73c48b8156 (diff) |
Merge remote-tracking branch 'dotnet/master' into HEAD
Conflicts:
dir.targets
Diffstat (limited to 'dir.targets')
-rw-r--r-- | dir.targets | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/dir.targets b/dir.targets index 1a1d03941b..eae5e5da9b 100644 --- a/dir.targets +++ b/dir.targets @@ -17,4 +17,17 @@ <!-- permit a wrapping build system to contribute targets to this build --> <Import Condition="Exists('$(MSBuildThisFileDirectory)..\open.targets')" Project="$(MSBuildThisFileDirectory)..\open.targets" /> + + <PropertyGroup> + <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two properties to any folder that exists to skip + the GenerateReferenceAssemblyPaths task (not target) and to prevent it from outputting a warning (MSB3644). --> + <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories> + <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths> + <!-- We do not want to target a portable profile. + TODO: Make this the default in buildtools so this is not necessary. --> + <TargetFrameworkProfile></TargetFrameworkProfile> + <!-- We set this property to avoid MSBuild errors regarding not setting TargetFrameworkProfile (see above line) --> + <PortableNuGetMode>true</PortableNuGetMode> + </PropertyGroup> + </Project> |