diff options
| author | Katelyn Gadd <kg@luminance.org> | 2018-08-31 18:44:27 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-08-31 18:44:27 +0300 |
| commit | a6a8abde09032805d91732c94306c79b3d7282d9 (patch) | |
| tree | 14d8341b412aabc2144ea0817f1807df411b8ffc /mcs/class/Commons.Xml.Relaxng | |
| parent | 8ac5b8e5441f8f2b26b56161a4962c997872a9d2 (diff) | |
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
Diffstat (limited to 'mcs/class/Commons.Xml.Relaxng')
| -rw-r--r-- | mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj index aa1908b9523..49ae51c87f6 100644 --- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj +++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj @@ -19,11 +19,15 @@ <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../mono.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>
@@ -88,7 +92,6 @@ <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>
@@ -96,6 +99,13 @@ <CopyToOutputDirectory>Never</CopyToOutputDirectory>
<Private>false</Private>
</ProjectReference>
+ <ProjectReference Include="$(SolutionDir)\mcs\jay\jay.vcxproj">
+ <Name>jay</Name>
+ <Project>{5d485d32-3b9f-4287-ab24-c8da5b89f537}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+ <Private>false</Private>
+ </ProjectReference>
</ItemGroup>
<!--End of common files-->
<!-- @ALL_SOURCES@ -->
|