diff options
| author | Luqun Lou <luqunl@microsoft.com> | 2017-10-25 22:58:02 +0300 |
|---|---|---|
| committer | Luqun Lou <luqunl@microsoft.com> | 2017-10-25 22:58:02 +0300 |
| commit | 774effe77863aba661ea565d9bdd0e0075d49e23 (patch) | |
| tree | b17d1059db5c949a34726d9ff51818425ec98e2b /src/System.Private.Interop | |
| parent | 4526e7df2c7c2cdd7719e259e67a9d03fe0fa19f (diff) | |
DefineConstants fix for System.Private.Interop
Previous My last minute change introduces two problems:
1. in System.Private.Interop.CoreCLR.csproj file, if you use "<DefineConstants>$(DefineConstants);*</DefineConstants>" , when building it, it will define CoreRT which isn't expected.
2. in System.Private.Interop.Mono.csproj file, move "import System.Private.Interop.CoreCLR.csproj" above the PropertyGroup, so that the Properties in System.Private.Interop.Mono.csproj can overwrite Properties in System.Private.Interop.CoreCLR.csproj
[tfs-changeset: 1679184]
Diffstat (limited to 'src/System.Private.Interop')
| -rw-r--r-- | src/System.Private.Interop/src/System.Private.Interop.CoreCLR.csproj | 2 | ||||
| -rw-r--r-- | src/System.Private.Interop/src/System.Private.Interop.Mono.csproj | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/System.Private.Interop/src/System.Private.Interop.CoreCLR.csproj b/src/System.Private.Interop/src/System.Private.Interop.CoreCLR.csproj index 6c1648e5f..e8967228e 100644 --- a/src/System.Private.Interop/src/System.Private.Interop.CoreCLR.csproj +++ b/src/System.Private.Interop/src/System.Private.Interop.CoreCLR.csproj @@ -7,7 +7,7 @@ <OutputType>Library</OutputType> <ProjectGuid>{A85709C9-22D5-4704-8B7A-73751BB4386A}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <DefineConstants>$(DefineConstants);TARGET_CORE_API_SET;CORECLR</DefineConstants> + <DefineConstants>TARGET_CORE_API_SET;CORECLR</DefineConstants> <!-- Disable warning about CLSCompliant attributes on members not being needed. --> <NoWarn>$(NoWarn);3021</NoWarn> <!-- Use MSFT assembly key for compatibility with uapaot targeting pack --> diff --git a/src/System.Private.Interop/src/System.Private.Interop.Mono.csproj b/src/System.Private.Interop/src/System.Private.Interop.Mono.csproj index 66b5c1726..7c39d0962 100644 --- a/src/System.Private.Interop/src/System.Private.Interop.Mono.csproj +++ b/src/System.Private.Interop/src/System.Private.Interop.Mono.csproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> + <Import Project="System.Private.Interop.CoreCLR.csproj" /> <PropertyGroup> <AssemblyName>System.Private.Interop</AssemblyName> <TargetName>$(AssemblyName)</TargetName> @@ -35,5 +36,4 @@ <Compile Include="Windows\Foundation\TokenizerHelper.cs" /> </ItemGroup> - <Import Project="System.Private.Interop.CoreCLR.csproj" /> </Project> |