From a6a8abde09032805d91732c94306c79b3d7282d9 Mon Sep 17 00:00:00 2001
From: Katelyn Gadd <kg@luminance.org>
Date: Fri, 31 Aug 2018 08:44:27 -0700
Subject: 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
---
 mcs/class/System.Reactive.Core/System.Reactive.Core.csproj | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'mcs/class/System.Reactive.Core')

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>
-- 
cgit v1.2.3