Merge remote-tracking branch 'upstream/dev15.9' into merges/dev15.9-to-master

build/targets/AssemblyVersions.props

@@ -22,7 +22,7 @@
     <Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
 
     <FSCoreMajorVersion>4.5</FSCoreMajorVersion>
-    <FSCorePackageVersion>$(FSCoreMajorVersion).3</FSCorePackageVersion>
+    <FSCorePackageVersion>$(FSCoreMajorVersion).5</FSCorePackageVersion>
     <FSCoreVersion>$(FSCoreMajorVersion).0.0</FSCoreVersion>
 
     <FSPackageMajorVersion>10.2</FSPackageMajorVersion>

vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj

@@ -68,7 +68,7 @@
       We require a reference to Microsoft.VisualStudio.Shell.14.0.dll, but that causes some issues with duplicate type
       names.  The ~hack~ fix is to include the package reference and ensure the Aliases metadata gets set afterwards.
       -->
-      <ReferencePathWithRefAssemblies Update="%(Identity)" Aliases="Shell14" Condition="'%(ReferencePathWithRefAssemblies.NuGetPackageId)' == 'Microsoft.VisualStudio.Shell.14.0'" />
+      <ReferencePathWithRefAssemblies Update="%(Identity)" Aliases="Shell14" Condition="'%(ReferencePathWithRefAssemblies.FusionName)' == 'Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'" />
     </ItemGroup>
   </Target>