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/Cscompmgd/Cscompmgd.csproj | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'mcs/class/Cscompmgd/Cscompmgd.csproj')

diff --git a/mcs/class/Cscompmgd/Cscompmgd.csproj b/mcs/class/Cscompmgd/Cscompmgd.csproj
index c64a0fd3744..d0ae9b24cdc 100644
--- a/mcs/class/Cscompmgd/Cscompmgd.csproj
+++ b/mcs/class/Cscompmgd/Cscompmgd.csproj
@@ -19,11 +19,15 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../msfinal.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>
@@ -53,7 +57,6 @@
     <Compile Include="Microsoft.CSharp\Compiler.cs" />
     <Compile Include="Microsoft.CSharp\CompilerError.cs" />
     <Compile Include="Microsoft.CSharp\ErrorLevel.cs" />
-    <!--Genconsts dependency because this project includes Consts.cs-->
     <ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">
       <Name>genconsts</Name>
       <Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>
-- 
cgit v1.2.3