Fixversioningmerge --- Fix merge issue that messed with versioning (#4186)

* Fix merge issue with versioning

* Rev buildFrom source versions

* Fixup vs tests

Author: KevinRansom

src/FSharpSource.Settings.targets

@@ -19,6 +19,13 @@
   </PropertyGroup>
 
   <!-- Version number computation -->
+  <PropertyGroup>
+    <FSCoreVersion>4.4.3.0</FSCoreVersion>
+    <FSProductVersion>10.1.0.0</FSProductVersion>
+    <FSPackageVersion>10.1.0</FSPackageVersion>
+    <VSAssemblyVersion>15.6.0.0</VSAssemblyVersion>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- Put build number 0 and today's date if this was a local build -->
     <BUILD_BUILDNUMBER Condition="'$(BUILD_BUILDNUMBER)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd.0))</BUILD_BUILDNUMBER>
@@ -38,9 +45,13 @@
     <_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>
     <Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
 
-    <FSCoreVersion>4.4.3.0</FSCoreVersion>
     <MicroBuildAssemblyVersion Condition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>
-    <MicroBuildAssemblyVersion Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">15.4.3.0</MicroBuildAssemblyVersion>
+
+    <!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion --> 
+    <MicroBuildAssemblyVersion Condition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersion)</MicroBuildAssemblyVersion> 
+
+    <!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion --> 
+    <MicroBuildAssemblyVersion Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">$(VSAssemblyVersion)</MicroBuildAssemblyVersion> 
 
     <!--
 
@@ -62,11 +73,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <FSCoreVersion>4.4.3.0</FSCoreVersion>
-    <FSProductVersion>10.1.0.0</FSProductVersion>
-    <FSPackageVersion>10.1.0</FSPackageVersion>
-    <VSAssemblyVersion>15.6.0.0</VSAssemblyVersion>
-
     <RoslynVersion>2.6.0-vs-for-mac-62329-05</RoslynVersion>
     <RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
     <RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>

src/buildfromsource/BuildFromSource.targets

@@ -3,7 +3,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <FSCoreVersion>4.4.1.0</FSCoreVersion>
+    <FSCoreVersion>4.4.3.0</FSCoreVersion>
     <OutputPath>$(MSBuildThisFileDirectory)../../BuildFromSource/$(Configuration)/bin</OutputPath>
     <FSharpSourcesRoot>$(MSBuildThisFileDirectory)..</FSharpSourcesRoot>
 

src/buildfromsource/FSharp.Build/AssemblyInfo.fs

@@ -8,7 +8,7 @@ open System.Reflection
 [<assembly:AssemblyTitle("FSharp.Build.dll")>]
 [<assembly:AssemblyCopyright("\169 Microsoft Corporation.  All Rights Reserved.")>]
 [<assembly:AssemblyProduct("Microsoft\174 F#")>]
-[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
-[<assembly:AssemblyVersion("4.4.1.0")>]
+[<assembly:AssemblyInformationalVersion("4.4.3.0")>]
+[<assembly:AssemblyVersion("4.4.3.0")>]
 [<assembly:AssemblyFileVersion("2017.06.27.0")>]
 do()

src/buildfromsource/FSharp.Compiler.Interactive.Settings/AssemblyInfo.fs

@@ -10,7 +10,7 @@ open System.Runtime.InteropServices
 [<assembly:AssemblyCopyright("\169 Microsoft Corporation.  All Rights Reserved.")>]
 [<assembly:AssemblyProduct("Microsoft\174 F#")>]
 [<assembly:ComVisible(false)>]
-[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
-[<assembly:AssemblyVersion("4.4.1.0")>]
+[<assembly:AssemblyInformationalVersion("4.4.3.0")>]
+[<assembly:AssemblyVersion("4.4.3.0")>]
 [<assembly:AssemblyFileVersion("2017.06.27.0")>]
 do()

src/buildfromsource/FSharp.Compiler.Private/AssemblyInfo.fs

@@ -10,7 +10,7 @@ open System.Runtime.InteropServices
 [<assembly:AssemblyCopyright("\169 Microsoft Corporation.  All Rights Reserved.")>]
 [<assembly:AssemblyProduct("Microsoft\174 F#")>]
 [<assembly:ComVisible(false)>]
-[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
-[<assembly:AssemblyVersion("4.4.1.0")>]
+[<assembly:AssemblyInformationalVersion("4.4.3.0")>]
+[<assembly:AssemblyVersion("4.4.3.0")>]
 [<assembly:AssemblyFileVersion("2017.06.27.0")>]
 do()

src/buildfromsource/FSharp.Core/AssemblyInfo.fs

@@ -16,8 +16,8 @@ open System.Runtime.InteropServices
 [<assembly:AssemblyFlags(System.Reflection.AssemblyNameFlags.Retargetable)>]
 #endif
 
-[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
-[<assembly:AssemblyVersion("4.4.1.0")>]
+[<assembly:AssemblyInformationalVersion("4.4.3.0")>]
+[<assembly:AssemblyVersion("4.4.3.0")>]
 [<assembly:AssemblyFileVersion("2017.06.27.0")>]
 do()
 

src/buildfromsource/Fsc/AssemblyInfo.fs

@@ -10,7 +10,7 @@ open System.Runtime.InteropServices
 [<assembly:AssemblyCopyright("\169 Microsoft Corporation.  All Rights Reserved.")>]
 [<assembly:AssemblyProduct("Microsoft\174 F#")>]
 [<assembly:ComVisible(false)>]
-[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
-[<assembly:AssemblyVersion("4.4.1.0")>]
+[<assembly:AssemblyInformationalVersion("4.4.3.0")>]
+[<assembly:AssemblyVersion("4.4.3.0")>]
 [<assembly:AssemblyFileVersion("2017.06.27.0")>]
 do()

src/buildfromsource/Fsi/AssemblyInfo.fs

@@ -7,7 +7,7 @@ open System.Reflection
 [<assembly:AssemblyTitle("fsi.exe")>]
 [<assembly:AssemblyCopyright("\169 Microsoft Corporation.  All Rights Reserved.")>]
 [<assembly:AssemblyProduct("Microsoft\174 F#")>]
-[<assembly:AssemblyInformationalVersion("4.4.1.0")>]
-[<assembly:AssemblyVersion("4.4.1.0")>]
+[<assembly:AssemblyInformationalVersion("4.4.3.0")>]
+[<assembly:AssemblyVersion("4.4.3.0")>]
 [<assembly:AssemblyFileVersion("2017.06.27.0")>]
 do()

vsintegration/tests/unittests/LegacyLanguageService/Tests.LanguageService.Script.fs

@@ -1343,7 +1343,7 @@ type UsingMSBuild() as this =
             "4.4.0.0"
 #endif
 #if VS_VERSION_DEV15
-            "4.4.3.0"
+            "10.1.0.0"
 #endif
         let binariesFolder = match Internal.Utilities.FSharpEnvironment.BinFolderOfDefaultFSharpCompiler(None) with
                              | Some(x) -> x