merge

Author: kjnilsson

.gitignore

@@ -20,6 +20,12 @@ TestResult.xml
 rabbit-mock.snk
 .vscode/
 
+test.sh
+*.VisualState.xml
+test-output.log
+InternalTrace*
+nunit-agent*
+>>>>>>> origin/rabbitmq-dotnet-client-192
 #################
 ## Visual Studio
 #################

CODE_OF_CONDUCT.md

@@ -0,0 +1,44 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open
+and welcoming community, we pledge to respect all people who contribute through reporting
+issues, posting feature requests, updating documentation, submitting pull requests or
+patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for
+everyone, regardless of level of experience, gender, gender identity and expression,
+sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
+religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+ * The use of sexualized language or imagery
+ * Personal attacks
+ * Trolling or insulting/derogatory comments
+ * Public or private harassment
+ * Publishing other's private information, such as physical or electronic addresses,
+   without explicit permission
+ * Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments,
+commits, code, wiki edits, issues, and other contributions that are not aligned to this
+Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors
+that they deem inappropriate, threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to fairly and
+consistently applying these principles to every aspect of managing this project. Project
+maintainers who do not follow or enforce the Code of Conduct may be permanently removed
+from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces when an
+individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
+contacting a project maintainer at [[email protected]](mailto:[email protected]). All complaints will
+be reviewed and investigated and will result in a response that is deemed necessary and
+appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
+with regard to the reporter of an incident.
+
+This Code of Conduct is adapted from the
+[Contributor Covenant](http://contributor-covenant.org), version 1.3.0, available at
+[contributor-covenant.org/version/1/3/0/](http://contributor-covenant.org/version/1/3/0/)

CONTRIBUTING.md

@@ -8,7 +8,6 @@ Pull requests is the primary place of discussing code changes.
 The process is fairly standard:
 
  * Fork the repository or repositories you plan on contributing to
- * Copy `Local.props.example` into `Local.props` and make adjustments if necessary, otherwise the Solution won't load
  * Clone [RabbitMQ umbrella repository](https://github.com/rabbitmq/rabbitmq-public-umbrella)
  * `cd umbrella`, `make co`
  * Create a branch with a descriptive name in the relevant repositories
@@ -21,22 +20,9 @@ If what you are going to work on is a substantial change, please first ask the c
 of their opinion on [RabbitMQ mailing list](https://groups.google.com/forum/#!forum/rabbitmq-users).
 
 
-## (Brief) Code of Conduct
+## Code of Conduct
 
-In one line: don't be a dick.
-
-Be respectful to the maintainers and other contributors. Open source
-contributors put long hours into developing projects and doing user
-support. Those projects and user support are available for free. We
-believe this deserves some respect.
-
-Be respectful to people of all races, genders, religious beliefs and
-political views. Regardless of how brilliant a pull request is
-technically, we will not tolerate disrespectful or aggressive
-behaviour.
-
-Contributors who violate this straightforward Code of Conduct will see
-their pull requests closed and locked.
+See [CODE_OF_CONDUCT.md](./CODE_OF_CONDUCT.md).
 
 
 ## Contributor Agreement

RUNNING_TESTS.md

@@ -37,3 +37,9 @@ On Windows run:
 On osx/linux run:
 
     run-test.sh
+
+
+Running individual tests and fixtures on Windows is trivial using the Visual Studio test runner.
+To run a single test fixture on osx/linux you can use:
+    
+    ./fake.sh Test fixture=MyNameSpace.MyFixture

appveyor.yml

@@ -1,4 +1,4 @@
-version: "3.5.5.{build}"
+version: "3.6.3.{build}"
 
 platform: Any CPU
 configuration: Release
@@ -43,5 +43,7 @@ after_build:
 
 artifacts:
   - path: '*.nupkg'
+  - path: '*.log'
+    name: Logs
 
 deploy: off

build.fsx

@@ -58,6 +58,13 @@ let amqpSpec0_9BaseName = "amqp0-9.stripped.xml"
 let amqpSpec0_9_1i = specsDir </> amqpSpec0_9_1BaseName
 let autogeneratedApi0_9_1BaseName = "autogenerated-api-0-9-1.cs"
 
+let setRabbitMqCtlPath () =
+    let current = Environment.GetEnvironmentVariable "RABBITMQ_RABBITMQCTL_PATH" 
+    let ctlPath = __SOURCE_DIRECTORY__ </> "../rabbit/scripts/rabbitmqctl"
+    if current = null then
+        trace <| sprintf "setting RABBITMQ_RABBITMQCTL_PATH to %s" ctlPath
+        Environment.SetEnvironmentVariable("RABBITMQ_RABBITMQCTL_PATH", ctlPath)
+
 let createGensrcDirs () =
     projects
     |> List.map (fun p -> "./gensrc" </> p)
@@ -117,36 +124,47 @@ Target "UpdateAssemblyInfos"
         ReplaceAssemblyInfoVersionsBulk assemblyInfos (fun f -> 
             { f with AssemblyVersion = version }))    
 
-let test excludes =
+let test ``where`` =
+    setRabbitMqCtlPath ()
+    let w =
+        match ``where``, getBuildParamOrDefault "where" "" with
+        | (""|null), w -> w
+        | _, (""|null) -> ``where``
+        | w, x ->
+            sprintf "(%s) & (%s)" w x
+    trace <| sprintf "where %s" w 
     !! ("./projects/client/**/build/**/unit-tests.dll")
-    |> NUnit (fun p -> 
+    |> Testing.NUnit3.NUnit3 (fun p ->
         { p with
+            Labels = Testing.NUnit3.LabelsLevel.All
+            ProcessModel = Testing.NUnit3.SingleProcessModel
             TimeOut = TimeSpan.FromMinutes 30.
-            ExcludeCategory = excludes
-            DisableShadowCopy = true; 
-            OutputFile = "./TestResults.xml"})
+            Where = w 
+            OutputDir = "test-output.log"})
 
 Target "Test" (fun _ ->  
     match buildEnv with
-    | Mono -> "MonoBug"
+    | Mono -> "cat != MonoBug"
     | _ -> "" 
     |> test)
 
 Target "TestQuick" (fun _ ->  
-    let excludes =
+    setRabbitMqCtlPath ()
+    let ``where`` =
         match buildEnv with
-        | Mono -> "RequireSMP,LongRunning,MonoBug"
-        | _ -> "RequireSMP,LongRunning"
+        | Mono -> "cat != RequireSMP & cat != LongRunning & cat != MonoBug"
+        | _ -> "cat != RequireSMP & cat != LongRunning"
     !! ("./projects/client/Unit/build/**/unit-tests.dll")
-    |> NUnit (fun p -> 
+    |> Testing.NUnit3.NUnit3 (fun p -> 
         { p with
+            Labels = Testing.NUnit3.LabelsLevel.All
+            ProcessModel = Testing.NUnit3.SingleProcessModel
             TimeOut = TimeSpan.FromMinutes 30.
-            ExcludeCategory = excludes
-            DisableShadowCopy = true; 
-            OutputFile = "./TestResults.xml"}))
-    
+            Where = ``where``
+            OutputDir = "test-output.log"}))
+
 Target "AppVeyorTest" (fun _ ->  
-    test "RequireSMP,LongRunning,GCTest")
+    test "cat != RequireSMP & cat != LongRunning & cat != GCTest")
 
 Target "CreateGensrcDir" createGensrcDirs
 

fake.bat

@@ -2,7 +2,7 @@
 IF %1 == "" GOTO End
 .paket\paket.bootstrapper.exe
 .paket\paket.exe restore
-packages\FAKE\tools\FAKE.exe build.fsx %1
+packages\FAKE\tools\FAKE.exe build.fsx %*
 
 :End
 ECHO "no target specified"

fake.sh

@@ -4,4 +4,4 @@ set -e
 
 mono .paket/paket.bootstrapper.exe
 mono .paket/paket.exe restore
-mono ./packages/FAKE/tools/FAKE.exe build.fsx $1
+mono ./packages/FAKE/tools/FAKE.exe build.fsx $@