File tree Expand file tree Collapse file tree 3 files changed +7
-4
lines changed Expand file tree Collapse file tree 3 files changed +7
-4
lines changed Original file line number Diff line number Diff line change 2424 <!-- SDK targets override -->
2525 <PropertyGroup >
2626 <FSharpSourcesRoot >$(MSBuildThisFileDirectory)..\src</FSharpSourcesRoot >
27- <VersionPrefix >22.0.3</VersionPrefix >
27+ <VersionPrefix Condition = " '$(VersionPrefix)' == '' " >22.0.3</VersionPrefix >
2828 <OtherFlags >--version:$(VersionPrefix)</OtherFlags >
2929 <GenerateAssemblyVersionAttribute >false</GenerateAssemblyVersionAttribute >
3030 <!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build -->
Original file line number Diff line number Diff line change 1+ #### 29.0.1
2+ * Fix versioning of the assembly
3+
14#### 29.0.0
25 * Integrate visualfsharp master from 165b736b9 (2019-03-29) to 25560f477 (2019-05-24)
36 * Notable improvements include:
Original file line number Diff line number Diff line change @@ -91,7 +91,7 @@ Target "Build" (fun _ ->
9191 runDotnet __ SOURCE_ DIRECTORY__ " build ../src/buildtools/buildtools.proj -v n -c Proto"
9292 let fslexPath = __ SOURCE_ DIRECTORY__ + " /../artifacts/bin/fslex/Proto/netcoreapp2.1/fslex.dll"
9393 let fsyaccPath = __ SOURCE_ DIRECTORY__ + " /../artifacts/bin/fsyacc/Proto/netcoreapp2.1/fsyacc.dll"
94- runDotnet __ SOURCE_ DIRECTORY__ ( sprintf " build FSharp.Compiler.Service.sln -v n -c Release /p:FsLexPath=%s /p:FsYaccPath=%s " fslexPath fsyaccPath)
94+ runDotnet __ SOURCE_ DIRECTORY__ ( sprintf " build FSharp.Compiler.Service.sln -v n -c Release /p:FsLexPath=%s /p:FsYaccPath=%s /p:VersionPrefix= %s " fslexPath fsyaccPath assemblyVersion )
9595)
9696
9797Target " Test" ( fun _ ->
@@ -110,12 +110,12 @@ let escapeString (s: string) =
110110
111111Target " NuGet" ( fun _ ->
112112 let props =
113- [ " PackageVersion " , ( string release.NugetVersion)
113+ [ " VersionPrefix " , release.NugetVersion
114114 " PackageReleaseNotes" , release.Notes |> String.concat " \n " ]
115115 |> Seq.map ( fun ( prop , value ) -> sprintf " -p:%s =%s " prop ( escapeString value))
116116 |> String.concat " "
117117
118- runDotnet __ SOURCE_ DIRECTORY__ ( sprintf " pack FSharp.Compiler.Service.sln -v n -c Release %s " props)
118+ runDotnet __ SOURCE_ DIRECTORY__ ( sprintf " pack FSharp.Compiler.Service.sln --no-build - v n -c Release %s " props)
119119)
120120
121121Target " GenerateDocsEn" ( fun _ ->
You can’t perform that action at this time.
0 commit comments