Merge pull request #767 from MaximilianLackaw/treat-non-csproj-files-…

…as-nuspec-files Treat non csproj files as nuspec files
fsprojects · Apr 24, 2015 · 24c5af6 · 24c5af6
2 parents 76860b2 + 1a41212
commit 24c5af6
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/app/FakeLib/NuGet/NugetHelper.fs b/src/app/FakeLib/NuGet/NugetHelper.fs
@@ -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 
@@ -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
@@ -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