diff options
author | Katelyn Gadd <kg@luminance.org> | 2018-08-02 01:30:54 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-08-02 01:30:54 +0300 |
commit | feaf8ee391a09fbff2137905ac7139f9bacc99fa (patch) | |
tree | 454454ea017e91e470c79d61cf87fd63bc0ba3d3 /mcs/class/System.Json | |
parent | 09c0cc5fca642a2c9f3f8d2ef086b9d4e7e9ee0b (diff) |
Use msbuild project reference to establish dependency on genconsts instead of solution dependencies (#9670)
Using solution dependencies in ```bcl.sln``` seems flaky and seems like it might not establish the full ordering we need to ensure that ```Consts.cs``` exists before we build things that require it. Let's try using project references (where ```corlib.dll``` 'depends' on ```genconsts.exe```) instead. This should also insert the dependency for any project that includes Consts.cs instead of just corlib.
This PR also makes update-solution-files actually fail if ```genconsts.exe``` fails to build because it was driving me mad.
Part of #6886
Diffstat (limited to 'mcs/class/System.Json')
-rw-r--r-- | mcs/class/System.Json/System.Json.csproj | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mcs/class/System.Json/System.Json.csproj b/mcs/class/System.Json/System.Json.csproj index 3c7dcb989a6..6e05e03feb7 100644 --- a/mcs/class/System.Json/System.Json.csproj +++ b/mcs/class/System.Json/System.Json.csproj @@ -115,6 +115,13 @@ <Compile Include="..\..\build\common\SR.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="corefx\SR.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>
+ </ProjectReference>
</ItemGroup>
<ItemGroup></ItemGroup>
<!-- @ALL_SOURCES@ -->
|