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 24
24
<!-- SDK targets override -->
25
25
<PropertyGroup >
26
26
<FSharpSourcesRoot >$(MSBuildThisFileDirectory)..\src</FSharpSourcesRoot >
27
- <VersionPrefix >22.0.3</VersionPrefix >
27
+ <VersionPrefix Condition = " '$(VersionPrefix)' == '' " >22.0.3</VersionPrefix >
28
28
<OtherFlags >--version:$(VersionPrefix)</OtherFlags >
29
29
<GenerateAssemblyVersionAttribute >false</GenerateAssemblyVersionAttribute >
30
30
<!-- 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
+
1
4
#### 29.0.0
2
5
* Integrate visualfsharp master from 165b736b9 (2019-03-29) to 25560f477 (2019-05-24)
3
6
* Notable improvements include:
Original file line number Diff line number Diff line change @@ -91,7 +91,7 @@ Target "Build" (fun _ ->
91
91
runDotnet __ SOURCE_ DIRECTORY__ " build ../src/buildtools/buildtools.proj -v n -c Proto"
92
92
let fslexPath = __ SOURCE_ DIRECTORY__ + " /../artifacts/bin/fslex/Proto/netcoreapp2.1/fslex.dll"
93
93
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 )
95
95
)
96
96
97
97
Target " Test" ( fun _ ->
@@ -110,12 +110,12 @@ let escapeString (s: string) =
110
110
111
111
Target " NuGet" ( fun _ ->
112
112
let props =
113
- [ " PackageVersion " , ( string release.NugetVersion)
113
+ [ " VersionPrefix " , release.NugetVersion
114
114
" PackageReleaseNotes" , release.Notes |> String.concat " \n " ]
115
115
|> Seq.map ( fun ( prop , value ) -> sprintf " -p:%s =%s " prop ( escapeString value))
116
116
|> String.concat " "
117
117
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)
119
119
)
120
120
121
121
Target " GenerateDocsEn" ( fun _ ->
You can’t perform that action at this time.
0 commit comments