Allow to overwrite versions in template files without id - fixes #1321

fsprojects · Dec 28, 2015 · 8a76179 · 8a76179
1 parent 3c9304e
commit 8a76179
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 2.39.8 - 28.12.2015
+* BUGFIX: Allow to overwrite versions in template files without id - https://github.com/fsprojects/Paket/issues/1321
+
 #### 2.39.7 - 28.12.2015
 * BUGFIX: Accept dotnet54 as moniker
 

diff --git a/src/Paket.Core/PackageProcess.fs b/src/Paket.Core/PackageProcess.fs
@@ -34,10 +34,14 @@ let private merge buildConfig buildPlatform versionFromAssembly specificVersions
             match md with
             | Valid completeCore -> { templateFile with Contents = CompleteInfo(completeCore, mergedOpt) }
             | _ ->
+                let versionFromAssembly =
+                    match md.Id |> Option.bind (fun id -> Map.tryFind id specificVersions) with
+                    | Some _ as specificVersion -> specificVersion
+                    | None -> getVersion versionFromAssembly attribs
 
                 let merged = 
                     { Id = md.Id
-                      Version = md.Version ++ getVersion versionFromAssembly attribs
+                      Version = md.Version ++ versionFromAssembly
                       Authors = md.Authors ++ getAuthors attribs
                       Description = md.Description ++ getDescription attribs
                       Symbols = md.Symbols }

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -38,7 +38,7 @@
     <StartArguments>pack output D:\code\paketbug\output</StartArguments>
     <StartArguments>install</StartArguments>
     <StartArguments>restore</StartArguments>
-    <StartArguments>update -f</StartArguments>
+    <StartArguments>pack output "without-id"  specific-version A 1.2.3  specific-version B 4.5.6  specific-version C 7.8.9</StartArguments>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>c:\code\Paketkopie</StartWorkingDirectory>
@@ -48,7 +48,7 @@
     <StartWorkingDirectory>d:\code\paketrepro</StartWorkingDirectory>
     <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001270-net461\temp</StartWorkingDirectory>
     <StartWorkingDirectory>C:\code\restore</StartWorkingDirectory>
-    <StartWorkingDirectory>C:\code\paketkopie</StartWorkingDirectory>
+    <StartWorkingDirectory>C:\code\repro</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>