Skip to content

Commit 825399b

Browse files
author
Vlad Ionescu
committed
fixing merge conflicts
1 parent a627f70 commit 825399b

16 files changed

+562
-334
lines changed

‎.hgignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ rabbit\.snk$
77

88
^scratch$
99
^releases/
10+
^build$
11+
^commit$
12+
^diff$
13+
^src/wcf/RabbitMQ\.ServiceModel/RabbitMQ\.ServiceModel\.xml
14+
^src/wcf/RabbitMQ\.ServiceModel/AssemblyInfo\.cs$
15+
1016
^wix/dotnet-client-merge-module\.wxs$
1117
^wix/dotnet-client-product\.wxs$
1218
^wix/License\.rtf$
@@ -15,6 +21,8 @@ rabbit\.snk$
1521
^.*\.suo$
1622
^RabbitMQDotNetClient\.sln\.proj$
1723
^RabbitMQDotNetClient\.sln\.cache$
24+
^UpgradeLog\.XML$
25+
^\_UpgradeReport\_Files/
1826
^gensrc/
1927
^projects/.*/.*\.csproj\.user$
2028
^projects/client/Unit/TestResult\.xml$

‎RabbitMQDotNetClient.sln

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "projects", "projects", "{06
55
EndProject
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}"
77
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wcf", "wcf", "{9093855F-C802-407D-B127-CADD8F92FCD8}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{23B4D18E-E5D3-4BF8-A488-021B96A5DD72}"
11+
EndProject
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{78D13AD2-B1AC-442C-95C8-958D643FC40B}"
13+
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wcf", "wcf", "{EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69}"
15+
EndProject
16+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConfigDemo", "ConfigDemo", "{20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD}"
17+
EndProject
818
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.ApigenBootstrap", "projects\client\ApigenBootstrap\RabbitMQ.Client.ApigenBootstrap.csproj", "{CC8F4572-6730-4C4D-A0BB-15151E2A26AE}"
919
EndProject
1020
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Apigen", "projects\client\Apigen\RabbitMQ.Client.Apigen.csproj", "{9E8B8DC5-3837-46E9-90D7-8391CC62AB45}"
@@ -16,14 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client", "projects
1626
EndProject
1727
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Unit", "projects\client\Unit\RabbitMQ.Client.Unit.csproj", "{DC9022AA-DC30-4871-AD28-3F166E05DBB5}"
1828
EndProject
19-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wcf", "wcf", "{9093855F-C802-407D-B127-CADD8F92FCD8}"
20-
EndProject
2129
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.ServiceModel", "projects\wcf\RabbitMQ.ServiceModel\RabbitMQ.ServiceModel.csproj", "{5117232B-EE07-46F8-8AF5-2B636F1DBF56}"
2230
EndProject
23-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{23B4D18E-E5D3-4BF8-A488-021B96A5DD72}"
24-
EndProject
25-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{78D13AD2-B1AC-442C-95C8-958D643FC40B}"
26-
EndProject
2731
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.AddClient", "projects\examples\client\AddClient\RabbitMQ.Client.Examples.AddClient.csproj", "{F03945AD-08C5-4531-805C-5B0BA110E9CF}"
2832
EndProject
2933
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.AddServer", "projects\examples\client\AddServer\RabbitMQ.Client.Examples.AddServer.csproj", "{95E9B6BE-FCA4-4C59-AFAB-1D974D972981}"
@@ -42,10 +46,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.Se
4246
EndProject
4347
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.SingleGet", "projects\examples\client\SingleGet\RabbitMQ.Client.Examples.SingleGet.csproj", "{6BF8B993-1722-446E-89B3-7BAC6066BECC}"
4448
EndProject
45-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wcf", "wcf", "{EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69}"
46-
EndProject
47-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConfigDemo", "ConfigDemo", "{20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD}"
48-
EndProject
4949
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.ServiceModel.Examples.ConfigDemo.Client", "projects\examples\wcf\configDemo\Client\RabbitMQ.ServiceModel.Examples.ConfigDemo.Client.csproj", "{201B37E1-9BFC-4A01-9760-30C5BB19CFE3}"
5050
EndProject
5151
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.ServiceModel.Examples.ConfigDemo.Server", "projects\examples\wcf\configDemo\Server\RabbitMQ.ServiceModel.Examples.ConfigDemo.Server.csproj", "{8D0DEB29-349C-4617-B61E-B22DE144BD22}"
@@ -54,6 +54,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.ServiceModel.Examp
5454
EndProject
5555
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.ServiceModel.Test", "projects\examples\wcf\Test\RabbitMQ.ServiceModel.Test.csproj", "{39CA1299-1F9E-452E-AA00-4BF874944B1E}"
5656
EndProject
57+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.ShutdownableClient", "projects\examples\client\ShutdownableClient\RabbitMQ.Client.Examples.ShutdownableClient.csproj", "{44D14FF0-1015-4AAA-ABCA-BF611879816C}"
58+
EndProject
59+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.ShutdownableServer", "projects\examples\client\ShutdownableServer\RabbitMQ.Client.Examples.ShutdownableServer.csproj", "{8BCE15DB-C92F-4FA4-AE57-9CA73DE91EB2}"
60+
EndProject
5761
Global
5862
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5963
Debug|Any CPU = Debug|Any CPU
@@ -168,6 +172,18 @@ Global
168172
{39CA1299-1F9E-452E-AA00-4BF874944B1E}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
169173
{39CA1299-1F9E-452E-AA00-4BF874944B1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
170174
{39CA1299-1F9E-452E-AA00-4BF874944B1E}.Release|Any CPU.Build.0 = Release|Any CPU
175+
{44D14FF0-1015-4AAA-ABCA-BF611879816C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
176+
{44D14FF0-1015-4AAA-ABCA-BF611879816C}.Debug|Any CPU.Build.0 = Debug|Any CPU
177+
{44D14FF0-1015-4AAA-ABCA-BF611879816C}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
178+
{44D14FF0-1015-4AAA-ABCA-BF611879816C}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
179+
{44D14FF0-1015-4AAA-ABCA-BF611879816C}.Release|Any CPU.ActiveCfg = Release|Any CPU
180+
{44D14FF0-1015-4AAA-ABCA-BF611879816C}.Release|Any CPU.Build.0 = Release|Any CPU
181+
{8BCE15DB-C92F-4FA4-AE57-9CA73DE91EB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
182+
{8BCE15DB-C92F-4FA4-AE57-9CA73DE91EB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
183+
{8BCE15DB-C92F-4FA4-AE57-9CA73DE91EB2}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
184+
{8BCE15DB-C92F-4FA4-AE57-9CA73DE91EB2}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
185+
{8BCE15DB-C92F-4FA4-AE57-9CA73DE91EB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
186+
{8BCE15DB-C92F-4FA4-AE57-9CA73DE91EB2}.Release|Any CPU.Build.0 = Release|Any CPU
171187
EndGlobalSection
172188
GlobalSection(SolutionProperties) = preSolution
173189
HideSolutionNode = FALSE
@@ -192,6 +208,8 @@ Global
192208
{A626CC84-04E9-4614-A389-FCE3122BE6BC} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
193209
{23680866-F877-4E06-B999-FDFD0B6A8CF6} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
194210
{6BF8B993-1722-446E-89B3-7BAC6066BECC} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
211+
{44D14FF0-1015-4AAA-ABCA-BF611879816C} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
212+
{8BCE15DB-C92F-4FA4-AE57-9CA73DE91EB2} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
195213
{20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD} = {EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69}
196214
{39CA1299-1F9E-452E-AA00-4BF874944B1E} = {EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69}
197215
{201B37E1-9BFC-4A01-9760-30C5BB19CFE3} = {20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD}

‎projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@
144144
<Compile Include="src\client\api\QueueingBasicConsumer.cs" />
145145
<Compile Include="src\client\api\ShutdownEventArgs.cs" />
146146
<Compile Include="src\client\api\ShutdownInitiator.cs" />
147-
<Compile Include="src\client\api\ShutdownReportEntry.cs" />
147+
<Compile Include="src\client\api\ShutdownReportEntry.cs" />
148+
<Compile Include="src\client\api\SslHelper.cs" />
149+
<Compile Include="src\client\api\SslOption.cs" />
148150
<Compile Include="src\client\content\BasicMessageBuilder.cs" />
149151
<Compile Include="src\client\content\BasicMessageReader.cs" />
150152
<Compile Include="src\client\content\BytesMessageBuilder.cs" />

‎src/client/api/SslHelper.cs renamed to ‎projects/client/RabbitMQ.Client/src/client/api/SslHelper.cs

File renamed without changes.

‎src/client/api/SslOption.cs renamed to ‎projects/client/RabbitMQ.Client/src/client/api/SslOption.cs

File renamed without changes.

‎projects/client/Unit/RabbitMQ.Client.Unit.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,13 @@
6666
<Compile Include="src\unit\TestFieldTableFormatting.cs" />
6767
<Compile Include="src\unit\TestMapMessage.cs" />
6868
<Compile Include="src\unit\TestMethodArgumentCodec.cs" />
69-
<Compile Include="src\unit\TestNetworkBinaryCodec.cs" />
69+
<Compile Include="src\unit\TestNetworkBinaryCodec.cs" />
70+
<Compile Include="src\unit\TestPropertiesClone.cs" />
7071
<Compile Include="src\unit\TestPublicationAddress.cs" />
7172
<Compile Include="src\unit\TestSemaphore.cs" />
72-
<Compile Include="src\unit\TestSharedQueue.cs" />
73+
<Compile Include="src\unit\TestSharedQueue.cs" />
74+
<Compile Include="src\unit\TestSslEndpointUnverified.cs" />
75+
<Compile Include="src\unit\TestSslEndpointVerified.cs" />
7376
<Compile Include="src\unit\TestStreamWireFormatting.cs" />
7477
<Compile Include="src\unit\WireFormattingFixture.cs" />
7578
</ItemGroup>

‎src/unit/TestPropertiesClone.cs renamed to ‎projects/client/Unit/src/unit/TestPropertiesClone.cs

File renamed without changes.

0 commit comments

Comments
 (0)