Skip to content

Merge master to release/dev16.2 #6894

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
Jun 1, 2019
Merged

Merge master to release/dev16.2 #6894

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f02a0f9
Merge remote-tracking branch 'upstream/dev16.1' into merges/merge-dev…
brettfo May 28, 2019
01fde33
Merge pull request #6892 from dotnet/merges/merge-dev16.1-to-master
brettfo May 28, 2019
f96a2f6
Merge branch 'release/dev16.2' into merges/master-to-release/dev16.2
brettfo Jun 1, 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
Prev Previous commit
Merge branch 'release/dev16.2' into merges/master-to-release/dev16.2
  • Loading branch information
@brettfo
brettfo authored Jun 1, 2019
commit f96a2f6e24c594070f1c15748f6c37b5a57d3eaf
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</PropertyGroup>
<PropertyGroup>
<VSMajorVersion>16</VSMajorVersion>
<VSMinorVersion>1</VSMinorVersion>
<VSMinorVersion>2</VSMinorVersion>
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
Expand Down
1 change: 1 addition & 0 deletions vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ open Microsoft.VisualStudio.LanguageServices.ProjectSystem
open Microsoft.VisualStudio.Shell
open Microsoft.VisualStudio.Shell.Interop
open Microsoft.VisualStudio.Text.Outlining
open FSharp.NativeInterop
open Microsoft.CodeAnalysis.ExternalAccess.FSharp

#nowarn "9" // NativePtr.toNativeInt
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.