diff options
author | David Wrighton <davidwr@microsoft.com> | 2017-09-13 14:50:39 -0700 |
---|---|---|
committer | David Wrighton <davidwr@microsoft.com> | 2017-09-13 14:50:39 -0700 |
commit | d68f0916d0a2bf3787bc85261ef4a4f1f27f1f24 (patch) | |
tree | 6c21ac239ae268096f20d98a8db16a4b80394fd9 /dir.props | |
parent | 96fa98525e0d64459148228cde5211c475b0c25c (diff) | |
parent | e866d072042f4ad9e0811aa36e338dac781c09a5 (diff) | |
download | coreclr-d68f0916d0a2bf3787bc85261ef4a4f1f27f1f24.tar.gz coreclr-d68f0916d0a2bf3787bc85261ef4a4f1f27f1f24.tar.bz2 coreclr-d68f0916d0a2bf3787bc85261ef4a4f1f27f1f24.zip |
Merge branch 'master' into update_from_master
Diffstat (limited to 'dir.props')
-rw-r--r-- | dir.props | 19 |
1 files changed, 8 insertions, 11 deletions
@@ -22,12 +22,6 @@ <RoslynPackageName>Microsoft.Net.ToolsetCompilers</RoslynPackageName> </PropertyGroup> - <!-- Profile-based optimization data package versions --> - <PropertyGroup> - <PgoDataPackageVersion>99.99.99-master-20170712-0121</PgoDataPackageVersion> - <!--<IbcDataPackageVersion></IbcDataPackageVersion>--> - </PropertyGroup> - <!-- Switching to the .NET Core version of the BuildTools tasks seems to break numerous scenarios, such as VS intellisense and resource designer as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks. @@ -61,6 +55,9 @@ <SourceDir>$(__SourceDir)\</SourceDir> <SourceDir Condition="'$(__SourceDir)'==''">$(ProjectDir)src\</SourceDir> + <!-- This name is used to create a GIT reposiitory 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> @@ -101,6 +98,11 @@ <OutputPath Condition="'$(OutputPath)' == ''">$(BinDir)</OutputPath> </PropertyGroup> + <!-- Explicitly set BuildVersionFile before importing common. This is used by BuildVersion.targets. --> + <PropertyGroup Condition="'$(OfficialBuildId)' != ''"> + <BuildVersionFile>$(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props</BuildVersionFile> + </PropertyGroup> + <!-- Import Build tools common props file where repo-independent properties are found --> <Import Condition="Exists('$(ToolsDir)Build.Common.props')" Project="$(ToolsDir)Build.Common.props" /> @@ -144,7 +146,6 @@ pulling in different packaging dependencies. --> <PackagingTaskDir Condition="'$(TargetsWindows)' == 'true'">$(ToolsDir)net46/</PackagingTaskDir> - <BuildNumberMajor Condition="'$(BuildNumberMajor)' == ''">00001</BuildNumberMajor> <!-- defined in buildtools packaging.targets, but we need this before targets are imported --> <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform> <PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform> @@ -180,10 +181,6 @@ <PackageIndex Include="$(PackageIndexFile)" /> </ItemGroup> - <PropertyGroup> - <BuildVersionFile>$(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props</BuildVersionFile> - </PropertyGroup> - <!-- 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)')" /> |