Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Treat non csproj files as nuspec files #767

Merged
merged 3 commits into from
Apr 24, 2015
Merged

Treat non csproj files as nuspec files #767

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bd4533
Treat only csproj files as non nuspec files
Apr 23, 2015
f4c7fd4
Rename function
Apr 24, 2015
1a41212
Extend createNuSpecFromTemplateIfNotCsprojFile function to work with …
Apr 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/app/FakeLib/NuGet/NugetHelper.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@ let private createNuSpecFromTemplate parameters (templateNuSpec:FileInfo) =
tracefn "Created nuspec file %s" specFile
specFile

let private createNuSpecFromTemplateIfNuSpecFile parameters nuSpecOrProjFile =
let private createNuSpecFromTemplateIfNotProjFile parameters nuSpecOrProjFile =
let nuSpecOrProjFileInfo = fileInfo nuSpecOrProjFile
match nuSpecOrProjFileInfo.Extension.ToLower() = ".nuspec" with
| true -> Some (createNuSpecFromTemplate parameters nuSpecOrProjFileInfo)
| false -> None
match nuSpecOrProjFileInfo.Extension.ToLower().EndsWith("proj") with
| true -> None
| false -> Some (createNuSpecFromTemplate parameters nuSpecOrProjFileInfo)


let private propertiesParam = function
Expand Down Expand Up @@ -361,7 +361,7 @@ let NuGetPack setParams nuspecOrProjectFile =
traceStartTask "NuGetPack" nuspecOrProjectFile
let parameters = NuGetDefaults() |> setParams
try
match (createNuSpecFromTemplateIfNuSpecFile parameters nuspecOrProjectFile) with
match (createNuSpecFromTemplateIfNotProjFile parameters nuspecOrProjectFile) with
| Some nuspecTemplateFile ->
pack parameters nuspecTemplateFile
DeleteFile nuspecTemplateFile
Expand Down Expand Up @@ -392,7 +392,7 @@ let NuGet setParams nuspecOrProjectFile =
traceStartTask "NuGet" nuspecOrProjectFile
let parameters = NuGetDefaults() |> setParams
try
match (createNuSpecFromTemplateIfNuSpecFile parameters nuspecOrProjectFile) with
match (createNuSpecFromTemplateIfNotProjFile parameters nuspecOrProjectFile) with
| Some nuspecTemplateFile ->
pack parameters nuspecTemplateFile
DeleteFile nuspecTemplateFile
Expand Down