Merge pull request #202 from rabbitmq/dotnetcore

dotnet core support

Author: michaelklishin

.gitignore

@@ -18,6 +18,8 @@ TestResult.xml
 .paket/paket.exe
 /NuGet
 rabbit-mock.snk
+.vscode/
+
 test.sh
 *.VisualState.xml
 test-output.log

BUILD_DOTNET_CORE.md

@@ -0,0 +1,8 @@
+To build the dotnet core components you need the `dotnet` command line utility installed.
+It can be obtained for your chosen platform [here](https://www.microsoft.com/net/core#macosx).
+
+ Run `./build.sh` (linux/osx) or `build.bat` (windows) to trigger code generation and complete a dotnet core build. 
+
+ To run the tests simply run `run-tests.sh` (linux/osx) or `run-tests.bat` (windows). This will run the entire test suite. There is currently no way to only run a subset of tests. 
+
+ If you get a warning saying `rabbitmqctl` cannot be found please set the `RABBITMQ_RABBITMQCLT_PATH` environment variable to point to where `rabbitmqctl` can be located.

appveyor.yml

@@ -1,4 +1,4 @@
-version: "3.6.3.{build}"
+version: "4.0.0.{build}"
 
 platform: Any CPU
 configuration: Release
@@ -13,6 +13,7 @@ environment:
 init:
   - echo %APPVEYOR_BUILD_VERSION%
   - choco install -y rabbitmq
+  - choco install -y dotnetcore-sdk -pre
 
 install:
   - IF DEFINED SNKSECRET (nuget install secure-file -ExcludeVersion)
@@ -30,20 +31,30 @@ install:
 
 before_build:
 
-build_script: fake.bat AppVeyor
+build_script: 
+    - ps: .\fake.bat GenerateApi
+    - ps: dotnet restore "projects\client\RabbitMQ.Client"
+    - ps: dotnet build "projects\client\RabbitMQ.Client"
+    - ps: dotnet pack "projects\client\RabbitMQ.Client" -c Release --version-suffix=build-$env:APPVEYOR_BUILD_NUMBER
 
 test: off
 
 after_build:
-  - ps: |
-      $semver = ${env:APPVEYOR_BUILD_VERSION} -ireplace '(\d+.\d+.\d+).(\d+)', "`$1-ci`$2-${env:APPVEYOR_REPO_BRANCH}"
-      $semver = $semver.Substring(0, [System.Math]::Min(20, $semver.Length))
-      nuget pack RabbitMQ.Client.nuspec -version $semver -symbols
-      nuget pack RabbitMQ.ServiceModel.nuspec -version $semver -symbols
 
 artifacts:
   - path: '*.nupkg'
+  - path: 'projects\client\RabbitMQ.Client\bin\Release\*.nupkg'
   - path: '*.log'
     name: Logs
 
 deploy: off
+
+nuget:
+  account_feed: true
+  project_feed: true
+  disable_publish_on_pr: true
+
+branches:
+    only:
+    - master
+    - stable

build.bat

@@ -1,4 +1,7 @@
 @ECHO OFF
 .paket\paket.bootstrapper.exe
 .paket\paket.exe restore
-packages\FAKE\tools\FAKE.exe build.fsx
+packages\FAKE\tools\FAKE.exe build.fsx GenerateApi
+
+dotnet restore .\projects\client\RabbitMQ.Client
+dotnet build .\projects\client\RabbitMQ.Client

build.sh

@@ -4,4 +4,7 @@ set -e
 
 mono .paket/paket.bootstrapper.exe
 mono .paket/paket.exe restore
-mono ./packages/FAKE/tools/FAKE.exe build.fsx
+mono ./packages/FAKE/tools/FAKE.exe build.fsx GenerateApi
+
+dotnet restore ./projects/client/RabbitMQ.Client
+dotnet build ./projects/client/RabbitMQ.Client

projects/client/RabbitMQ.Client/Program.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace ConsoleApplication
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            Console.WriteLine("Hello World!");
+        }
+    }
+}

projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj renamed to projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj_old

@@ -182,7 +182,6 @@
     <Compile Include="src\client\impl\StreamProperties.cs" />
     <Compile Include="src\client\impl\SyntaxError.cs" />
     <Compile Include="src\client\impl\TcpClientAdapter.cs" />
-    <Compile Include="src\client\impl\TunneledTcpClient.cs" />
     <Compile Include="src\client\impl\UnexpectedFrameException.cs" />
     <Compile Include="src\client\impl\UnknownClassOrMethodException.cs" />
     <Compile Include="src\client\impl\WireFormatting.cs" />
@@ -207,4 +206,4 @@
   <Target Name="BeforeBuild" DependsOnTargets="" />
   <!-- Custom BeforeClean -->
   <Target Name="BeforeClean" DependsOnTargets="" />
-</Project>
+</Project>

projects/client/RabbitMQ.Client/project.json

@@ -0,0 +1,59 @@
+{
+  "version": "4.0.0-*",
+  "buildOptions": {
+    "emitEntryPoint": false,
+    "compile": {
+      "exclude": [
+        "build",
+        "src/util/XmlUtil.cs"
+      ],
+      "include": [
+        "../../../gensrc/RabbitMQ.Client/autogenerated-api-0-9-1.cs"
+      ]
+    }
+  },
+  "dependencies": {
+  },
+  "frameworks": {
+    "net45": {},
+    /*
+    ".NETPortable,Version=v4.0,Profile=Profile32":{
+     "buildOptions": {
+      "define": [ "PORTABLE32", "NETFX_CORE" ] }, 
+      "frameworkAssemblies":{ 
+      	"mscorlib":"", 
+	"System":"", 
+	"System.Core":"", 
+	"System.Net":"",
+	"System.Net.Sockets":"",
+	"System.Threading":""
+	 }
+	},
+	*/
+    //"netcore45": {},
+    "netstandard1.5": {
+      "buildOptions": {
+        "define": [ "CORECLR" ]
+      },
+      "imports": ["dnxcore50", "portable-net45+win81"],
+      "dependencies": {
+       "NETStandard.Library": "1.5.0-rc2-24027",
+       "System.Net.Security": "4.0.0-rc2-24027",
+       "System.Net.NameResolution": "4.0.0-rc2-24027",
+       "System.Threading.Thread": "4.0.0-rc2-24027"
+       /*
+       "System.Runtime": "4.1.0-rc2-24027",
+       "System.Runtime.Serialization.Primitives":  "4.1.1-rc2-24027",
+       "System.ComponentModel.EventBasedAsync":  "4.0.11-rc2-24027",
+       "System.Xml.ReaderWriter": "4.0.11-rc2-24027",
+       "System.Xml.XDocument": "4.0.11-rc2-24027",
+       "System.Xml.XmlDocument": "4.0.1-rc2-24027",
+       "System.Xml.XmlSerializer": "4.0.11-rc2-24027",
+       "System.Net.Sockets": "4.1.0-rc2-24027",
+       "System.Threading": "4.0.11-rc2-24027",
+       "System.Threading.Tasks": "4.0.11-rc2-24027"
+       */
+      }
+    }
+  }
+}