Merge branch 'master' into release/2.2.0

Author: antonyvorontsov

examples/Examples.ConsumerConsole/Examples.ConsumerConsole.csproj

@@ -22,5 +22,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  
+
 </Project>

examples/Examples.Producer/Examples.Producer.csproj

@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\RabbitMQ.Client.Core.DependencyInjection\RabbitMQ.Client.Core.DependencyInjection.csproj" />
   </ItemGroup>

src/RabbitMQ.Client.Core.DependencyInjection/QueueService.cs

@@ -106,6 +106,9 @@ public void Dispose()
             {
                 _connection.Close();
             }
+
+            _channel?.Dispose();
+            _connection?.Dispose();
         }
 
         /// <summary>

src/RabbitMQ.Client.Core.DependencyInjection/RabbitMQ.Client.Core.DependencyInjection.csproj

@@ -9,19 +9,13 @@
     <Company />
     <Description>.Net Core library-wrapper of RabbitMQ.Client for Dependency Injection.</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageIconUrl>https://i.imgur.com/S4wyRA4.png</PackageIconUrl>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="../../LICENSE.txt">
-      <Pack>True</Pack>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="../../icon.png">
-      <Pack>True</Pack>
-    </None>
+    <None Include="..\..\icon.png" Pack="true" PackagePath="\" />
+    <None Include="..\..\LICENSE.txt" Pack="true" PackagePath="$(PackageLicenseFile)" />
   </ItemGroup>
 
   <ItemGroup>