Skip to content

Commit

Permalink
update for build
Browse files Browse the repository at this point in the history
  • Loading branch information
dbones committed Mar 19, 2017
1 parent c6e7b9d commit e4e8785
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 19 deletions.
2 changes: 1 addition & 1 deletion build/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var config = {

outputDir : path.resolve('./output'),
toolsDir : path.resolve('./tools'),
buildVersion : args.buildNumber ? '0.5.' + args.buildNumber : '0.0.0',
buildVersion : args.buildNumber ? '0.6.' + args.buildNumber : '0.0.0',
company: 'dbones.co.uk'


Expand Down
2 changes: 1 addition & 1 deletion build/tasks/compile.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ gulp.task('compile', function() {
errorOnFail: true,
stdout: true,
logCommand: true,
toolsVersion:14.0
toolsVersion:15.0
}));
});
10 changes: 5 additions & 5 deletions nuspec/ArmChair.Core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
<summary>ArmChair is a .NET Client for CouchDB</summary>
<copyright>Copyright dbones.co.uk</copyright>
<language>en-US</language>
<tags>UOW CouchDB Document Database Client Linq</tags>
<tags>UOW CouchDB Document Database Client Linq NoSql</tags>
<dependencies><group><dependency id="Newtonsoft.Json" version="9.0.1"/></group></dependencies>
</metadata>
<files>
<file src="src\ArmChair.Core\bin\Release\ArmChair.Core.dll" target="lib\net40\ArmChair.Core.dll"/>
<file src="src\ArmChair.Core\bin\Release\ArmChair.Core.pdb" target="lib\net40\ArmChair.Core.pdb"/>
<file src="src\ArmChair.Core\bin\Release\ArmChair.Core.XML" target="lib\net40\ArmChair.Core.XML"/>
<file src="src\IQToolkit\bin\Release\IQToolkit.dll" target="lib\net40\IQToolkit.dll"/>
<file src="src\ArmChair.Core\bin\Release\ArmChair.Core.dll" target="lib\net45\ArmChair.Core.dll"/>
<file src="src\ArmChair.Core\bin\Release\ArmChair.Core.pdb" target="lib\net45\ArmChair.Core.pdb"/>
<file src="src\ArmChair.Core\bin\Release\ArmChair.Core.XML" target="lib\net45\ArmChair.Core.XML"/>
<file src="nuspec\Apache License 2.0.txt" target="Apache License 2.0.txt"/>
<file src="nuspec\changes.txt" target="changes.txt"/>
<file src="nuspec\license.txt" target="license.txt"/>
<file src="nuspec\notice.txt" target="notice.txt"/>
<file src="nuspec\ReadMe.txt" target="ReadMe.txt"/>
</files>
</package>
6 changes: 4 additions & 2 deletions nuspec/changes.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
0.6.x
==============
!! Breaking Change !!
.NET 4.0 dropped

.NET 4.0 dropped
Database.Settings.Register() moved to Database.Register()
Initial .NET standard support work:
moved to .NET 4.5 (not core yet, aiming for 1.1, but it does compile on 1.6).
updated internal Http to use HttpClient.
updated reflection code to be complaint.
integrated IQ Tool Kit, retaining the NOTICE and licence on those files.
initial support to create index's.
via Database.Index.Create()
via ClassMap<T>
Supported more of the Linq interface
Support for Sort(s)

Expand Down
16 changes: 16 additions & 0 deletions nuspec/notice.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
================================================================
== NOTICE file for use with the Apache License, Version 2.0, ==
== in this case for ArmChair.Core distribution. ==
================================================================

ArmChair.Core
Apache 2
Copyright (c) dbones.co.uk.

Newtonsoft.Json
MIT
Copyright (c) 2007 James Newton-King

IQToolKit
MS-PL
Copyright (c) Microsoft
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"gulp-dotnet-assembly-info": "^0.1.10",
"gulp-download": "0.0.1",
"gulp-if": "^1.2.5",
"gulp-msbuild": "^0.3.3",
"gulp-msbuild": "^0.4.5",
"gulp-nunit-runner": "^1.1.0",
"gulp-unzip": "^0.1.3",
"lodash": "^3.6.0",
Expand All @@ -33,5 +33,8 @@
"xml2js": "^0.4.17",
"xmlpoke": "^0.1.9",
"yargs": "^3.7.0"
},
"dependencies": {
"gulp-msbuild": "^0.4.5"
}
}
6 changes: 3 additions & 3 deletions src/ArmChair.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("0.5.4")]
[assembly: AssemblyVersion("0.5.4")]
[assembly: AssemblyFileVersion("0.5.4")]
// [assembly: AssemblyVersion("0.6.1")]
[assembly: AssemblyVersion("0.6.1")]
[assembly: AssemblyFileVersion("0.6.1")]
6 changes: 3 additions & 3 deletions src/ArmChair.Tests.Domain/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("0.5.4")]
[assembly: AssemblyVersion("0.5.4")]
[assembly: AssemblyFileVersion("0.5.4")]
// [assembly: AssemblyVersion("0.6.1")]
[assembly: AssemblyVersion("0.6.1")]
[assembly: AssemblyFileVersion("0.6.1")]
6 changes: 3 additions & 3 deletions src/ArmChair.Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("0.5.4")]
[assembly: AssemblyVersion("0.5.4")]
[assembly: AssemblyFileVersion("0.5.4")]
// [assembly: AssemblyVersion("0.6.1")]
[assembly: AssemblyVersion("0.6.1")]
[assembly: AssemblyFileVersion("0.6.1")]

0 comments on commit e4e8785

Please sign in to comment.