diff options
author | Michal Strehovský <michals@microsoft.com> | 2017-11-02 21:58:31 +0100 |
---|---|---|
committer | Michal Strehovský <michals@microsoft.com> | 2017-11-02 21:58:31 +0100 |
commit | fc7225790db730e411e98c7e74f5d979b4b224f1 (patch) | |
tree | b38440f8f1bb0ae71c749dc0b2a0aee0e1ae4755 /dir.props | |
parent | 24f5c553ba96ece53fbc20cab0d7abe860f410bc (diff) | |
parent | 96f1a89a2bb007b7dbe5ccc613a0fa3f8dd323dd (diff) | |
download | coreclr-fc7225790db730e411e98c7e74f5d979b4b224f1.tar.gz coreclr-fc7225790db730e411e98c7e74f5d979b4b224f1.tar.bz2 coreclr-fc7225790db730e411e98c7e74f5d979b4b224f1.zip |
Merge branch 'master' into master-merge
Diffstat (limited to 'dir.props')
-rw-r--r-- | dir.props | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -10,6 +10,12 @@ <OsEnvironment Condition="'$(OsEnvironment)'==''">$(OS)</OsEnvironment> </PropertyGroup> + <!-- Set the kind of PDB to Portable and turn on SourceLink (fetching source from GitHub) --> + <PropertyGroup> + <DebugType Condition="'$(DebugType)' == ''">Portable</DebugType> + <UseSourceLink>true</UseSourceLink> + </PropertyGroup> + <!-- Version numbers for both managed & native binaries --> <PropertyGroup> <MajorVersion>4</MajorVersion> @@ -58,8 +64,9 @@ <!-- This name is used to create a GIT repository URL https://github.com/dotnet/$(GitHubRepositoryName) used to find source code for debugging --> <GitHubRepositoryName Condition="'$(GitHubRepositoryName)' == ''">coreclr</GitHubRepositoryName> - <PackagesDir>$(__PackagesDir)\</PackagesDir> - <PackagesDir Condition="'$(__PackagesDir)'==''">$(ProjectDir)packages\</PackagesDir> + <PackagesDir>$(DotNetRestorePackagesPath)</PackagesDir> + <PackagesDir Condition="'$(PackagesDir)'=='' and '$(__PackagesDir)'!=''">$(__PackagesDir)\</PackagesDir> + <PackagesDir Condition="'$(PackagesDir)'==''">$(ProjectDir)packages\</PackagesDir> <RootBinDir>$(__RootBinDir)\</RootBinDir> <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir> @@ -160,8 +167,8 @@ <CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm64'">x64</CrossTargetComponentFolder> <CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm'">x86</CrossTargetComponentFolder> - <PackageOutputPath>$(PackagesBinDir)/pkg/</PackageOutputPath> - <SymbolPackageOutputPath>$(PackagesBinDir)/symbolpkg/</SymbolPackageOutputPath> + <PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(PackagesBinDir)/pkg/</PackageOutputPath> + <SymbolPackageOutputPath Condition="'$(SymbolPackageOutputPath)' == ''">$(PackagesBinDir)/symbolpkg/</SymbolPackageOutputPath> <PackageIndexFile>$(MSBuildThisFileDirectory)/src/.nuget/packageIndex.json</PackageIndexFile> <!-- coreclr doesn't currently use the index so don't force it to be in sync --> @@ -182,6 +189,6 @@ </ItemGroup> <!-- Use Roslyn Compilers to build --> - <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'!='true' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false'" /> - <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'=='true' and Exists('$(RoslynPropsFile)')" /> + <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'!='true' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false' and '$(RoslynIncompatibleMsbuildVersion)' != 'true'" /> + <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'=='true' and Exists('$(RoslynPropsFile)') and '$(RoslynIncompatibleMsbuildVersion)' != 'true'" /> </Project> |