From cc6a18a1d22605d7bc3828752c661251bd0c0bf2 Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Sat, 2 Mar 2019 11:24:33 -0600
Subject: [PATCH] flow through version props in a more idomatic way

---
 fcs/build.fsx | 4 ++--
 fcs/fcs.props | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/fcs/build.fsx b/fcs/build.fsx
index 935ea0ec4b..f62e01cafd 100644
--- a/fcs/build.fsx
+++ b/fcs/build.fsx
@@ -89,7 +89,7 @@ Target "BuildVersion" (fun _ ->
 
 Target "Build" (fun _ ->
     runDotnet __SOURCE_DIRECTORY__ "build ../src/buildtools/buildtools.proj -v n -c Proto"
-    runDotnet __SOURCE_DIRECTORY__ "build FSharp.Compiler.Service.sln -v n -c release"
+    runDotnet __SOURCE_DIRECTORY__ (sprintf "build FSharp.Compiler.Service.sln -v n -c release -p:VersionPrefix=%s" assemblyVersion)
 )
 
 Target "Test" (fun _ ->
@@ -102,7 +102,7 @@ Target "Test" (fun _ ->
 )
 
 Target "NuGet" (fun _ ->
-    runDotnet __SOURCE_DIRECTORY__ "pack FSharp.Compiler.Service.sln -v n -c release"
+    runDotnet __SOURCE_DIRECTORY__ (sprintf "pack FSharp.Compiler.Service.sln -v n -c release -p:VersionPrefix=%s" assemblyVersion)
 )
 
 Target "GenerateDocsEn" (fun _ ->
diff --git a/fcs/fcs.props b/fcs/fcs.props
index 02416625a8..56429d03ab 100644
--- a/fcs/fcs.props
+++ b/fcs/fcs.props
@@ -2,13 +2,12 @@
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-
-    <VersionPrefix>27.0.1</VersionPrefix>
-    <OtherFlags>--version:$(VersionPrefix)</OtherFlags>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>    
+    <GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>    
     <!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build -->
     <!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful -->
     <ToolsetFsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</ToolsetFsiToolPath>
     <ToolsetFsiToolExe>fsi.exe</ToolsetFsiToolExe>
+    <!-- Disable AssemblyInformationalVersion errors for prerelease nuget version values -->
+    <NoWarn>2003;$(NoWarn)</NoWarn>
   </PropertyGroup>
 </Project>
\ No newline at end of file