Skip to content

Commit

Permalink
- Updated version.cs and package nuspecs
Browse files Browse the repository at this point in the history
- Rebased on top of master, project now builds
- Removed restore.dg
  • Loading branch information
zidad authored and micdenny committed Aug 13, 2016
1 parent 6c3bda5 commit e4407e7
Show file tree
Hide file tree
Showing 11 changed files with 72 additions and 51 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ TestResult.xml
*.nupkg
Package/EasyNetQ/lib
Package/EasyNetQ.Management.Client/lib
Package

*.userprefs
test-results
Expand All @@ -33,3 +34,6 @@ packages
# Ignore NuGet binary
Source/.nuget/NuGet.exe
/Source/.vs/config

#.NET core
*.dg
Empty file modified Package/EasyNetQ.DI.Ninject/EasyNetQ.DI.Ninject.nuspec
100755 → 100644
Empty file.
Empty file.
Empty file modified Package/EasyNetQ.DI.Windsor/EasyNetQ.DI.Windsor.nuspec
100755 → 100644
Empty file.
Empty file modified Package/EasyNetQ/EasyNetQ.nuspec
100755 → 100644
Empty file.
1 change: 0 additions & 1 deletion Source/.vs/restore.dg

This file was deleted.

11 changes: 11 additions & 0 deletions Source/EasyNetQ DNX/.nuget/NuGet.Config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageRestore>
<add key="enabled" value="True" />
<add key="automatic" value="True" />
</packageRestore>
<packageSources>
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
<add key="rabbitmq-dotnet-client-ci" value="https://ci.appveyor.com/nuget/rabbitmq-dotnet-client-ci/" />
</packageSources>
</configuration>
2 changes: 1 addition & 1 deletion Source/EasyNetQ DNX/EasyNetQ DNX.xproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ProjectGuid>ed270a39-d32c-438a-bf4f-aa0e66c7879c</ProjectGuid>
<RootNamespace>EasyNetQ_DNX</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
Expand Down
99 changes: 51 additions & 48 deletions Source/EasyNetQ DNX/project.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,54 @@
{
"version": "1.0.0-*",
"description": "EasyNetQ DNX Class Library",
"authors": [ "SapientGuardian" ],
"tags": [ "" ],
"projectUrl": "",
"licenseUrl": "",
"compile": [ "../EasyNetQ/*.cs", "../EasyNetQ/**/*.cs" ],
"frameworks": {
"netcoreapp1.0": {
"imports": "dnxcore50",
"buildOptions": {
"define": [ "NET_CORE" ]
}
}
},
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.0-*",
"description": "EasyNetQ DNX Class Library",
"authors": [ "SapientGuardian" ],
"tags": [ "" ],
"projectUrl": "https://github.com/EasyNetQ/",
"licenseUrl": "https://opensource.org/licenses/MIT",
"compile": [ "../EasyNetQ/*.cs", "../EasyNetQ/**/*.cs" ],
"frameworks": {
"netcoreapp1.0": {
"imports": "dnxcore50",
"buildOptions": {
"define": [ "NET_CORE" ]
}
},
"netstandard1.3": {

}
},
"Newtonsoft.Json": "9.0.1",
"RabbitMQ.Client": "4.0.0-ci-201607010902",
"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"
}
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
},
"Newtonsoft.Json": "9.0.1",
"RabbitMQ.Client": "4.0.0-ci-201607010902",
"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"
}
}
5 changes: 4 additions & 1 deletion Source/EasyNetQ/MessageProperties.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@

namespace EasyNetQ
{
public class MessageProperties : ICloneable
public class MessageProperties
#if !NET_CORE
: ICloneable
#endif
{
public MessageProperties()
{
Expand Down
1 change: 1 addition & 0 deletions Source/Version.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// 0.62.1.0 Bug Fix: QueueDeclare does not allow an empty dead letter exchange thus preventing directly publishing to a queue
// 0.62.0.0 Completed support for topic based routing in future publish
// 0.61.1.0 Added support for configuring RPC exchange (request and response) names via conventions
// 0.61.0.0 Support of priority queues to IBus publish methods
// 0.61.0.0 Added support for EXTERNAL authentication mechanism
// 0.60.1.0 Added SimpleInjector DI support
// 0.60.0.0 Remove [Serializable] attribute from messages and exceptions
Expand Down

0 comments on commit e4407e7

Please sign in to comment.