From 53add60f58a8ccf405bfedad2228320a71d24a9b Mon Sep 17 00:00:00 2001 From: "John T. Harvey" Date: Fri, 6 Feb 2015 00:51:45 -0600 Subject: [PATCH 1/3] Updated FsBlog.nuspec so that Paket will be included in the NuGet package. As it stands right now, running ``nuget pack FsBlog.nuspec`` results in a NuGet package which does not include Paket. Running ``fake`` from the NuGet package fails because there is no .paket directory with paket.exe or paket.bootstrapper.exe. Due to a bug (feature?) of ``nuget pack``, copying of files or directories which begin with a dot is troublesome. I added Paket as a dependency so that I could copy it from the packages directory instead. Also updated the NuGet version number. Perhaps it is time to upload a new package to nuget.org? --- FsBlog.nuspec | 3 ++- paket.dependencies | 1 + paket.lock | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/FsBlog.nuspec b/FsBlog.nuspec index d76e782..79e9ba5 100644 --- a/FsBlog.nuspec +++ b/FsBlog.nuspec @@ -2,7 +2,7 @@ FsBlog - 1.0.1-alpha + 1.0.2-alpha Matt Ball, Dave Thomas,Tomas Petricek Matt Ball, Dave Thomas,Tomas Petricek https://github.com/fsprojects/FsBlog @@ -28,6 +28,7 @@ This set of tools have been pulled together using some of the following communit --> + diff --git a/paket.dependencies b/paket.dependencies index fed4a04..ee3f650 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -6,3 +6,4 @@ nuget FsUnit.xUnit nuget xunit.runners nuget NuGet.CommandLine nuget FAKE +nuget paket diff --git a/paket.lock b/paket.lock index 14b255f..a769089 100644 --- a/paket.lock +++ b/paket.lock @@ -18,3 +18,4 @@ NUGET Microsoft.AspNet.Razor (>= 2.0.30506.0) xunit (1.9.2) xunit.runners (1.9.2) + Paket (0.26.5) \ No newline at end of file From 2569a9fc30a42be5c089b4a1d194c16e67654ec1 Mon Sep 17 00:00:00 2001 From: "John T. Harvey" Date: Fri, 6 Feb 2015 08:42:38 -0600 Subject: [PATCH 2/3] Added paket.bootstrapper.exe for inclusion in the output NuGet package. Also added paket.targets file. == From Previous commit message Updated FsBlog.nuspec so that Paket will be included in the NuGet package. As it stands right now, running ``nuget pack FsBlog.nuspec`` results in a NuGet package which does not include Paket. Running ``fake`` from the NuGet package fails because there is no .paket directory with paket.exe or paket.bootstrapper.exe. Due to a bug (feature?) of ``nuget pack``, copying of files or directories which begin with a dot is troublesome. I added Paket as a dependency so that I could copy it from the packages directory instead. Also updated the NuGet version number. Perhaps it is time to upload a new package to nuget.org? --- FsBlog.nuspec | 2 +- paket.dependencies | 1 - paket.lock | 3 +-- tools/paket.bootstrapper.exe | Bin 0 -> 13360 bytes tools/paket.targets | 38 +++++++++++++++++++++++++++++++++++ 5 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 tools/paket.bootstrapper.exe create mode 100644 tools/paket.targets diff --git a/FsBlog.nuspec b/FsBlog.nuspec index 79e9ba5..a1efe54 100644 --- a/FsBlog.nuspec +++ b/FsBlog.nuspec @@ -28,9 +28,9 @@ This set of tools have been pulled together using some of the following communit --> - + \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index ee3f650..fed4a04 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -6,4 +6,3 @@ nuget FsUnit.xUnit nuget xunit.runners nuget NuGet.CommandLine nuget FAKE -nuget paket diff --git a/paket.lock b/paket.lock index a769089..6f91fb3 100644 --- a/paket.lock +++ b/paket.lock @@ -17,5 +17,4 @@ NUGET RazorEngine (3.3.0) Microsoft.AspNet.Razor (>= 2.0.30506.0) xunit (1.9.2) - xunit.runners (1.9.2) - Paket (0.26.5) \ No newline at end of file + xunit.runners (1.9.2) \ No newline at end of file diff --git a/tools/paket.bootstrapper.exe b/tools/paket.bootstrapper.exe new file mode 100644 index 0000000000000000000000000000000000000000..b391942520ccd356cff696801325bf5636bc9433 GIT binary patch literal 13360 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 WWzgJ%(^FiljYlKLE#7q;q5lGq6`Upj literal 0 HcmV?d00001 diff --git a/tools/paket.targets b/tools/paket.targets new file mode 100644 index 0000000..22c9f0a --- /dev/null +++ b/tools/paket.targets @@ -0,0 +1,38 @@ + + + + + true + + true + $(MSBuildThisFileDirectory) + $(MSBuildThisFileDirectory)..\ + + + + $(PaketToolsPath)paket.exe + $(PaketToolsPath)paket.bootstrapper.exe + "$(PaketExePath)" + mono --runtime=v4.0.30319 $(PaketExePath) + "$(PaketBootStrapperExePath)" + mono --runtime=v4.0.30319 $(PaketBootStrapperExePath) + + $(MSBuildProjectDirectory)\paket.references + $(MSBuildProjectFullPath).paket.references + $(PaketCommand) restore --references-files "$(PaketReferences)" + $(PaketBootStrapperCommand) + + RestorePackages; $(BuildDependsOn); + + + + + + + + + + + + + From 117d21671fb75cd71b7b26dee9e2f81d76d2348d Mon Sep 17 00:00:00 2001 From: John Harvey Date: Tue, 10 Feb 2015 20:48:02 -0600 Subject: [PATCH 3/3] Moved paket bootstrapper in tools folder to a paket subfolder --- FsBlog.nuspec | 4 ++-- tools/{ => paket}/paket.bootstrapper.exe | Bin tools/{ => paket}/paket.targets | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename tools/{ => paket}/paket.bootstrapper.exe (100%) rename tools/{ => paket}/paket.targets (100%) diff --git a/FsBlog.nuspec b/FsBlog.nuspec index a1efe54..c2e6057 100644 --- a/FsBlog.nuspec +++ b/FsBlog.nuspec @@ -30,7 +30,7 @@ This set of tools have been pulled together using some of the following communit - + - \ No newline at end of file + diff --git a/tools/paket.bootstrapper.exe b/tools/paket/paket.bootstrapper.exe similarity index 100% rename from tools/paket.bootstrapper.exe rename to tools/paket/paket.bootstrapper.exe diff --git a/tools/paket.targets b/tools/paket/paket.targets similarity index 100% rename from tools/paket.targets rename to tools/paket/paket.targets