diff options
| author | Katelyn Gadd <kg@luminance.org> | 2018-06-29 09:01:31 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2018-06-29 09:01:31 +0300 |
| commit | e271c293ee7a364a853a30f8574830ea84e0481a (patch) | |
| tree | 2cf0d6da865890a2498d6ebb3beebf3b91532041 /mcs/class/RabbitMQ.Client | |
| parent | 57b474ba90c4224c0ed0db618c2cf212cd1a0bf4 (diff) | |
Rework genproj to use gensources to build sources list for each profile and host platform (#8985)
* Update genproj makefile to include gensources
Update genproj argument parser to be more generous about displaying help
* Checkpoint
* Checkpoint
* Checkpoint
* Checkpoint
* Checkpoint
* Checkpoint
* Checkpoint
* Checkpoint
* Fix rebase issue
* Checkpoint
* Checkpoint
* Fix built sources only being added to one profile
* Fix typo
* Checkpoint
* Fix indentation
* Use csc instead of mcs
* Checkpoint
* Fix BUILT_SOURCES only being handled for the first profile processed
* Checkpoint
* Checkpoint
* Strip double slashes from paths to fix spurious csproj change
* Checkpoint
* Checkpoint
* Checkpoint
* Checkpoint: Fix genproj compilation
* Checkpoint
* Checkpoint
* Checkpoint
* Fix crash when no targets were loaded (due to an error)
* Checkpoint
* Checkpoint
* Checkpoint
* Fix TryParseTargetInto bug
* Checkpoint
* Shuffle exclude logic around so that it works correctly during genproj diffing
* Remove gensources tracing
* Checkpoint
* Fix handling of oddball sources paths from executable.make
* Fix jay not being set to build
* Fix wrong slashes being used for embedded resource paths
* [csproj] Update project files
Diffstat (limited to 'mcs/class/RabbitMQ.Client')
| -rw-r--r-- | mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj | 5 | ||||
| -rw-r--r-- | mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj | 15 |
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 f359db1da02..e74621bc3db 100644 --- a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj +++ b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj @@ -42,8 +42,8 @@ <Optimize>true</Optimize>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- @COMMON_SOURCES@ -->
- <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+ <!-- @BUILT_SOURCES@ -->
+ <ItemGroup>
<Compile Include="..\client\api\AmqpTimestamp.cs" />
<Compile Include="..\client\api\IBasicConsumer.cs" />
<Compile Include="..\client\api\IBasicProperties.cs" />
@@ -65,6 +65,7 @@ <Compile Include="AmqpMethod.cs" />
<Compile Include="Apigen.cs" />
</ItemGroup>
+ <ItemGroup></ItemGroup>
<!-- @ALL_SOURCES@ -->
<!-- @COMMON_PROJECT_REFERENCES@ -->
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj index 63bb5de724c..8e55d86fa34 100644 --- a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj +++ b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj @@ -43,8 +43,13 @@ <Optimize>true</Optimize>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- @COMMON_SOURCES@ -->
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+ <Compile Include="..\..\docs\specs\net_4_x-api-0-9.cs" />
+ <Compile Include="..\..\docs\specs\net_4_x-api-0-8.cs" />
+ <Compile Include="..\..\docs\specs\net_4_x-api-qpid-0-8.cs" />
+ </ItemGroup>
+ <!-- @BUILT_SOURCES@ -->
+ <ItemGroup>
<Compile Include="..\..\..\..\build\common\Consts.cs" />
<Compile Include="..\util\BlockingCell.cs" />
<Compile Include="..\util\DebugUtil.cs" />
@@ -55,6 +60,7 @@ <Compile Include="..\util\Semaphore.cs" />
<Compile Include="..\util\SharedQueue.cs" />
<Compile Include="..\util\XmlUtil.cs" />
+ <Compile Include="AssemblyInfo.cs" />
<Compile Include="api\AmqpTcpEndpoint.cs" />
<Compile Include="api\AmqpTimestamp.cs" />
<Compile Include="api\AmqpVersion.cs" />
@@ -79,7 +85,6 @@ <Compile Include="api\ShutdownReportEntry.cs" />
<Compile Include="api\SslHelper.cs" />
<Compile Include="api\SslOption.cs" />
- <Compile Include="AssemblyInfo.cs" />
<Compile Include="content\BasicMessageBuilder.cs" />
<Compile Include="content\BasicMessageReader.cs" />
<Compile Include="content\BytesMessageBuilder.cs" />
@@ -160,20 +165,18 @@ <Compile Include="impl\SyntaxError.cs" />
<Compile Include="impl\UnexpectedFrameException.cs" />
<Compile Include="impl\UnknownClassOrMethodException.cs" />
+ <Compile Include="impl\WireFormatting.cs" />
<Compile Include="impl\v0_8\Connection.cs" />
<Compile Include="impl\v0_8\ProtocolBase.cs" />
<Compile Include="impl\v0_8qpid\Connection.cs" />
<Compile Include="impl\v0_8qpid\ProtocolBase.cs" />
<Compile Include="impl\v0_9\Connection.cs" />
<Compile Include="impl\v0_9\ProtocolBase.cs" />
- <Compile Include="impl\WireFormatting.cs" />
<Compile Include="messagepatterns\SimpleRpcClient.cs" />
<Compile Include="messagepatterns\SimpleRpcServer.cs" />
<Compile Include="messagepatterns\Subscription.cs" />
- <Compile Include="..\..\docs\specs\net_4_x-api-0-8.cs" />
- <Compile Include="..\..\docs\specs\net_4_x-api-0-9.cs" />
- <Compile Include="..\..\docs\specs\net_4_x-api-qpid-0-8.cs" />
</ItemGroup>
+ <ItemGroup></ItemGroup>
<!-- @ALL_SOURCES@ -->
<!-- @COMMON_PROJECT_REFERENCES@ -->
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
|