Skip to content

Commit b16b270

Browse files
author
Omar Tawfik
committed
Upgrade to Roslyn 2.0.0-beta6-61005-05
1 parent 4e69865 commit b16b270

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

packages.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
<package id="WiX.Toolset.2015" version="3.10.0.1503" />
1919
<package id="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
2020
<package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
21-
<package id="Microsoft.CodeAnalysis.Common" version="2.0.0-beta6-61003-06" targetFramework="net46" />
22-
<package id="Microsoft.CodeAnalysis.EditorFeatures" version="2.0.0-beta6-61003-06" targetFramework="net46" />
23-
<package id="Microsoft.CodeAnalysis.EditorFeatures.Text" version="2.0.0-beta6-61003-06" targetFramework="net46" />
24-
<package id="Microsoft.CodeAnalysis.Features" version="2.0.0-beta6-61003-06" targetFramework="net46" />
25-
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="2.0.0-beta6-61003-06" targetFramework="net46" />
26-
<package id="Microsoft.VisualStudio.LanguageServices" version="2.0.0-beta6-61003-06" targetFramework="net46" />
21+
<package id="Microsoft.CodeAnalysis.Common" version="2.0.0-beta6-61005-05" targetFramework="net46" />
22+
<package id="Microsoft.CodeAnalysis.EditorFeatures" version="2.0.0-beta6-61005-05" targetFramework="net46" />
23+
<package id="Microsoft.CodeAnalysis.EditorFeatures.Text" version="2.0.0-beta6-61005-05" targetFramework="net46" />
24+
<package id="Microsoft.CodeAnalysis.Features" version="2.0.0-beta6-61005-05" targetFramework="net46" />
25+
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="2.0.0-beta6-61005-05" targetFramework="net46" />
26+
<package id="Microsoft.VisualStudio.LanguageServices" version="2.0.0-beta6-61005-05" targetFramework="net46" />
2727
<package id="Microsoft.Composition" version="1.0.27" targetFramework="net46" />
2828
<package id="Microsoft.VisualStudio.Threading" version="14.1.131" targetFramework="net46" />
2929
<package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net46" />

src/FSharpSource.Settings.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<FsiToolExe>fsi.exe</FsiToolExe>
9191
<FsLexToolExe>fslex.exe</FsLexToolExe>
9292
<FsYaccToolExe>fsyacc.exe</FsYaccToolExe>
93-
<RoslynVersion>2.0.0-beta6-61003-06</RoslynVersion>
93+
<RoslynVersion>2.0.0-beta6-61005-05</RoslynVersion>
9494
<RoslynVSBinariesVersion>14.0</RoslynVSBinariesVersion>
9595
<RoslynVSPackagesVersion>14.3.25407</RoslynVSPackagesVersion>
9696
</PropertyGroup>

vsintegration/src/FSharp.Editor/LanguageService.fs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,12 @@ type internal FSharpLanguageService(package : FSharpPackage) =
5252
override this.RoslynLanguageName = FSharpCommonConstants.FSharpLanguageName
5353

5454
override this.LanguageServiceId = new Guid(FSharpCommonConstants.languageServiceGuidString)
55+
override this.DebuggerLanguageId = DebuggerEnvironment.GetLanguageID()
56+
57+
override this.CreateContext(_,_,_,_,_) = raise(System.NotImplementedException())
5558

5659
override this.SetupNewTextView(view) =
60+
base.SetupNewTextView(view)
5761
let workspace = this.Package.ComponentModel.GetService<VisualStudioWorkspaceImpl>();
5862

5963
// FSROSLYNTODO: Hide navigation bars for now. Enable after adding tests

0 commit comments

Comments
 (0)