Skip to content

Merge dev15.9 to master #6119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3 commits merged into from
Jan 17, 2019
Merged

Merge dev15.9 to master #6119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2af553
Update FSharp Core version to 4.5.5 (#6112)
KevinRansom Jan 16, 2019
de04e29
Apparently NuGetId is no longer a thing (#6122)
KevinRansom Jan 17, 2019
3edc0b8
Merge remote-tracking branch 'upstream/dev15.9' into merges/dev15.9-t…
KevinRansom Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/targets/AssemblyVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down