diff options
| author | Katelyn Gadd <kg@luminance.org> | 2018-08-09 03:52:37 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-08-09 03:52:37 +0300 |
| commit | 14d20074ffb298cc396916328897eac7f5f8c077 (patch) | |
| tree | 62244a3aa5ae6c678b4ce0fa69b438c5fb8f6ccd /mcs/class/Commons.Xml.Relaxng | |
| parent | bd50f070bd693f64b2ceede91f9470ba0deb0aa1 (diff) | |
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.
Diffstat (limited to 'mcs/class/Commons.Xml.Relaxng')
| -rw-r--r-- | mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj | 6 |
1 files changed, 4 insertions, 2 deletions
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' ">
|