diff --git a/Source/Cake.Paket.Addin/Cake.Paket.Addin.csproj b/Source/Cake.Paket.Addin/Cake.Paket.Addin.csproj index 44a611e..8fbc782 100644 --- a/Source/Cake.Paket.Addin/Cake.Paket.Addin.csproj +++ b/Source/Cake.Paket.Addin/Cake.Paket.Addin.csproj @@ -60,6 +60,9 @@ + + + @@ -82,7 +85,4 @@ True - - - \ No newline at end of file diff --git a/Source/Cake.Paket.Module/Cake.Paket.Module.paket.template b/Source/Cake.Paket.Module/Cake.Paket.Module.paket.template deleted file mode 100644 index b5e897d..0000000 --- a/Source/Cake.Paket.Module/Cake.Paket.Module.paket.template +++ /dev/null @@ -1,19 +0,0 @@ -type file -id Cake.Paket.Module -title Cake.Paket.Module -version 1.0.0-alpha1 -authors Larz White -owners Larz White -description Paket module for cake. -summary Cake module that extends Cake with ability to use paket. -licenseUrl https://github.com/larzw/Cake.Paket/blob/master/LICENSE -projectUrl https://github.com/larzw/Cake.Paket -iconUrl https://raw.githubusercontent.com/cake-build/graphics/master/png/cake-medium.png -requireLicenseAcceptance false -copyright Copyright (c) 2016 Larz White -releaseNotes Initial alpha Release. -tags Cake Script Build paket -dependencies - Cake = 0.16.0 -files - bin/Release/Cake.Paket.Module.dll \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index b6b558e..a6edaef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,7 +23,5 @@ build_script: - ps: .\build.ps1 artifacts: - - path: .\Reports\inspectCode.xml - name: inspectCode - - path: .\Reports\dupFinder.xml - name: dupFinder \ No newline at end of file + - path: .\Reports + - path: .\NuGet \ No newline at end of file diff --git a/build.cake b/build.cake index e810adb..25a176b 100644 --- a/build.cake +++ b/build.cake @@ -6,12 +6,14 @@ private readonly string cakePaketAddin = "./Source/Cake.Paket.Addin/bin/" + conf private readonly string cakePaketModule = "./Source/Cake.Paket.Module/bin/" + configuration; private readonly string cakePaketUnitTests = "./Source/Cake.Paket.UnitTests/bin/" + configuration + "/*.UnitTests.dll"; -private readonly string reports = "./Reports"; +private const string reports = "./Reports"; private readonly string coverage = reports + "/coverage.xml"; -private readonly string resharperSettings = "./Source/Cake.Paket.sln.DotSettings"; +private const string resharperSettings = "./Source/Cake.Paket.sln.DotSettings"; private readonly string inspectCode = reports + "/inspectCode.xml"; private readonly string dupFinder = reports + "/dupFinder.xml"; +private const string nuGet = "./NuGet"; + Setup(tool => { Information(Figlet("Cake.Paket")); @@ -20,7 +22,7 @@ Setup(tool => Task("Clean").Does(() => { - CleanDirectories(new[] {cakePaketAddin, cakePaketModule, reports}); + CleanDirectories(new[] {cakePaketAddin, cakePaketModule, reports, nuGet}); }); Task("Build").IsDependentOn("Clean").Does(() => @@ -57,6 +59,13 @@ Task("Run-DupFinder").IsDependentOn("Build").Does(() => DupFinder(cakePaket, new DupFinderSettings { ShowStats = true, ShowText = true, OutputFile = dupFinder }); }); -Task("Default").IsDependentOn("Run-Unit-Tests").IsDependentOn("Run-InspectCode").IsDependentOn("Run-DupFinder"); +Task("Paket-Pack").IsDependentOn("Build").Does(() => +{ + EnsureDirectoryExists(nuGet); + + Paket(new PaketSettings { Commands = "pack output NuGet version 1.1.0-alpha", ToolPath = new FilePath("./.paket/paket.exe") }); +}); + +Task("Default").IsDependentOn("Run-Unit-Tests").IsDependentOn("Run-InspectCode").IsDependentOn("Run-DupFinder").IsDependentOn("Paket-Pack"); RunTarget("Default"); \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 6d816a0..4bb3d1c 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -27,6 +27,11 @@ group Build/Tools/Addins nuget Cake.Figlet nuget Cake.Coveralls +group Build/Tools/Addins + framework: >= net45 + source https://www.myget.org/F/mathphysics/api/v2 + nuget Cake.Paket.Addin + group Build/Tools/Modules framework: >= net45 source https://www.myget.org/F/mathphysics/api/v2 diff --git a/paket.lock b/paket.lock index b6cdc87..f992c6c 100644 --- a/paket.lock +++ b/paket.lock @@ -18,6 +18,8 @@ NUGET Cake.Coveralls (0.2) Cake.Figlet (0.3.1) Cake.Core (>= 0.14) + remote: https://www.myget.org/F/mathphysics/api/v2 + Cake.Paket.Addin (1.0.0-alpha3) GROUP Build/Tools/Modules FRAMEWORK: >= NET45