Merge pull request #780 from bording/misc-cleanup

michaelklishin · web-flow · commit 8aed00f0f6d3 · 2020-03-26T16:14:10.000+03:00
Misc cleanup
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ as archives.
 
 ## Supported Platforms and .NET Releases
 
-Future `6.x` versions of the library require .NET 4.6.2 or a .NET Core version implementing .NET Standard 2.0.
+Future `6.x` versions of the library require .NET 4.6.1 or a .NET Core version implementing .NET Standard 2.0.
 
 ### 5.x and 4.x
 
diff --git a/RabbitMQDotNetClient.userprefs b/RabbitMQDotNetClient.userprefs
diff --git a/projects/client/Apigen/Apigen.csproj b/projects/client/Apigen/Apigen.csproj
@@ -1,17 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyName>Apigen</AssemblyName>
     <OutputType>Exe</OutputType>
-    <PackageId>Apigen</PackageId>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
   </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="..\RabbitMQ.Client\src\client\api\AmqpTimestamp.cs;..\RabbitMQ.Client\src\client\api\IBasicConsumer.cs;..\RabbitMQ.Client\src\client\api\IBasicProperties.cs;..\RabbitMQ.Client\src\client\api\IContentHeader.cs;..\RabbitMQ.Client\src\client\api\IModel.cs;..\RabbitMQ.Client\src\client\api\PublicationAddress.cs;..\RabbitMQ.Client\src\client\api\IBasicPublishBatch.cs;..\RabbitMQ.Client\src\client\api\BasicGetResult.cs;..\RabbitMQ.Client\src\client\api\QueueDeclareOk.cs;..\RabbitMQ.Client\src\client\api\ShutdownEventArgs.cs;..\RabbitMQ.Client\src\client\api\ShutdownInitiator.cs;..\RabbitMQ.Client\src\client\events\BasicReturnEventArgs.cs;..\RabbitMQ.Client\src\client\events\BasicAckEventArgs.cs;..\RabbitMQ.Client\src\client\events\BasicNackEventArgs.cs;..\RabbitMQ.Client\src\client\events\CallbackExceptionEventArgs.cs;..\RabbitMQ.Client\src\client\events\ConsumerEventArgs.cs;..\RabbitMQ.Client\src\client\events\FlowControlEventArgs.cs;..\RabbitMQ.Client\src\client\impl\IFullModel.cs" />
   </ItemGroup>
+
 </Project>
diff --git a/projects/client/Apigen/properties/AssemblyInfo.cs b/projects/client/Apigen/properties/AssemblyInfo.cs
diff --git a/projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj b/projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj
@@ -1,23 +1,20 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Description>The RabbitMQ .NET client is the official client library for C# (and, implicitly, other .NET languages)</Description>
     <VersionPrefix>6.0.0</VersionPrefix>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>RabbitMQ.Client</AssemblyName>
-    <PackageId>RabbitMQ.Client</PackageId>
     <PackageTags>RabbitMQ</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://www.rabbitmq.com/dotnet.html</PackageProjectUrl>
     <PackageLicense>https://www.rabbitmq.com/dotnet.html</PackageLicense>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <AssemblyTitle>RabbitMQ Client Library for .NET</AssemblyTitle>
+    <Description>The RabbitMQ .NET client is the official client library for C# (and, implicitly, other .NET languages)</Description>
+    <Company>VMware, Inc. or its affiliates.</Company>
+    <Product>RabbitMQ</Product>
+    <Copyright>Copyright © 2007-2020 VMware, Inc. or its affiliates.</Copyright>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -27,22 +24,20 @@
     <AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
+
   <ItemGroup>
-    <Compile Remove="build\**\*" />
-    <Compile Include="..\..\..\gensrc\autogenerated-api-0-9-1.cs" Exclude="build\**\*;bin\**;obj\**;**\*.xproj;packages\**" />
+    <Compile Include="..\..\..\gensrc\autogenerated-api-0-9-1.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="icon.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
+    <None Remove="icon.png" />
+    <Content Include="icon.png" PackagePath="" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
-  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
+
 </Project>
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/TcpClientAdapter.cs b/projects/client/RabbitMQ.Client/src/client/impl/TcpClientAdapter.cs
@@ -27,11 +27,7 @@ public virtual async Task ConnectAsync(string host, int port)
                 throw new ArgumentException("No ip address could be resolved for " + host);
             }
 
-#if CORECLR
             await _sock.ConnectAsync(ep, port).ConfigureAwait(false);
-#else
-            await Task.Run(() => _sock.Connect(ep, port));
-#endif
         }
 
         public virtual void Close()
diff --git a/projects/client/RabbitMQ.Client/src/client/properties/AssemblyInfo.cs b/projects/client/RabbitMQ.Client/src/client/properties/AssemblyInfo.cs
@@ -41,14 +41,5 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyTitle("RabbitMQ Client Library for .NET")]
-[assembly: AssemblyDescription("See https://rabbitmq.com")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("VMware, Inc. or its affiliates.")]
-[assembly: AssemblyProduct("RabbitMQ")]
-[assembly: AssemblyCopyright("Copyright © 2007-2020 VMware, Inc. or its affiliates.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 [assembly: AssemblyVersion("6.0.0")]
 [assembly: InternalsVisibleTo("Unit, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5")]
diff --git a/projects/client/Unit/Unit.csproj b/projects/client/Unit/Unit.csproj
@@ -1,29 +1,21 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyName>Unit</AssemblyName>
-    <PackageId>Unit</PackageId>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
     <AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="../RabbitMQ.Client/RabbitMQ.Client.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="ApprovalTests" Version="4.4.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="ApprovalTests" Version="4.5.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
     <PackageReference Include="PublicApiGenerator" Version="10.0.2" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
-  </PropertyGroup>
+
 </Project>
diff --git a/projects/client/Unit/properties/AssemblyInfo.cs b/projects/client/Unit/properties/AssemblyInfo.cs
diff --git a/projects/client/Unit/src/unit/Fixtures.cs b/projects/client/Unit/src/unit/Fixtures.cs
@@ -456,7 +456,7 @@ private Process ExecRabbitMqCtlUsingDocker(string args, string dockerMachineName
                     UseShellExecute = false
                 }
             };
-            
+
             try {
                 proc.StartInfo.FileName = "docker";
                 proc.StartInfo.Arguments = $"exec {dockerMachineName} rabbitmqctl {args}";
@@ -545,7 +545,7 @@ internal void ReportExecFailure(string cmd, string args, string msg)
 
         public static bool IsRunningOnMonoOrDotNetCore()
         {
-            #if CORECLR
+            #if NETCOREAPP
             return true;
             #else
             return Type.GetType("Mono.Runtime") != null;
@@ -578,7 +578,7 @@ internal void Publish(IConnection conn)
         //
         // Connection Closure
         //
-        
+
         public class ConnectionInfo
         {
             public string Pid
diff --git a/projects/client/Unit/src/unit/TestAmqpUri.cs b/projects/client/Unit/src/unit/TestAmqpUri.cs
@@ -207,7 +207,7 @@ private void ParseSuccess(string uri, string user, string password,
 
         public static bool IsRunningOnMono()
         {
-            #if CORECLR
+            #if NETCOREAPP
             return false;
             #else
             return Type.GetType("Mono.Runtime") != null;
diff --git a/test.nunit b/test.nunit

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,7 @@ public virtual async Task ConnectAsync(string host, int port)`
`27`	`27`	`throw new ArgumentException("No ip address could be resolved for " + host);`
`28`	`28`	`}`
`29`	`29`
`30`		`-#if CORECLR`
`31`	`30`	`await _sock.ConnectAsync(ep, port).ConfigureAwait(false);`
`32`		`-#else`
`33`		`- await Task.Run(() => _sock.Connect(ep, port));`
`34`		`-#endif`
`35`	`31`	`}`
`36`	`32`
`37`	`33`	`public virtual void Close()`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ private void ParseSuccess(string uri, string user, string password,`
`207`	`207`
`208`	`208`	`public static bool IsRunningOnMono()`
`209`	`209`	`{`
`210`		`- #if CORECLR`
	`210`	`+ #if NETCOREAPP`
`211`	`211`	`return false;`
`212`	`212`	`#else`
`213`	`213`	`return Type.GetType("Mono.Runtime") != null;`