Merge pull request #786 from rabbitmq/lrb-dir-structure

Remove intermediate "client" directory

Author: michaelklishin

.gitignore

@@ -110,7 +110,7 @@ UpgradeLog*.htm
 
 # Unit tests
 
-projects/client/Unit*/TestResult.xml
+projects/Unit*/TestResult.xml
 
 # Development scripts
 

Makefile

@@ -18,7 +18,7 @@ dist: rabbit-vsn ensure-deliverables ensure-universally-readable
 	rm -f $(RELEASE_DIR)/$(TMPXMLZIP)
 
 test-xbuild-units:
-	xbuild /nologo /t:RunUnitTests projects/client/Unit/RabbitMQ.Client.Unit.csproj | grep -v "warning CS2002"
+	xbuild /nologo /t:RunUnitTests projects/Unit/RabbitMQ.Client.Unit.csproj | grep -v "warning CS2002"
 
 test-xbuild: test-xbuild-units
 

RUNNING_TESTS.md

@@ -4,18 +4,16 @@ VisualStudioVersion = 16.0.29806.167
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "projects", "projects", "{068D7DC3-8E6E-4951-B9E3-272C641BF0DE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{34486CC0-D61E-46BA-9E5E-6E8EFA7C34B5}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RabbitMQ.Client", "projects\client\RabbitMQ.Client\RabbitMQ.Client.csproj", "{8C554257-5ECC-45DB-873D-560BFBB74EC8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RabbitMQ.Client", "projects\RabbitMQ.Client\RabbitMQ.Client.csproj", "{8C554257-5ECC-45DB-873D-560BFBB74EC8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unit", "projects\client\Unit\Unit.csproj", "{B8FAC024-CC03-4067-9FFC-02846FB8AE48}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unit", "projects\Unit\Unit.csproj", "{B8FAC024-CC03-4067-9FFC-02846FB8AE48}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apigen", "projects\client\Apigen\Apigen.csproj", "{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apigen", "projects\Apigen\Apigen.csproj", "{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -40,10 +38,9 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{ECCBAEE2-24C9-4C95-A88C-03B68E866F0F} = {068D7DC3-8E6E-4951-B9E3-272C641BF0DE}
-		{8C554257-5ECC-45DB-873D-560BFBB74EC8} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
-		{B8FAC024-CC03-4067-9FFC-02846FB8AE48} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
-		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
+		{8C554257-5ECC-45DB-873D-560BFBB74EC8} = {068D7DC3-8E6E-4951-B9E3-272C641BF0DE}
+		{B8FAC024-CC03-4067-9FFC-02846FB8AE48} = {068D7DC3-8E6E-4951-B9E3-272C641BF0DE}
+		{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2} = {068D7DC3-8E6E-4951-B9E3-272C641BF0DE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3C6A0C44-FA63-4101-BBF9-2598641167D1}

RabbitMQDotNetClient.sln

@@ -1,5 +1,5 @@
 @ECHO OFF
 set DOTNET_CLI_TELEMETRY_OPTOUT=1
 dotnet restore .\RabbitMQDotNetClient.sln
-dotnet run -p .\projects\client\Apigen\Apigen.csproj --apiName:AMQP_0_9_1 .\docs\specs\amqp0-9-1.stripped.xml .\gensrc\autogenerated-api-0-9-1.cs
+dotnet run -p .\projects\Apigen\Apigen.csproj --apiName:AMQP_0_9_1 .\docs\specs\amqp0-9-1.stripped.xml .\gensrc\autogenerated-api-0-9-1.cs
 dotnet build .\RabbitMQDotNetClient.sln

build.bat

@@ -14,7 +14,7 @@ fi
 cd "$script_dir"
 
 dotnet restore ./RabbitMQDotNetClient.sln
-dotnet run -p ./projects/client/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 \
+dotnet run -p ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 \
     ./docs/specs/amqp0-9-1.stripped.xml \
     ./gensrc/autogenerated-api-0-9-1.cs
 dotnet build ./RabbitMQDotNetClient.sln

build.sh

@@ -25,14 +25,14 @@
     <MinVerTagPrefix>v</MinVerTagPrefix>
     <MinVerVerbosity>minimal</MinVerVerbosity>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageOutputPath>..\..\..\packages</PackageOutputPath>
+    <PackageOutputPath>..\..\packages</PackageOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\..\gensrc\autogenerated-api-0-9-1.cs" />
+    <Compile Include="..\..\gensrc\autogenerated-api-0-9-1.cs" />
     <None Remove="icon.png" />
     <Content Include="icon.png" PackagePath="" />
-    <None Include="..\..\..\LICENSE" Pack="true" PackagePath="" />
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
       <_Parameter1>Unit, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5</_Parameter1>
     </AssemblyAttribute>

projects/client/Apigen/Apigen.csproj renamed to projects/Apigen/Apigen.csproj

@@ -436,11 +436,11 @@ internal Process ExecRabbitMQCtl(string args)
             }
             else if (IsRunningOnMonoOrDotNetCore())
             {
-                rabbitmqctlPath = "../../../../../../../rabbit/scripts/rabbitmqctl";
+                rabbitmqctlPath = "../../../../../../rabbit/scripts/rabbitmqctl";
             }
             else
             {
-                rabbitmqctlPath = @"..\..\..\..\..\..\..\rabbit\scripts\rabbitmqctl.bat";
+                rabbitmqctlPath = @"..\..\..\..\..\..\rabbit\scripts\rabbitmqctl.bat";
             }
 
             return ExecCommand(rabbitmqctlPath, args);