From 7bd4533342ba9ec4c72c1e8b1f37af2be38436a7 Mon Sep 17 00:00:00 2001 From: Maximilian Lackaw Date: Thu, 23 Apr 2015 16:50:06 +0200 Subject: [PATCH 1/3] Treat only csproj files as non nuspec files --- src/app/FakeLib/NuGet/NugetHelper.fs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/FakeLib/NuGet/NugetHelper.fs b/src/app/FakeLib/NuGet/NugetHelper.fs index 4d1ecd0b4e0..e0b04b34a96 100644 --- a/src/app/FakeLib/NuGet/NugetHelper.fs +++ b/src/app/FakeLib/NuGet/NugetHelper.fs @@ -233,9 +233,9 @@ let private createNuSpecFromTemplate parameters (templateNuSpec:FileInfo) = let private createNuSpecFromTemplateIfNuSpecFile parameters nuSpecOrProjFile = let nuSpecOrProjFileInfo = fileInfo nuSpecOrProjFile - match nuSpecOrProjFileInfo.Extension.ToLower() = ".nuspec" with - | true -> Some (createNuSpecFromTemplate parameters nuSpecOrProjFileInfo) - | false -> None + match nuSpecOrProjFileInfo.Extension.ToLower() = ".csproj" with + | true -> None + | false -> Some (createNuSpecFromTemplate parameters nuSpecOrProjFileInfo) let private propertiesParam = function From f4c7fd48f26591ba5f48e5b6d481cca369b2dd4f Mon Sep 17 00:00:00 2001 From: Maximilian Lackaw Date: Fri, 24 Apr 2015 09:06:02 +0200 Subject: [PATCH 2/3] Rename function --- src/app/FakeLib/NuGet/NugetHelper.fs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/FakeLib/NuGet/NugetHelper.fs b/src/app/FakeLib/NuGet/NugetHelper.fs index e0b04b34a96..170c97b313c 100644 --- a/src/app/FakeLib/NuGet/NugetHelper.fs +++ b/src/app/FakeLib/NuGet/NugetHelper.fs @@ -231,7 +231,7 @@ let private createNuSpecFromTemplate parameters (templateNuSpec:FileInfo) = tracefn "Created nuspec file %s" specFile specFile -let private createNuSpecFromTemplateIfNuSpecFile parameters nuSpecOrProjFile = +let private createNuSpecFromTemplateIfNotCsprojFile parameters nuSpecOrProjFile = let nuSpecOrProjFileInfo = fileInfo nuSpecOrProjFile match nuSpecOrProjFileInfo.Extension.ToLower() = ".csproj" with | true -> None @@ -361,7 +361,7 @@ let NuGetPack setParams nuspecOrProjectFile = traceStartTask "NuGetPack" nuspecOrProjectFile let parameters = NuGetDefaults() |> setParams try - match (createNuSpecFromTemplateIfNuSpecFile parameters nuspecOrProjectFile) with + match (createNuSpecFromTemplateIfNotCsprojFile 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 (createNuSpecFromTemplateIfNotCsprojFile parameters nuspecOrProjectFile) with | Some nuspecTemplateFile -> pack parameters nuspecTemplateFile DeleteFile nuspecTemplateFile From 1a41212b523be93efd43eae702bd24df0e24693d Mon Sep 17 00:00:00 2001 From: Maximilian Lackaw Date: Fri, 24 Apr 2015 10:00:03 +0200 Subject: [PATCH 3/3] Extend createNuSpecFromTemplateIfNotCsprojFile function to work with all .net proj files --- src/app/FakeLib/NuGet/NugetHelper.fs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/FakeLib/NuGet/NugetHelper.fs b/src/app/FakeLib/NuGet/NugetHelper.fs index 170c97b313c..400d4429ce5 100644 --- a/src/app/FakeLib/NuGet/NugetHelper.fs +++ b/src/app/FakeLib/NuGet/NugetHelper.fs @@ -231,9 +231,9 @@ let private createNuSpecFromTemplate parameters (templateNuSpec:FileInfo) = tracefn "Created nuspec file %s" specFile specFile -let private createNuSpecFromTemplateIfNotCsprojFile parameters nuSpecOrProjFile = +let private createNuSpecFromTemplateIfNotProjFile parameters nuSpecOrProjFile = let nuSpecOrProjFileInfo = fileInfo nuSpecOrProjFile - match nuSpecOrProjFileInfo.Extension.ToLower() = ".csproj" with + match nuSpecOrProjFileInfo.Extension.ToLower().EndsWith("proj") with | true -> None | false -> Some (createNuSpecFromTemplate parameters nuSpecOrProjFileInfo) @@ -361,7 +361,7 @@ let NuGetPack setParams nuspecOrProjectFile = traceStartTask "NuGetPack" nuspecOrProjectFile let parameters = NuGetDefaults() |> setParams try - match (createNuSpecFromTemplateIfNotCsprojFile 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 (createNuSpecFromTemplateIfNotCsprojFile parameters nuspecOrProjectFile) with + match (createNuSpecFromTemplateIfNotProjFile parameters nuspecOrProjectFile) with | Some nuspecTemplateFile -> pack parameters nuspecTemplateFile DeleteFile nuspecTemplateFile