diff options
| author | Katelyn Gadd <kg@luminance.org> | 2018-08-31 18:44:27 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-08-31 18:44:27 +0300 |
| commit | a6a8abde09032805d91732c94306c79b3d7282d9 (patch) | |
| tree | 14d8341b412aabc2144ea0817f1807df411b8ffc /mcs/class/System.Reactive.Core | |
| parent | 8ac5b8e5441f8f2b26b56161a4962c997872a9d2 (diff) | |
Kill sln dependencies (#10406)
* Remove use of sln dependencies and use csproj project references instead
* Rewrite jay.vcxproj so it builds correctly even without help from the sln file
* Force pre-build event to run after references are resolved. Change how culevel.exe path is computed to be more resilient.
* [csproj] Update project files
Diffstat (limited to 'mcs/class/System.Reactive.Core')
| -rw-r--r-- | mcs/class/System.Reactive.Core/System.Reactive.Core.csproj | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mcs/class/System.Reactive.Core/System.Reactive.Core.csproj b/mcs/class/System.Reactive.Core/System.Reactive.Core.csproj index 9af8b0b3541..887fbfb3d53 100644 --- a/mcs/class/System.Reactive.Core/System.Reactive.Core.csproj +++ b/mcs/class/System.Reactive.Core/System.Reactive.Core.csproj @@ -20,11 +20,15 @@ <DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
</PropertyGroup>
- <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
- Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
- is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
+ <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
+ Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
+ is a problem to compile the Mono mscorlib.dll -->
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
+ <!-- Force the pre-build event to run after references have been resolved. The default
+ behavior is to run them before resolving references, which can cause things like
+ culevel.exe to be used before they have been built. -->
+ <PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
|