diff --git a/Hermes.sln b/Hermes.sln index df14dd4c..b0cdcdaa 100644 --- a/Hermes.sln +++ b/Hermes.sln @@ -11,6 +11,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "src\Client\Client EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "src\Tests\Tests.csproj", "{CC70B0BB-EC87-45D0-A4AE-2462F99D7573}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1A5ABB89-2797-4946-8D46-F07144F616F3}" + ProjectSection(SolutionItems) = preProject + src\GlobalAssemblyInfo.cs = src\GlobalAssemblyInfo.cs + src\Hermes.props = src\Hermes.props + src\Hermes.targets = src\Hermes.targets + src\NuGet.proj = src\NuGet.proj + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/build.bat b/build.bat new file mode 100644 index 00000000..d11d4bfd --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild %~dp0\src\NuGet.proj /verbosity:normal /nr:false /p:PackageVersion=%PackageVersion% diff --git a/icon/48.png b/icon/48.png new file mode 100644 index 00000000..9e292f9b Binary files /dev/null and b/icon/48.png differ diff --git a/src/Broker/Broker.csproj b/src/Broker/Broker.csproj index 946ef3fa..cb124f55 100644 --- a/src/Broker/Broker.csproj +++ b/src/Broker/Broker.csproj @@ -1,8 +1,8 @@  - + + - Debug AnyCPU {1397EC83-6D03-4D81-95D5-5D11C766C43A} Library @@ -12,37 +12,17 @@ v4.5 512 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - + + Properties\GlobalAssemblyInfo.cs + - + \ No newline at end of file diff --git a/src/Broker/Broker.nuspec b/src/Broker/Broker.nuspec new file mode 100644 index 00000000..e7842269 --- /dev/null +++ b/src/Broker/Broker.nuspec @@ -0,0 +1,18 @@ + + + + Hermes.Broker + 1.0.0 + Hermes Broker: a lightweight C# MQTT messenger + Daniel Cazzulino + Daniel Cazzulino + http://clarius.io/hermes/license + http://clarius.io/hermes/home + http://clarius.io/hermes/48.png + false + A lightweight and high-performance MQTT broker written entirely in C#. + + Copyright 2012 + m2m iot sockets mqtt + + \ No newline at end of file diff --git a/src/Broker/Properties/AssemblyInfo.cs b/src/Broker/Properties/AssemblyInfo.cs index 2382b2c4..220194fb 100644 --- a/src/Broker/Properties/AssemblyInfo.cs +++ b/src/Broker/Properties/AssemblyInfo.cs @@ -2,35 +2,5 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle("Hermes.Broker")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Hermes.Broker")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b36456d3-fdf4-448f-9b06-547449296f23")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyDescription("Broker component of the Hermes project")] \ No newline at end of file diff --git a/src/Client/Client.csproj b/src/Client/Client.csproj index 087307a1..52cc1e27 100644 --- a/src/Client/Client.csproj +++ b/src/Client/Client.csproj @@ -1,9 +1,8 @@  - + + - 11.0 - Debug AnyCPU {D3EB8C4F-6CF4-4EB4-94E3-BCA31767AE53} Library @@ -15,35 +14,12 @@ 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - + + Properties\GlobalAssemblyInfo.cs + - + \ No newline at end of file diff --git a/src/Client/Client.nuspec b/src/Client/Client.nuspec new file mode 100644 index 00000000..c1c92ea9 --- /dev/null +++ b/src/Client/Client.nuspec @@ -0,0 +1,18 @@ + + + + Hermes.Client + 1.0.0 + Hermes Client: a lightweight C# MQTT messenger + Daniel Cazzulino + Daniel Cazzulino + http://clarius.io/hermes/license + http://clarius.io/hermes/home + http://clarius.io/hermes/48.png + false + A lightweight and high-performance MQTT client written entirely in C#. + + Copyright 2012 + m2m iot sockets mqtt + + \ No newline at end of file diff --git a/src/Client/Properties/AssemblyInfo.cs b/src/Client/Properties/AssemblyInfo.cs index 287a092d..a484d411 100644 --- a/src/Client/Properties/AssemblyInfo.cs +++ b/src/Client/Properties/AssemblyInfo.cs @@ -1,30 +1,6 @@ -using System.Resources; -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle("Hermes.Client")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Hermes.Client")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyDescription("Client component of the Hermes project")] \ No newline at end of file diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs new file mode 100644 index 00000000..5a9b9224 --- /dev/null +++ b/src/GlobalAssemblyInfo.cs @@ -0,0 +1,17 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyCompany("")] +[assembly: AssemblyCopyright("Copyright © 2014")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] + +#if DEBUG +[assembly: AssemblyConfiguration("DEBUG")] +#endif +#if RELEASE +[assembly: AssemblyConfiguration("RELEASE")] +#endif \ No newline at end of file diff --git a/src/Hermes.props b/src/Hermes.props new file mode 100644 index 00000000..99388dc7 --- /dev/null +++ b/src/Hermes.props @@ -0,0 +1,51 @@ + + + + + + Release + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .gitignore)) + $(BuildRoot)\ + $(BuildRoot)drops\ + + + + + + $(VisualStudioVersion) + + + + 4.0 + + + + 10.0 + + + + + bin\$(Configuration)\ + true + full + false + prompt + 4 + + + + $(DefineConstants);DEBUG;TRACE + + + + true + $(DefineConstants);TRACE + + + + + + False + + + \ No newline at end of file diff --git a/src/Hermes.targets b/src/Hermes.targets new file mode 100644 index 00000000..1e92174a --- /dev/null +++ b/src/Hermes.targets @@ -0,0 +1,4 @@ + + + + diff --git a/src/NuGet.proj b/src/NuGet.proj new file mode 100644 index 00000000..8935e649 --- /dev/null +++ b/src/NuGet.proj @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Portable/Hermes.sln b/src/Portable/Hermes.sln deleted file mode 100644 index caea1099..00000000 --- a/src/Portable/Hermes.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hermes.Portable", "Hermes.Portable.csproj", "{6481B999-0479-4162-AC53-5936CE5FD8BF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6481B999-0479-4162-AC53-5936CE5FD8BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6481B999-0479-4162-AC53-5936CE5FD8BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6481B999-0479-4162-AC53-5936CE5FD8BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6481B999-0479-4162-AC53-5936CE5FD8BF}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/Portable/Portable.csproj b/src/Portable/Portable.csproj index fbdef82e..62cdf8c8 100644 --- a/src/Portable/Portable.csproj +++ b/src/Portable/Portable.csproj @@ -1,9 +1,8 @@  - + + - 11.0 - Debug AnyCPU {6481B999-0479-4162-AC53-5936CE5FD8BF} Library @@ -15,35 +14,12 @@ 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - + + Properties\GlobalAssemblyInfo.cs + - + \ No newline at end of file diff --git a/src/Portable/Portable.nuspec b/src/Portable/Portable.nuspec new file mode 100644 index 00000000..9695bad9 --- /dev/null +++ b/src/Portable/Portable.nuspec @@ -0,0 +1,18 @@ + + + + Hermes.Portable + 1.0.0 + Hermes Portable: a shared lightweight library for the C# MQTT messenger + Daniel Cazzulino + Daniel Cazzulino + http://clarius.io/hermes/license + http://clarius.io/hermes/home + http://clarius.io/hermes/48.png + false + Shared components between Hermes Broker and Client, written entirely in C#. + + Copyright 2012 + m2m iot sockets mqtt + + \ No newline at end of file diff --git a/src/Portable/Properties/AssemblyInfo.cs b/src/Portable/Properties/AssemblyInfo.cs index 47856dfb..24cf1b9a 100644 --- a/src/Portable/Properties/AssemblyInfo.cs +++ b/src/Portable/Properties/AssemblyInfo.cs @@ -1,30 +1,6 @@ -using System.Resources; -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle("Hermes.Portable")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Hermes.Portable")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyDescription("Portable shared component of the Hermes project")] \ No newline at end of file diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj index a33da09e..23e1cb84 100644 --- a/src/Tests/Tests.csproj +++ b/src/Tests/Tests.csproj @@ -1,71 +1,48 @@  - - - - Debug - AnyCPU - {CC70B0BB-EC87-45D0-A4AE-2462F99D7573} - Library - Properties - Tests - Tests - v4.5 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll - - - - - - ..\..\packages\xunit.1.9.2\lib\net20\xunit.dll - - - - - - - - {1397ec83-6d03-4d81-95d5-5d11c766c43a} - Broker - - - {d3eb8c4f-6cf4-4eb4-94e3-bca31767ae53} - Client - - - {6481b999-0479-4162-ac53-5936ce5fd8bf} - Portable - - - - - - - + + + + + AnyCPU + {CC70B0BB-EC87-45D0-A4AE-2462F99D7573} + Library + Properties + Tests + Tests + v4.5 + 512 + + + + ..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + + + + + + ..\..\packages\xunit.1.9.2\lib\net20\xunit.dll + + + + + + + + {1397ec83-6d03-4d81-95d5-5d11c766c43a} + Broker + + + {d3eb8c4f-6cf4-4eb4-94e3-bca31767ae53} + Client + + + {6481b999-0479-4162-ac53-5936ce5fd8bf} + Portable + + + + + + + \ No newline at end of file