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/System.Net.Http.Formatting | |
| 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/System.Net.Http.Formatting')
| -rw-r--r-- | mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj index 2476b1242fa..a5c78c8d7b7 100644 --- a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj +++ b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj @@ -45,6 +45,7 @@ </PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- @BUILT_SOURCES@ -->
+ <!--Common files-->
<ItemGroup>
<Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Bson\BsonBinaryType.cs" />
<Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Bson\BsonBinaryWriter.cs" />
@@ -283,7 +284,7 @@ <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\UriExtensions.cs" />
<Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />
</ItemGroup>
- <ItemGroup></ItemGroup>
+ <!--End of common files-->
<!-- @ALL_SOURCES@ -->
<!-- @COMMON_PROJECT_REFERENCES@ -->
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
|