diff options
author | Matt Ellis <matell@microsoft.com> | 2016-01-16 01:18:26 -0800 |
---|---|---|
committer | Matt Ellis <matell@microsoft.com> | 2016-01-16 01:18:26 -0800 |
commit | 785ac21fa230a9d258bf5f2726396fc33113aa81 (patch) | |
tree | 53d7105f22be32d3aa94ebc451a2adf9a26d48ed /src/tools | |
parent | 6b8be15ff3757367d651d37268fac74fc1af5dba (diff) | |
parent | 3d5e2400c42f3f9942d68b9bf1b417c416102ca7 (diff) | |
download | coreclr-785ac21fa230a9d258bf5f2726396fc33113aa81.tar.gz coreclr-785ac21fa230a9d258bf5f2726396fc33113aa81.tar.bz2 coreclr-785ac21fa230a9d258bf5f2726396fc33113aa81.zip |
Merge pull request #2707 from dotnet-bot/from-tfs
Merge changes from TFS
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/GenClrDebugResource/native.rc | 4 | ||||
-rw-r--r-- | src/tools/InjectResource/native.rc | 4 | ||||
-rw-r--r-- | src/tools/dirs.proj | 6 |
3 files changed, 14 insertions, 0 deletions
diff --git a/src/tools/GenClrDebugResource/native.rc b/src/tools/GenClrDebugResource/native.rc index c4474f2ae4..e0ec07c71f 100644 --- a/src/tools/GenClrDebugResource/native.rc +++ b/src/tools/GenClrDebugResource/native.rc @@ -1,3 +1,7 @@ +// +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// #define FX_VER_FILEDESCRIPTION_STR "Microsoft\0" #include <fxver.h> diff --git a/src/tools/InjectResource/native.rc b/src/tools/InjectResource/native.rc index c4474f2ae4..e0ec07c71f 100644 --- a/src/tools/InjectResource/native.rc +++ b/src/tools/InjectResource/native.rc @@ -1,3 +1,7 @@ +// +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// #define FX_VER_FILEDESCRIPTION_STR "Microsoft\0" #include <fxver.h> diff --git a/src/tools/dirs.proj b/src/tools/dirs.proj index 21f28331ca..7cfd87c248 100644 --- a/src/tools/dirs.proj +++ b/src/tools/dirs.proj @@ -9,6 +9,12 @@ <BuildSysBinaries>true</BuildSysBinaries> </PropertyGroup> + <ItemDefinitionGroup> + <ProjectFile> + <ProductGroups>FX</ProductGroups> + </ProjectFile> + </ItemDefinitionGroup> + <!--The following projects will build during PHASE 1--> <ItemGroup Condition="'$(BuildExePhase)' == '1' and '$(FeatureCoreClr)' != 'true'"> <ProjectFile Include="allocationsprofiler\allocationsprofiler.nativeproj" /> |