diff options
author | Christopher Costa <chcosta@microsoft.com> | 2016-08-18 02:28:29 +0300 |
---|---|---|
committer | Christopher Costa <chcosta@microsoft.com> | 2016-08-18 02:28:29 +0300 |
commit | 5655325eeaeef348d4d83d7cab5503736d1c0d2c (patch) | |
tree | 06e017e0c08e5f5607c9c2aaf3676fdfc9a2c8fb /dir.props | |
parent | 1ec6349e18b94053acb19652d40505855519ea99 (diff) |
Remove common properties from corefx, they have been added to buildtools
Diffstat (limited to 'dir.props')
-rw-r--r-- | dir.props | 51 |
1 files changed, 2 insertions, 49 deletions
@@ -25,12 +25,6 @@ <InputOSGroup Condition="'$(InputOSGroup)'==''">$(OSEnvironment)</InputOSGroup> </PropertyGroup> - <!-- Build Tools Versions --> - <PropertyGroup> - <RoslynVersion>2.0.0-beta3</RoslynVersion> - <RoslynPackageName>Microsoft.Net.Compilers</RoslynPackageName> - </PropertyGroup> - <!-- Informs build tools to apply .NET Framework metadata if not a test project --> <PropertyGroup> <IsDotNetFrameworkProductAssembly>true</IsDotNetFrameworkProductAssembly> @@ -55,15 +49,9 @@ <!-- Input Directories --> <PackagesDir Condition="'$(PackagesDir)'==''">$(ProjectDir)packages/</PackagesDir> - <ToolRuntimePath Condition="'$(ToolRuntimePath)'==''">$(ProjectDir)Tools/</ToolRuntimePath> <ToolsDir Condition="'$(UseToolRuntimeForToolsDir)'=='true'">$(ToolRuntimePath)</ToolsDir> <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools/</ToolsDir> - <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolRuntimePath)dotnetcli/</DotnetCliPath> - <OverrideToolHost>$(DotnetCliPath)dotnet</OverrideToolHost> - <BuildToolsTaskDir Condition="'$(BuildToolsTargets45)' == 'true'">$(ToolsDir)net45/</BuildToolsTaskDir> - <BuildToolsTaskDir Condition="'$(BuildToolsTaskDir)'==''">$(ToolsDir)</BuildToolsTaskDir> - <UseRoslynCompilers Condition="'$(UseRoslynCompilers)'=='' and '$(OSEnvironment)'!='Windows_NT'">false</UseRoslynCompilers> - <UseSharedCompilation Condition="'$(UseSharedCompilation)' == '' and '$(OSEnvironment)' == 'Windows_NT' and '$(UseRoslynCompilers)' != 'true'">true</UseSharedCompilation> + <ToolRuntimePath Condition="'$(ToolRuntimePath)'==''">$(ToolsDir)</ToolRuntimePath> </PropertyGroup> <Import Project="$(ToolRuntimePath)BuildVersion.targets" Condition="Exists('$(ToolRuntimePath)BuildVersion.targets')" /> @@ -223,40 +211,6 @@ </PropertyGroup> <PropertyGroup> - <RoslynPropsFile>$(ToolRuntimePath)/net45/roslyn/build/Microsoft.Net.Compilers.props</RoslynPropsFile> - </PropertyGroup> - <!-- - On Unix we always use a version of Roslyn we restore from NuGet and we have to work around some known issues. - --> - <PropertyGroup Condition="'$(OsEnvironment)'=='Unix'"> - <RoslynPackageDir>$(PackagesDir)/$(RoslynPackageName).$(RoslynVersion)/</RoslynPackageDir> - <RoslynPropsFile>$(RoslynPackageDir)build/$(RoslynPackageName).props</RoslynPropsFile> - - <!-- - Portable PDBs are now supported in Linux and OSX with .Net Core MSBuild. - --> - <DebugType>Portable</DebugType> - - <!-- - Delay signing with the ECMA key currently doesn't work. - https://github.com/dotnet/roslyn/issues/2444 - --> - <UseECMAKey>false</UseECMAKey> - - <!-- - Full signing with Open key doesn't work with Portable Csc. - https://github.com/dotnet/roslyn/issues/8210 - --> - <UseOpenKey>false</UseOpenKey> - - <!-- - Mono currently doesn't include VB targets for portable, notably /lib/mono/xbuild/Microsoft/Portable/v4.5/Microsoft.Portable.VisualBasic.targets. - Fixed in https://github.com/mono/mono/pull/1726. - --> - <IncludeVbProjects>false</IncludeVbProjects> - </PropertyGroup> - - <PropertyGroup> <!-- By default make all libraries to be AnyCPU but individual projects can override it if they need to --> <Platform>AnyCPU</Platform> <OutputType>Library</OutputType> @@ -625,6 +579,5 @@ </PropertyGroup> <!-- Use Roslyn Compilers to build --> - <Import Project="$(RoslynPropsFile)" Condition="'$(OsEnvironment)'!='Unix' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false'" /> - <Import Project="$(RoslynPropsFile)" Condition="'$(OsEnvironment)'=='Unix' and Exists('$(RoslynPropsFile)')" /> + <Import Project="$(RoslynPropsFile)" Condition="Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false'" /> </Project> |