diff options
| -rw-r--r-- | dir.props | 10 | ||||
| -rw-r--r-- | dir.targets | 5 |
2 files changed, 4 insertions, 11 deletions
@@ -403,14 +403,4 @@ <Import Project="$(RoslynPropsFile)" Condition="'$(OsEnvironment)'=='Unix' and Exists('$(RoslynPropsFile)')" /> - <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> - <TargetFrameworkProfile></TargetFrameworkProfile> - <IgnoreDefaultInstalledAssemblyTables>true</IgnoreDefaultInstalledAssemblyTables> - <PortableNuGetMode>true</PortableNuGetMode> - </PropertyGroup> - </Project> diff --git a/dir.targets b/dir.targets index ec7e5dc43c..ea56ee9506 100644 --- a/dir.targets +++ b/dir.targets @@ -20,8 +20,11 @@ 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> - <IgnoreDefaultInstalledAssemblyTables>true</IgnoreDefaultInstalledAssemblyTables> + <!-- We set this property to avoid MSBuild errors regarding not setting TargetFrameworkProfile (see above line) --> + <PortableNuGetMode>true</PortableNuGetMode> </PropertyGroup> </Project> |