Skip to content

Commit

Permalink
Fix NuGet dependencies - Add Liblog to license
Browse files Browse the repository at this point in the history
  • Loading branch information
CumpsD committed Apr 22, 2015
1 parent 7a6b517 commit d7c6ff3
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 9 deletions.
23 changes: 23 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,26 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

----------------------------------------------------------------------------
Uses LibLog https://github.com/damianh/LibLog
The MIT License

Copyright (C) 2011-2014 Damian Hickey

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 1.0.3 - April 22 2015
* Fix NuGet dependencies
* Add LibLog to License

### 1.0.2 - April 18 2015
* Add LibLog to make it easier for consumers to integrate their logging

Expand Down
4 changes: 2 additions & 2 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
source https://nuget.org/api/v2

nuget FSharp.Formatting 2.8.0
nuget LibLog 4.2.2 framework: >= net40
nuget LibLog
nuget NUnit
nuget NUnit.Runners
nuget FAKE
nuget Serilog 1.5.1 framework: >= net40
nuget Serilog
nuget SourceLink.Fake
nuget FSharpVSPowerTools.Core 1.7.0

Expand Down
2 changes: 1 addition & 1 deletion paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ NUGET
FSharpVSPowerTools.Core (>= 1.7.0)
FSharpVSPowerTools.Core (1.7.0)
FSharp.Compiler.Service (>= 0.0.81)
LibLog (4.2.2) - framework: >= net40
LibLog (4.2.2)
Microsoft.Bcl (1.1.10)
Microsoft.Bcl.Build (>= 1.0.14)
Microsoft.Bcl.Build (1.0.21)
Expand Down
2 changes: 1 addition & 1 deletion src/KNXLib/KNXLib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\KNXLib.XML</DocumentationFile>
<DocumentationFile>bin\Release\KNXLib.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
Expand Down
6 changes: 3 additions & 3 deletions src/KNXLib/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
[assembly: AssemblyTitleAttribute("KNXLib")]
[assembly: AssemblyProductAttribute("KNX.net")]
[assembly: AssemblyDescriptionAttribute("KNX.net provides a KNX API for .NET")]
[assembly: AssemblyVersionAttribute("1.0.2")]
[assembly: AssemblyFileVersionAttribute("1.0.2")]
[assembly: AssemblyVersionAttribute("1.0.3")]
[assembly: AssemblyFileVersionAttribute("1.0.3")]
namespace System {
internal static class AssemblyVersionInformation {
internal const string Version = "1.0.2";
internal const string Version = "1.0.3";
}
}
1 change: 0 additions & 1 deletion src/KNXLib/paket.references
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
LibLog
4 changes: 3 additions & 1 deletion src/KNXLib/paket.template
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
type project
id
KNX.net
owners
life.emotions
authors
life.emotions exira
life.emotions
projectUrl
https://github.com/lifeemotions/knx.net
iconUrl
Expand Down

0 comments on commit d7c6ff3

Please sign in to comment.