merging bug21476 into default

Author: Vlad Ionescu

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Warning! This file contains important customizations. Using Visual Studio to edit project's properties might break things. -->
 
@@ -242,7 +242,6 @@
     <Compile Include="src\util\Either.cs" />
     <Compile Include="src\util\NetworkBinaryReader.cs" />
     <Compile Include="src\util\NetworkBinaryWriter.cs" />
-    <Compile Include="src\util\Semaphore.cs" />
     <Compile Include="src\util\SharedQueue.cs" />
     <Compile Include="src\util\XmlUtil.cs" />
   </ItemGroup>

projects/client/RabbitMQ.Client/src/util/Semaphore.cs

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Warning! This file contains important customizations. Using Visual Studio to edit project's properties might break things. -->
 
@@ -69,7 +69,6 @@
     <Compile Include="src\unit\TestNetworkBinaryCodec.cs" />
     <Compile Include="src\unit\TestPropertiesClone.cs" />
     <Compile Include="src\unit\TestPublicationAddress.cs" />
-    <Compile Include="src\unit\TestSemaphore.cs" />
     <Compile Include="src\unit\TestSharedQueue.cs" />
     <Compile Include="src\unit\TestSslEndpointUnverified.cs" />
     <Compile Include="src\unit\TestSslEndpointVerified.cs" />

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

@@ -159,7 +159,6 @@
                         <File Id="file81" Name="TY32A5_1.HTM" LongName="type-RabbitMQ.Util.EitherAlternative.html" Vital="yes" />
                         <File Id="file82" Name="TY3355_1.HTM" LongName="type-RabbitMQ.Util.NetworkBinaryReader.html" Vital="yes" />
                         <File Id="file83" Name="TYDDDB_1.HTM" LongName="type-RabbitMQ.Util.NetworkBinaryWriter.html" Vital="yes" />
-                        <File Id="file84" Name="TYD1DA_1.HTM" LongName="type-RabbitMQ.Util.Semaphore.html" Vital="yes" />
                         <File Id="file85" Name="TYC72D_1.HTM" LongName="type-RabbitMQ.Util.SharedQueue.html" Vital="yes" />
                         <File Id="file86" Name="TY07F9_1.HTM" LongName="type-RabbitMQ.Util.XmlUtil.html" Vital="yes" />
                     </Component>