From 14d20074ffb298cc396916328897eac7f5f8c077 Mon Sep 17 00:00:00 2001
From: Katelyn Gadd <kg@luminance.org>
Date: Wed, 8 Aug 2018 17:52:37 -0700
Subject: Move to generating msbuild choose elements to get if-else selection
 behavior for sources in projects so that we don't get erroneous duplicate
 files in cases where there are both profile and host platform criteria
 (#9952)

A recent commit revealed that in cases where we select based on a mix of host platform and profile, genproj csproj files can end up with duplicate sources because the existing <ItemGroup Condition= approach could make multiple groups match for a given compile when we really just want one.

This PR changes to generating a cascade of msbuild <Choose> elements, which give if-else selection to ensure that we only ever build a single set of files.
---
 mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'mcs/class/Commons.Xml.Relaxng')

diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj
index 98840e0c06b..aa1908b9523 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj
@@ -47,6 +47,7 @@
     <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
   </ItemGroup>
   <!-- @BUILT_SOURCES@ -->
+  <!--Common files-->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -87,15 +88,16 @@
     <Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />
     <Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />
     <Compile Include="Commons.Xml\XmlDefaultReader.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>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      <Private>False</Private>
+      <Private>false</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup></ItemGroup>
+  <!--End of common files-->
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-- 
cgit v1.2.3