diff options
| author | Katelyn Gadd <kg@luminance.org> | 2018-09-02 18:54:01 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-09-02 18:54:01 +0300 |
| commit | 84af5b235e6fed68197d95448b5715fb776776dd (patch) | |
| tree | 96943321c36111bf0279c64402122d1d749c66fa /mcs/class/RabbitMQ.Client | |
| parent | 707bddeaff0848a240e4954ffa8d48bd258cd166 (diff) | |
Move the PreBuild dependency property later in the file so targets can't override it (#10429)
* Move the PreBuild dependency property later in the file so targets can't override it
* [csproj] Update project files
Diffstat (limited to 'mcs/class/RabbitMQ.Client')
| -rw-r--r-- | mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj | 10 | ||||
| -rw-r--r-- | mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj index c1270440013..bf724e2b997 100644 --- a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj +++ b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj @@ -23,10 +23,6 @@ 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>
@@ -80,6 +76,12 @@ <!-- @ALL_REFERENCES@ -->
<!-- @ALL_RESOURCES@ -->
<PropertyGroup>
+ <!-- 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>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">mono RabbitMQ.Client.Apigen.exe /n:v0_9 "/apiName:AMQP_0_9" $(ProjectDir)..\..\docs\specs\amqp0-9.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-9.cs
mono RabbitMQ.Client.Apigen.exe /n:v0_8 "/apiName:AMQP_0_8" $(ProjectDir)..\..\docs\specs\amqp0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-0-8.cs
mono RabbitMQ.Client.Apigen.exe /n:v0_8qpid "/apiName:AMQP_0_8_QPID" $(ProjectDir)..\..\docs\specs\qpid-amqp.0-8.stripped.xml $(ProjectDir)..\..\docs\specs\net_4_x-api-qpid-0-8.cs</PostBuildEvent>
diff --git a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj index d8d5c9b57fb..3a470615abc 100644 --- a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj +++ b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj @@ -24,10 +24,6 @@ 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>
@@ -198,4 +194,10 @@ </ItemGroup>
<!-- @ALL_REFERENCES@ -->
<!-- @ALL_RESOURCES@ -->
+ <PropertyGroup>
+ <!-- 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>
</Project>
\ No newline at end of file |