summaryrefslogtreecommitdiff
path: root/dir.props
diff options
context:
space:
mode:
authorMichal Strehovsk√Ĺ <michals@microsoft.com>2017-11-02 20:58:31 (GMT)
committerMichal Strehovsk√Ĺ <michals@microsoft.com>2017-11-02 20:58:31 (GMT)
commitfc7225790db730e411e98c7e74f5d979b4b224f1 (patch)
treeb38440f8f1bb0ae71c749dc0b2a0aee0e1ae4755 /dir.props
parent24f5c553ba96ece53fbc20cab0d7abe860f410bc (diff)
parent96f1a89a2bb007b7dbe5ccc613a0fa3f8dd323dd (diff)
downloadcoreclr-fc7225790db730e411e98c7e74f5d979b4b224f1.zip
coreclr-fc7225790db730e411e98c7e74f5d979b4b224f1.tar.gz
coreclr-fc7225790db730e411e98c7e74f5d979b4b224f1.tar.bz2
Merge branch 'master' into master-merge
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props19
1 files changed, 13 insertions, 6 deletions
diff --git a/dir.props b/dir.props
index 62677f7..56ee07c 100644
--- a/dir.props
+++ b/dir.props
@@ -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>