diff options
| author | Pallavi Taneja <pallavit@microsoft.com> | 2015-05-14 17:37:35 -0700 |
|---|---|---|
| committer | Pallavi Taneja <pallavit@microsoft.com> | 2015-05-14 19:51:27 -0700 |
| commit | 90198e49936fac468ff42e1dd0a6d96ea666903c (patch) | |
| tree | 91da1e000e5e38499c8a545604f7ae394730f417 /src | |
| parent | 2cd11d1101f7d98ed28bbe61d6c21e5c2d0be45c (diff) | |
| download | coreclr-90198e49936fac468ff42e1dd0a6d96ea666903c.tar.gz coreclr-90198e49936fac468ff42e1dd0a6d96ea666903c.tar.bz2 coreclr-90198e49936fac468ff42e1dd0a6d96ea666903c.zip | |
Update the OSS mscorlib to match the closed one by doing the following
1. Updated the location from where we pick up the whitelists.
2. Updated the debug flag to debug+ debug:pdbOnly
3. Removed the CODE_ANALYSIS flag from the ret builds.
[tfs-changeset: 1471259]
Diffstat (limited to 'src')
| -rw-r--r-- | src/mscorlib/mscorlib.csproj | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mscorlib/mscorlib.csproj b/src/mscorlib/mscorlib.csproj index ae6b173978..0be5106585 100644 --- a/src/mscorlib/mscorlib.csproj +++ b/src/mscorlib/mscorlib.csproj @@ -41,7 +41,7 @@ <DelaySign>true</DelaySign> <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)' == ''">$(MSBuildThisFileDirectory)Tools\Signing\PublicTestKey.snk</AssemblyOriginatorKeyFile> - <DefineConstants>$(DefineConstants);NEW_EXPERIMENTAL_ASYNC_IO;_USE_NLS_PLUS_TABLE;RESOURCE_SATELLITE_CONFIG;INSIDE_CLR;CODE_ANALYSIS_BASELINE;CODE_ANALYSIS</DefineConstants> + <DefineConstants>$(DefineConstants);NEW_EXPERIMENTAL_ASYNC_IO;_USE_NLS_PLUS_TABLE;RESOURCE_SATELLITE_CONFIG;INSIDE_CLR;CODE_ANALYSIS_BASELINE</DefineConstants> </PropertyGroup> <!-- Platform specific properties --> @@ -70,9 +70,11 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <DefineConstants>DBG;_DEBUG;_LOGGING;DEBUG;TRACE;$(DefineConstants)</DefineConstants> + <DefineConstants Condition="'$(Platform)' == 'x86' or '$(Platform)' == 'amd64'">CODE_ANALYSIS;$(DefineConstants)</DefineConstants> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)' == 'Release'"> - <DebugType>pdbonly</DebugType> + <DebugSymbols>true</DebugSymbols> + <DebugType>pdbOnly</DebugType> <DefineConstants>TRACE;$(DefineConstants)</DefineConstants> </PropertyGroup> |