Merge branch 'patch-2' of https://github.com/domdom/Paket

fsprojects · Dec 11, 2017 · c5a8aec · c5a8aec
2 parents 4fe7b54 + cda98c3
commit c5a8aec
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Paket.Core/PaketConfigFiles/InstallModel.fs b/src/Paket.Core/PaketConfigFiles/InstallModel.fs
@@ -56,7 +56,10 @@ type MsBuildFile = {
 module MsBuildFile =
     let ofFile (f:FrameworkDependentFile) =
         let fi = FileInfo(normalizePath f.File.FullPath)
-        let name = fi.Name.Replace(fi.Extension, "")
+        let name =
+            let ext = fi.Extension
+            if String.IsNullOrEmpty ext then fi.Name
+            else fi.Name.Replace(ext, "")
         { Name = name; Path = f.File.FullPath }
 
 type FrameworkReference = {
@@ -924,4 +927,4 @@ type InstallModel with
 
     [<Obsolete "use CreateFromContent instead">]
     static member CreateFromLibs(packageName, packageVersion, frameworkRestriction:FrameworkRestriction, libs : UnparsedPackageFile seq, targetsFiles, analyzerFiles, nuspec : Nuspec) =
-        InstallModel.createFromLibs packageName packageVersion frameworkRestriction libs targetsFiles analyzerFiles nuspec
+        InstallModel.createFromLibs packageName packageVersion frameworkRestriction libs targetsFiles analyzerFiles nuspec