- Added GitVersion.yml using GitHubFlow branch naming and starting at…

… version 2.0.0 - Updated to RabbitMQ.Client 4.0.0-rc-1 (required several code changes) - Added netstandard1.5 and net451 build targets to the .NET Core project - Renamed DNX to Core in most places - Replaced NET_CORE conditionals with !NETFX - Updated all projects to minimum .NET 4.5.1 (required for RabbitMQ Client 4.0.0-rc-1 - Updated NUnit to the latest version (had to rewrite ExpectedException attribute to Assert.Throws)
sungam3r · Aug 13, 2016 · e44adbc · e44adbc
1 parent e4407e7
commit e44adbc
Show file tree

Hide file tree

Showing 112 changed files with 6,218 additions and 369 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -0,0 +1,6 @@
+assembly-versioning-scheme: MajorMinorPatch
+mode: ContinuousDelivery
+next-version: 2.0.0
+branches: {}
+ignore:
+  sha: []
diff --git a/Source/EasyNetQ DNX/project.json b/Source/EasyNetQ DNX/project.json
diff --git a/Source/EasyNetQ NET45/EasyNetQ NET45.csproj b/Source/EasyNetQ NET45/EasyNetQ NET45.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>EasyNetQ</RootNamespace>
     <AssemblyName>EasyNetQ</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -45,8 +45,8 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.6.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.6.0\lib\net45\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <HintPath>..\packages\RabbitMQ.Client.4.0.0-rc-1\lib\net451\RabbitMQ.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/Source/EasyNetQ NET45/Properties/AssemblyInfo.cs b/Source/EasyNetQ NET45/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -21,3 +21,7 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("a306e985-0fcf-4cc6-a1a3-d57214d1ea40")]
 
+
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyInformationalVersion("2.0.0-radicalgeek-netcore.1+1389.Branch.radicalgeek-netcore.Sha.25ca94d3585990509e1d8cd9b18071793b281965")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
diff --git a/Source/EasyNetQ NET45/app.config b/Source/EasyNetQ NET45/app.config
@@ -12,4 +12,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>
diff --git a/Source/EasyNetQ NET45/packages.config b/Source/EasyNetQ NET45/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
-  <package id="RabbitMQ.Client" version="3.6.0" targetFramework="net45" />
+  <package id="RabbitMQ.Client" version="4.0.0-rc-1" targetFramework="net451" />
 </packages>
diff --git a/Source/EasyNetQ DNX/.nuget/NuGet.Config → Source/EasyNetQ.Core/.nuget/NuGet.Config b/Source/EasyNetQ DNX/.nuget/NuGet.Config → Source/EasyNetQ.Core/.nuget/NuGet.Config
diff --git a/Source/EasyNetQ DNX/EasyNetQ DNX.xproj → Source/EasyNetQ.Core/EasyNetQ.Core.xproj b/Source/EasyNetQ DNX/EasyNetQ DNX.xproj → Source/EasyNetQ.Core/EasyNetQ.Core.xproj
diff --git a/.../EasyNetQ DNX/Internals/AsyncSemaphore.cs → ...EasyNetQ.Core/Internals/AsyncSemaphore.cs b/.../EasyNetQ DNX/Internals/AsyncSemaphore.cs → ...EasyNetQ.Core/Internals/AsyncSemaphore.cs
diff --git a/Source/EasyNetQ DNX/Internals/TaskHelpers.cs → ...ce/EasyNetQ.Core/Internals/TaskHelpers.cs b/Source/EasyNetQ DNX/Internals/TaskHelpers.cs → ...ce/EasyNetQ.Core/Internals/TaskHelpers.cs
diff --git a/...e/EasyNetQ DNX/Properties/AssemblyInfo.cs → .../EasyNetQ.Core/Properties/AssemblyInfo.cs b/...e/EasyNetQ DNX/Properties/AssemblyInfo.cs → .../EasyNetQ.Core/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -20,4 +20,9 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
+#if !NET_CORE
 [assembly: Guid("ed270a39-d32c-438a-bf4f-aa0e66c7879c")]
+#endif
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyInformationalVersion("2.0.0-radicalgeek-netcore.1+1389.Branch.radicalgeek-netcore.Sha.25ca94d3585990509e1d8cd9b18071793b281965")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
diff --git a/Source/EasyNetQ.Core/build.cmd b/Source/EasyNetQ.Core/build.cmd
@@ -0,0 +1,3 @@
+dotnet gitversion
+dotnet restore
+dotnet pack -c Release
diff --git a/Source/EasyNetQ.Core/project.json b/Source/EasyNetQ.Core/project.json
@@ -0,0 +1,130 @@
+{
+  "version": "2.0.0-radicalgeek-netc0001",
+  "description": "EasyNetQ",
+  "title": "EasyNetQ",
+  "name": "EasyNetQ",
+  "packOptions": {
+    "licenseUrl": "https://opensource.org/licenses/MIT",
+    "projectUrl": "https://github.com/EasyNetQ",
+    "owners": [
+      "Wiebe Tijsma",
+      "Michael Denny"
+    ],
+    "tags": [
+      "C#",
+      "RabbitMQ"
+    ]
+  },
+  "authors": [
+    "SapientGuardian",
+    "Wiebe Tijsma",
+    "Michael Denny"
+  ],
+  "buildOptions": {
+    "compile": [
+      "../EasyNetQ/*.cs",
+      "../EasyNetQ/**/*.cs"
+    ]
+  },
+  "dependencies": {
+    "Newtonsoft.Json": "9.0.1",
+    "RabbitMQ.Client": "4.0.0-rc-1"
+  },
+  "tools": {
+    "dotnet-gitversion": {
+      "version": "1.0.0",
+      "imports": [
+        "dotnet"
+      ]
+    }
+  },
+  "commands": {
+    "dn-version": "dotnet gitversion"
+  },
+  "frameworks": {
+    "netcoreapp1.0": {
+      "imports": "dnxcore50",
+      "buildOptions": {
+        "define": [
+          "NET_CORE"
+        ]
+      },
+      "dependencies": {
+        "System.Diagnostics.Debug": "4.0.11",
+        "System.Diagnostics.Tools": "4.0.1",
+        "System.Dynamic.Runtime": "4.0.11",
+        "System.Globalization": "4.0.11",
+        "System.IO": "4.1.0",
+        "System.IO.Compression": "4.1.0",
+        "System.IO.FileSystem": "4.0.1",
+        "System.IO.FileSystem.Primitives": "4.0.1",
+        "System.Linq.Expressions": "4.1.0",
+        "System.ObjectModel": "4.0.12",
+        "System.Reflection": "4.1.0",
+        "System.Reflection.Emit": "4.0.1",
+        "System.Reflection.Emit.ILGeneration": "4.0.1",
+        "System.Reflection.Emit.Lightweight": "4.0.1",
+        "System.Reflection.Extensions": "4.0.1",
+        "System.Reflection.Primitives": "4.0.1",
+        "System.Reflection.TypeExtensions": "4.1.0",
+        "System.Resources.ResourceManager": "4.0.1",
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Runtime.Handles": "4.0.1",
+        "System.Runtime.InteropServices": "4.1.0",
+        "System.Text.Encoding": "4.0.11",
+        "System.Text.Encoding.Extensions": "4.0.11",
+        "System.Threading.Tasks": "4.0.11",
+        "System.Threading.Timer": "4.0.1",
+        "Microsoft.Extensions.Logging.TraceSource": "1.0.0"
+      }
+    },
+    "netstandard1.5": {
+      "buildOptions": {
+        "define": [
+          "NET_STANDARD"
+        ]
+      },
+      "dependencies": {
+        "System.Diagnostics.Debug": "4.0.11",
+        "System.Diagnostics.Tools": "4.0.1",
+        "System.Dynamic.Runtime": "4.0.11",
+        "System.Globalization": "4.0.11",
+        "System.IO": "4.1.0",
+        "System.IO.Compression": "4.1.0",
+        "System.IO.FileSystem": "4.0.1",
+        "System.IO.FileSystem.Primitives": "4.0.1",
+        "System.Linq.Expressions": "4.1.0",
+        "System.ObjectModel": "4.0.12",
+        "System.Reflection": "4.1.0",
+        "System.Reflection.Emit": "4.0.1",
+        "System.Reflection.Emit.ILGeneration": "4.0.1",
+        "System.Reflection.Emit.Lightweight": "4.0.1",
+        "System.Reflection.Extensions": "4.0.1",
+        "System.Reflection.Primitives": "4.0.1",
+        "System.Reflection.TypeExtensions": "4.1.0",
+        "System.Resources.ResourceManager": "4.0.1",
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Runtime.Handles": "4.0.1",
+        "System.Runtime.InteropServices": "4.1.0",
+        "System.Text.Encoding": "4.0.11",
+        "System.Text.Encoding.Extensions": "4.0.11",
+        "System.Threading.Tasks": "4.0.11",
+        "System.Threading.Timer": "4.0.1",
+        "Microsoft.Extensions.Logging.TraceSource": "1.0.0"
+      }
+    },
+    "net451": {
+        "frameworkAssemblies": {
+            "System": "4.0.0.0",
+            "System.Configuration": "4.0.0.0",
+            "System.Core": "4.0.0.0",
+            "System.IO.Compression": "4.0.0.0"
+        },
+      "buildOptions": {
+        "define": [
+          "NETFX"
+        ]
+      }
+    }
+  }
+}