diff --git a/NuGet.Config b/NuGet.Config index b0cec7b51e..735c63e5af 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,14 +1,8 @@ - - - - - - - - - + + + diff --git a/depversion.json b/depversion.json index c9ec793397..d9a9e8f7b3 100644 --- a/depversion.json +++ b/depversion.json @@ -1,16 +1,67 @@ { - "NETStandard.Library": "1.5.0-rc2-*", - - "Microsoft.DotNet.ProjectModel": "1.0.0-beta-*", - "Microsoft.DotNet.InternalAbstractions": "1.0.0-beta-*", - "Microsoft.Extensions.DependencyModel": "1.0.0-beta-*", - - "System.Diagnostics.Process": "4.1.0-rc2-*", - "System.IO.FileSystem.Watcher": "4.0.0-rc2-*", - "System.Threading.Thread": "4.0.0-rc2-*", - "System.Dynamic.Runtime": "4.0.11-rc2-*", - "System.Runtime.Serialization.Primitives": "4.1.0-rc2-*", - "System.Linq.Parallel": "4.0.1-rc2-*", - "System.Threading.Tasks.Parallel": "4.0.1-rc2-*", - "System.Security.Cryptography.Algorithms": "4.1.0-rc2-*" + "NETStandard.Library": "1.5.0-rc2-23931", + + "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202", + "Microsoft.DotNet.InternalAbstractions": "1.0.0-beta-002202", + "Microsoft.Extensions.DependencyModel": "1.0.0-beta-002202", + + "System.Diagnostics.Process": "4.1.0-rc2-23931", + "System.Dynamic.Runtime": "4.0.11-rc2-23931", + "System.IO.Compression": "4.1.0-rc2-23931", + "System.IO.FileSystem.Watcher": "4.0.0-rc2-23931", + "System.Linq.Expressions": "4.0.11-rc2-23931", + "System.Linq.Parallel": "4.0.1-rc2-23931", + "System.Reflection.TypeExtensions": "4.1.0-rc2-23931", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23931", + "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23931", + "System.Threading.Tasks.Parallel": "4.0.1-rc2-23931", + "System.Threading.Thread": "4.0.0-rc2-23931", + "System.Threading.ThreadPool": "4.0.10-rc2-23931", + "System.Xml.XDocument": "4.0.11-rc2-23931", + + "System.Reflection.Metadata": "1.3.0-rc2-23931", + + "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20447", + "Microsoft.Extensions.Configuration": "1.0.0-rc2-20447", + "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-20447", + "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc2-20447", + "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-20447", + "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20447", + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-20447", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20447", + "Microsoft.Extensions.Options": "1.0.0-rc2-20447", + "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-20447", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20447", + + "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-20447", + "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20447", + "Microsoft.AspNetCore.Http.Features": "1.0.0-rc2-20447", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20447", + + "Microsoft.CodeAnalysis": "1.3.0-beta1-20160321-04", + "Microsoft.CodeAnalysis.Common": "1.3.0-beta1-20160321-04", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160321-04", + "Microsoft.CodeAnalysis.CSharp.Features": "1.3.0-beta1-20160321-04", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160321-04", + "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "1.3.0-beta1-20160321-04", + + "Microsoft.Composition": "1.0.30", + "Microsoft.Web.Xdt": "2.1.1", + + "dotnet-test-xunit": "1.0.0-dev-128011-22", + "xunit": "2.1.0", + "xunit.runner.console": "2.1.0", + + "NuGet.Configuration": "3.5.0-beta-1123", + "NuGet.Core": "2.10.1", + "NuGet.Protocol.Core.v2": "3.3.0", + "NuGet.Protocol.Core.v3": "3.3.0", + "NuGet.Packaging": "3.5.0-beta-1123", + "NuGet.Packaging.Core": "3.5.0-beta-1123", + + "ScriptCs.Hosting": "0.14.1", + + "Newtonsoft.Json": "8.0.3", + + "ICSharpCode.NRefactory": "6.0.0-alpha3" } diff --git a/src/OmniSharp.Abstractions/project.json b/src/OmniSharp.Abstractions/project.json index c37f28badc..f1e1edb2ae 100644 --- a/src/OmniSharp.Abstractions/project.json +++ b/src/OmniSharp.Abstractions/project.json @@ -5,15 +5,16 @@ "preserveCompilationContext": true }, "dependencies": { - "Newtonsoft.Json": "8.0.2", - "Microsoft.CodeAnalysis": "1.1.1", + "Newtonsoft.Json": "8.0.3", + "Microsoft.CodeAnalysis": "1.3.0-beta1-20160321-04", "Microsoft.Composition": "1.0.30", - "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20143", - "Microsoft.Extensions.Configuration": "1.0.0-rc2-20143", - "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc2-20143", - "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20143", - "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20143", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20143" + "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20448", + "Microsoft.Extensions.Configuration": "1.0.0-rc2-20448", + "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc2-20448", + "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20448", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20448", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20448", + "System.Reflection.Metadata": "1.3.0-rc2-23931" }, "frameworks": { "net451": { @@ -38,10 +39,11 @@ "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*", - "System.Diagnostics.Process": "4.1.0-rc2-*", - "System.IO.FileSystem.Watcher": "4.0.0-rc2-*", - "System.Threading.Thread": "4.0.0-rc2-*" + "NETStandard.Library": "1.5.0-rc2-23931", + "System.Diagnostics.Process": "4.1.0-rc2-23931", + "System.Dynamic.Runtime": "4.0.11-rc2-23931", + "System.IO.FileSystem.Watcher": "4.0.0-rc2-23931", + "System.Threading.Thread": "4.0.0-rc2-23931" } } } diff --git a/src/OmniSharp.Bootstrap/project.json b/src/OmniSharp.Bootstrap/project.json index dd91f938fa..bf35eae34e 100644 --- a/src/OmniSharp.Bootstrap/project.json +++ b/src/OmniSharp.Bootstrap/project.json @@ -6,8 +6,8 @@ }, "dependencies": { "Microsoft.Composition": "1.0.30", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20143", - "Newtonsoft.Json": "8.0.2" + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20448", + "Newtonsoft.Json": "8.0.3" }, "commands": { "omnisharp.bootstrap": "run" @@ -25,9 +25,11 @@ "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*", - "System.Dynamic.Runtime": "4.0.11-rc2-*", - "System.Security.Cryptography.Algorithms": "4.1.0-rc2-*" + "NETStandard.Library": "1.5.0-rc2-23931", + "System.Dynamic.Runtime": "4.0.11-rc2-23931", + "System.Linq.Expressions": "4.0.11-rc2-23931", + "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23931", + "System.Xml.XDocument": "4.0.11-rc2-23931" } } } diff --git a/src/OmniSharp.DotNet/Tools/DummyLogger.cs b/src/OmniSharp.DotNet/Tools/DummyLogger.cs index e41d40a62e..2065924dd0 100644 --- a/src/OmniSharp.DotNet/Tools/DummyLogger.cs +++ b/src/OmniSharp.DotNet/Tools/DummyLogger.cs @@ -4,7 +4,7 @@ namespace Microsoft.Extensions.Logging { public class DummyLogger : ILogger { - public IDisposable BeginScopeImpl(object state) => new Disposable(); + public IDisposable BeginScope(TState state) => new Disposable(); public bool IsEnabled(LogLevel logLevel) => false; diff --git a/src/OmniSharp.DotNet/project.json b/src/OmniSharp.DotNet/project.json index 0167878869..9b532e7d48 100644 --- a/src/OmniSharp.DotNet/project.json +++ b/src/OmniSharp.DotNet/project.json @@ -6,10 +6,10 @@ "dependencies": { "OmniSharp.Abstractions": "1.0.0-*", "OmniSharp.Roslyn": "1.0.0-*", - "Microsoft.CodeAnalysis": "1.1.1", - "Microsoft.CodeAnalysis.Common": "1.1.1", - "Microsoft.DotNet.ProjectModel": "1.0.0-beta-*", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20143" + "Microsoft.CodeAnalysis": "1.3.0-beta1-20160321-04", + "Microsoft.CodeAnalysis.Common": "1.3.0-beta1-20160321-04", + "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20448" }, "frameworks": { "net451": { @@ -24,7 +24,11 @@ "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*" + "NETStandard.Library": "1.5.0-rc2-23931", + "System.IO.Compression": "4.1.0-rc2-23931", + "System.Runtime.Loader": "4.0.0-rc2-23931", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23931", + "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23931" } } } diff --git a/src/OmniSharp.Host/project.json b/src/OmniSharp.Host/project.json index 5e2ad1603b..750c95c62c 100644 --- a/src/OmniSharp.Host/project.json +++ b/src/OmniSharp.Host/project.json @@ -10,18 +10,18 @@ "OmniSharp.Stdio": "1.0.0-*", "OmniSharp.Plugins": "1.0.0-*", "OmniSharp.Roslyn": "1.0.0-*", - "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-20143", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20143", + "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-20448", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20448", "Microsoft.Composition": "1.0.30", - "Microsoft.DotNet.ProjectModel": "1.0.0-beta-*", - "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20143", - "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-20143", - "Microsoft.Extensions.DependencyModel": "1.0.0-beta-*", - "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-20143", - "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20143", - "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20143", - "Microsoft.Extensions.Options": "1.0.0-rc2-20143", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-20143" + "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202", + "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-20448", + "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-20448", + "Microsoft.Extensions.DependencyModel": "1.0.0-beta-002202", + "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-20448", + "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20448", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20448", + "Microsoft.Extensions.Options": "1.0.0-rc2-20448", + "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-20448" }, "frameworks": { "net451": { @@ -37,7 +37,9 @@ "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*" + "NETStandard.Library": "1.5.0-rc2-23931", + "System.Runtime.Loader": "4.0.0-rc2-23931", + "System.IO.Compression": "4.1.0-rc2-23931" } } } diff --git a/src/OmniSharp.MSBuild/project.json b/src/OmniSharp.MSBuild/project.json index f2872a2d0a..3c16189c6e 100644 --- a/src/OmniSharp.MSBuild/project.json +++ b/src/OmniSharp.MSBuild/project.json @@ -7,7 +7,7 @@ "dependencies": { "OmniSharp.Abstractions": "1.0.0-*", "OmniSharp.Roslyn.CSharp": "1.0.0-*", - "Microsoft.Extensions.Options": "1.0.0-rc2-20143" + "Microsoft.Extensions.Options": "1.0.0-rc2-20448" }, "frameworks": { "net451": { diff --git a/src/OmniSharp.Nuget/project.json b/src/OmniSharp.Nuget/project.json index 9154d9ce82..3d02c78ceb 100644 --- a/src/OmniSharp.Nuget/project.json +++ b/src/OmniSharp.Nuget/project.json @@ -11,11 +11,11 @@ "frameworks": { "net451": { "dependencies": { - "NuGet.Configuration": "3.4.0-rtm-0733", + "NuGet.Configuration": "3.5.0-beta-1123", "NuGet.Protocol.Core.v2": "3.3.0", "NuGet.Protocol.Core.v3": "3.3.0", - "NuGet.Packaging": "3.4.0-rtm-0733", - "NuGet.Packaging.Core": "3.4.0-rtm-0733", + "NuGet.Packaging": "3.5.0-beta-1123", + "NuGet.Packaging.Core": "3.5.0-beta-1123", "Microsoft.Web.Xdt": "2.1.1" }, "frameworkAssemblies": { @@ -36,7 +36,7 @@ "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*" + "NETStandard.Library": "1.5.0-rc2-23931" } } } diff --git a/src/OmniSharp.Plugins/project.json b/src/OmniSharp.Plugins/project.json index b66e79f198..15a3a14076 100644 --- a/src/OmniSharp.Plugins/project.json +++ b/src/OmniSharp.Plugins/project.json @@ -6,12 +6,12 @@ }, "dependencies": { "OmniSharp.Abstractions": "1.0.0-*", - "Newtonsoft.Json": "8.0.2", - "Microsoft.CodeAnalysis": "1.1.1", - "Microsoft.CodeAnalysis.CSharp": "1.1.1", - "Microsoft.CodeAnalysis.CSharp.Features": "1.1.1", - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.1", - "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "1.1.1" + "Newtonsoft.Json": "8.0.3", + "Microsoft.CodeAnalysis": "1.3.0-beta1-20160321-04", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160321-04", + "Microsoft.CodeAnalysis.CSharp.Features": "1.3.0-beta1-20160321-04", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160321-04", + "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "1.3.0-beta1-20160321-04" }, "frameworks": { "net451": { @@ -26,7 +26,7 @@ "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*" + "NETStandard.Library": "1.5.0-rc2-23931" } } } diff --git a/src/OmniSharp.Roslyn.CSharp/CodeActions/RoslynCodeActionProvider.cs b/src/OmniSharp.Roslyn.CSharp/CodeActions/RoslynCodeActionProvider.cs index 46aac663a8..c72607f09f 100644 --- a/src/OmniSharp.Roslyn.CSharp/CodeActions/RoslynCodeActionProvider.cs +++ b/src/OmniSharp.Roslyn.CSharp/CodeActions/RoslynCodeActionProvider.cs @@ -10,8 +10,8 @@ public class RoslynCodeActionProvider : AbstractCodeActionProvider [ImportingConstructor] public RoslynCodeActionProvider(IOmnisharpAssemblyLoader loader) : base("Roslyn", loader, - "Microsoft.CodeAnalysis.CSharp.Features, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35", - "Microsoft.CodeAnalysis.Features, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35") + "Microsoft.CodeAnalysis.CSharp.Features, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35", + "Microsoft.CodeAnalysis.Features, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35") { } } } diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Intellisense/IntellisenseService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Intellisense/IntellisenseService.cs index dde825d38e..1bf9972cd3 100644 --- a/src/OmniSharp.Roslyn.CSharp/Services/Intellisense/IntellisenseService.cs +++ b/src/OmniSharp.Roslyn.CSharp/Services/Intellisense/IntellisenseService.cs @@ -43,7 +43,7 @@ public async Task> Handle(AutoCompleteRequest AddKeywords(completions, model, position, request.WantKind, wordToComplete); - var symbols = Recommender.GetRecommendedSymbolsAtPosition(model, position, _workspace); + var symbols = await Recommender.GetRecommendedSymbolsAtPositionAsync(model, position, _workspace); foreach (var symbol in symbols.Where(s => s.Name.IsValidCompletionFor(wordToComplete))) { diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Navigation/FindImplementationsService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Navigation/FindImplementationsService.cs index 3e88ef6f01..a9ca3523b4 100644 --- a/src/OmniSharp.Roslyn.CSharp/Services/Navigation/FindImplementationsService.cs +++ b/src/OmniSharp.Roslyn.CSharp/Services/Navigation/FindImplementationsService.cs @@ -33,7 +33,7 @@ public async Task Handle(FindImplementationsRequest request) var semanticModel = await document.GetSemanticModelAsync(); var sourceText = await document.GetTextAsync(); var position = sourceText.Lines.GetPosition(new LinePosition(request.Line - 1, request.Column - 1)); - var symbol = SymbolFinder.FindSymbolAtPosition(semanticModel, position, _workspace); + var symbol = await SymbolFinder.FindSymbolAtPositionAsync(semanticModel, position, _workspace); var quickFixes = new List(); var implementations = await SymbolFinder.FindImplementationsAsync(symbol, _workspace.CurrentSolution); diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Navigation/FindUsagesService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Navigation/FindUsagesService.cs index 6fab94a7cf..ed8d5b01d2 100644 --- a/src/OmniSharp.Roslyn.CSharp/Services/Navigation/FindUsagesService.cs +++ b/src/OmniSharp.Roslyn.CSharp/Services/Navigation/FindUsagesService.cs @@ -33,7 +33,7 @@ public async Task Handle(FindUsagesRequest request) var semanticModel = await document.GetSemanticModelAsync(); var sourceText = await document.GetTextAsync(); var position = sourceText.Lines.GetPosition(new LinePosition(request.Line - 1, request.Column - 1)); - var symbol = SymbolFinder.FindSymbolAtPosition(semanticModel, position, _workspace); + var symbol = await SymbolFinder.FindSymbolAtPositionAsync(semanticModel, position, _workspace); var definition = await SymbolFinder.FindSourceDefinitionAsync(symbol, _workspace.CurrentSolution); var usages = request.OnlyThisFile ? await SymbolFinder.FindReferencesAsync(definition ?? symbol, _workspace.CurrentSolution, ImmutableHashSet.Create(document)) diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Navigation/GotoDefinitionService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Navigation/GotoDefinitionService.cs index 8b592aee10..c2a175bc1f 100644 --- a/src/OmniSharp.Roslyn.CSharp/Services/Navigation/GotoDefinitionService.cs +++ b/src/OmniSharp.Roslyn.CSharp/Services/Navigation/GotoDefinitionService.cs @@ -37,7 +37,7 @@ public async Task Handle(GotoDefinitionRequest request) var syntaxTree = semanticModel.SyntaxTree; var sourceText = await document.GetTextAsync(); var position = sourceText.Lines.GetPosition(new LinePosition(request.Line - 1, request.Column - 1)); - var symbol = SymbolFinder.FindSymbolAtPosition(semanticModel, position, _workspace); + var symbol = await SymbolFinder.FindSymbolAtPositionAsync(semanticModel, position, _workspace); if (symbol != null) { diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Types/TypeLookup.cs b/src/OmniSharp.Roslyn.CSharp/Services/Types/TypeLookup.cs index 70133a9157..90e729e9d9 100644 --- a/src/OmniSharp.Roslyn.CSharp/Services/Types/TypeLookup.cs +++ b/src/OmniSharp.Roslyn.CSharp/Services/Types/TypeLookup.cs @@ -32,7 +32,7 @@ public async Task Handle(TypeLookupRequest request) var semanticModel = await document.GetSemanticModelAsync(); var sourceText = await document.GetTextAsync(); var position = sourceText.Lines.GetPosition(new LinePosition(request.Line - 1, request.Column - 1)); - var symbol = SymbolFinder.FindSymbolAtPosition(semanticModel, position, _workspace); + var symbol = await SymbolFinder.FindSymbolAtPositionAsync(semanticModel, position, _workspace); if (symbol != null) { //non regular C# code semantics (interactive, script) don't allow namespaces diff --git a/src/OmniSharp.Roslyn.CSharp/project.json b/src/OmniSharp.Roslyn.CSharp/project.json index 596d458060..5b11d00de0 100644 --- a/src/OmniSharp.Roslyn.CSharp/project.json +++ b/src/OmniSharp.Roslyn.CSharp/project.json @@ -7,9 +7,9 @@ "dependencies": { "OmniSharp.Abstractions": "1.0.0-*", "OmniSharp.Roslyn": "1.0.0-*", - "Microsoft.CodeAnalysis.CSharp": "1.1.1", - "Microsoft.CodeAnalysis.CSharp.Features": "1.1.1", - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.1" + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160321-04", + "Microsoft.CodeAnalysis.CSharp.Features": "1.3.0-beta1-20160321-04", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160321-04" }, "frameworks": { "net451": { @@ -35,8 +35,8 @@ "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*", - "System.Threading.Tasks.Parallel": "4.0.1-rc2-*" + "NETStandard.Library": "1.5.0-rc2-23931", + "System.Threading.Tasks.Parallel": "4.0.1-rc2-23931" } } } diff --git a/src/OmniSharp.Roslyn/project.json b/src/OmniSharp.Roslyn/project.json index c7ec733f23..6c1d824cf7 100644 --- a/src/OmniSharp.Roslyn/project.json +++ b/src/OmniSharp.Roslyn/project.json @@ -6,8 +6,8 @@ }, "dependencies": { "OmniSharp.Abstractions": "1.0.0-*", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20143", - "Microsoft.CodeAnalysis": "1.1.1" + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20448", + "Microsoft.CodeAnalysis": "1.3.0-beta1-20160321-04" }, "frameworks": { "net451": { @@ -34,7 +34,9 @@ "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*" + "NETStandard.Library": "1.5.0-rc2-23931", + "System.Reflection.TypeExtensions": "4.1.0-rc2-23931", + "System.Xml.XDocument": "4.0.11-rc2-23931" } } } diff --git a/src/OmniSharp.Stdio/Logging/StdioLogger.cs b/src/OmniSharp.Stdio/Logging/StdioLogger.cs index b23f22de3e..7f23ce14b0 100644 --- a/src/OmniSharp.Stdio/Logging/StdioLogger.cs +++ b/src/OmniSharp.Stdio/Logging/StdioLogger.cs @@ -19,7 +19,7 @@ internal StdioLogger(ISharedTextWriter writer, string name, Func(TState state) { return new NoopDisposable(); } diff --git a/src/OmniSharp.Stdio/StdioServer.cs b/src/OmniSharp.Stdio/StdioServer.cs index 0393464214..fab2e167f7 100644 --- a/src/OmniSharp.Stdio/StdioServer.cs +++ b/src/OmniSharp.Stdio/StdioServer.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Http.Internal; +using Microsoft.Extensions.ObjectPool; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using OmniSharp.Stdio.Features; @@ -22,6 +22,7 @@ public class StdioServer : IServer private readonly CancellationTokenSource _cancellation; private readonly IHttpContextFactory _httpContextFactory; private readonly IHttpContextAccessor _httpContextAccessor; + private readonly ObjectPoolProvider _objectPoolProvider; private readonly object _lock = new object(); public StdioServer(TextReader input, ISharedTextWriter writer) @@ -31,7 +32,8 @@ public StdioServer(TextReader input, ISharedTextWriter writer) _cancellation = new CancellationTokenSource(); _httpContextAccessor = new HttpContextAccessor(); - _httpContextFactory = new HttpContextFactory(_httpContextAccessor); + _objectPoolProvider = new DefaultObjectPoolProvider(); + _httpContextFactory = new HttpContextFactory(_objectPoolProvider, _httpContextAccessor); var features = new FeatureCollection(); var requestFeature = new RequestFeature(); diff --git a/src/OmniSharp.Stdio/project.json b/src/OmniSharp.Stdio/project.json index c2df51fabc..c6dc37cf56 100644 --- a/src/OmniSharp.Stdio/project.json +++ b/src/OmniSharp.Stdio/project.json @@ -7,9 +7,9 @@ }, "dependencies": { "OmniSharp.Abstractions": "1.0.0-*", - "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20143", - "Microsoft.AspNetCore.Http.Features": "1.0.0-rc2-20143", - "Newtonsoft.Json": "8.0.2" + "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20448", + "Microsoft.AspNetCore.Http.Features": "1.0.0-rc2-20448", + "Newtonsoft.Json": "8.0.3" }, "frameworks": { "net451": {}, @@ -20,8 +20,8 @@ "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*", - "System.Runtime.Serialization.Primitives": "4.1.0-rc2-*" + "NETStandard.Library": "1.5.0-rc2-23931", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23931" } } } diff --git a/src/OmniSharp/project.json b/src/OmniSharp/project.json index 6e2ebfbc9f..b4f1ee85be 100644 --- a/src/OmniSharp/project.json +++ b/src/OmniSharp/project.json @@ -23,8 +23,8 @@ "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-beta-*" + "NETStandard.Library": "1.5.0-rc2-23931", + "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202" } } }, diff --git a/tests/OmniSharp.Bootstrap.Tests/project.json b/tests/OmniSharp.Bootstrap.Tests/project.json index c56ebf814c..ef3581f3b3 100644 --- a/tests/OmniSharp.Bootstrap.Tests/project.json +++ b/tests/OmniSharp.Bootstrap.Tests/project.json @@ -5,20 +5,32 @@ }, "dependencies": { "OmniSharp.Bootstrap": "1.0.0-*", - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.1", - "Microsoft.Extensions.DependencyModel": "1.0.0-beta-*", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160321-04", + "Microsoft.Extensions.DependencyModel": "1.0.0-beta-002202", "xunit": "2.1.0" }, "frameworks": { "netcoreapp1.0": { "imports": [ + "netstandardapp1.5", "dnxcore50", "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-beta-*", - "dotnet-test-xunit": "1.0.0-dev-91790-12" + "NETStandard.Library": "1.5.0-rc2-23931", + "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202", + "Microsoft.DotNet.InternalAbstractions": "1.0.0-beta-002202", + "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-20448", + "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-20448", + "NuGet.Packaging": "3.5.0-beta-1123", + "System.Diagnostics.Process": "4.1.0-rc2-23931", + "System.IO.Compression": "4.1.0-rc2-23931", + "System.Linq.Expressions": "4.0.11-rc2-23931", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23931", + "System.Runtime.Loader": "4.0.0-rc2-23931", + "System.Threading.Thread": "4.0.0-rc2-23931", + "System.Threading.ThreadPool": "4.0.10-rc2-23931", + "dotnet-test-xunit": "1.0.0-dev-128011-22" } }, "net451": { diff --git a/tests/OmniSharp.MSBuild.Tests/project.json b/tests/OmniSharp.MSBuild.Tests/project.json index 68a008ea75..51458af9b6 100644 --- a/tests/OmniSharp.MSBuild.Tests/project.json +++ b/tests/OmniSharp.MSBuild.Tests/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "OmniSharp.Tests": "1.0.0-*", - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.1", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160321-04", "xunit": "2.1.0" }, "frameworks": { diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/project.json b/tests/OmniSharp.Roslyn.CSharp.Tests/project.json index f606bd22be..b8f8c0f75c 100644 --- a/tests/OmniSharp.Roslyn.CSharp.Tests/project.json +++ b/tests/OmniSharp.Roslyn.CSharp.Tests/project.json @@ -6,20 +6,22 @@ "dependencies": { "OmniSharp.Tests": "1.0.0-*", "OmniSharp.Roslyn.CSharp": "1.0.0-*", - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.1", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160321-04", "xunit": "2.1.0" }, "frameworks": { "netcoreapp1.0": { "imports": [ + "netstandardapp1.5", "dnxcore50", "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*", - "System.Linq.Parallel": "4.0.1-rc2-*", - "System.Threading.Tasks.Parallel": "4.0.1-rc2-*", - "dotnet-test-xunit": "1.0.0-dev-91790-12" + "NETStandard.Library": "1.5.0-rc2-23931", + "System.Linq.Parallel": "4.0.1-rc2-23931", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23931", + "System.Threading.Tasks.Parallel": "4.0.1-rc2-23931", + "dotnet-test-xunit": "1.0.0-dev-128011-22" } }, "net451": { diff --git a/tests/OmniSharp.Stdio.Tests/project.json b/tests/OmniSharp.Stdio.Tests/project.json index 88c7dba376..4558dffc91 100644 --- a/tests/OmniSharp.Stdio.Tests/project.json +++ b/tests/OmniSharp.Stdio.Tests/project.json @@ -5,19 +5,26 @@ }, "dependencies": { "OmniSharp.Stdio": "1.0.0-*", - "Newtonsoft.Json": "8.0.2", + "Newtonsoft.Json": "8.0.3", "xunit": "2.1.0" }, "frameworks": { "netcoreapp1.0": { "imports": [ + "netstandardapp1.5", "dnxcore50", "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-beta-*", - "dotnet-test-xunit": "1.0.0-dev-91790-12" + "NETStandard.Library": "1.5.0-rc2-23931", + "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202", + "NuGet.Packaging": "3.5.0-beta-1123", + "System.IO.Compression": "4.1.0-rc2-23931", + "System.Runtime.Loader": "4.0.0-rc2-23931", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23931", + "System.Threading.ThreadPool": "4.0.10-rc2-23931", + "System.Xml.XDocument": "4.0.11-rc2-23931", + "dotnet-test-xunit": "1.0.0-dev-128011-22" } }, "net451": { diff --git a/tests/OmniSharp.Tests/EndpointMiddlewareFacts.cs b/tests/OmniSharp.Tests/EndpointMiddlewareFacts.cs index 1a49876fb8..4e601f3c71 100644 --- a/tests/OmniSharp.Tests/EndpointMiddlewareFacts.cs +++ b/tests/OmniSharp.Tests/EndpointMiddlewareFacts.cs @@ -6,7 +6,6 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Internal; using Microsoft.CodeAnalysis; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; @@ -92,7 +91,7 @@ class Disposable : IDisposable { public void Dispose() { } } class Logger : ILogger { - public IDisposable BeginScopeImpl(object state) => new Disposable(); + public IDisposable BeginScope(TState state) => new Disposable(); public bool IsEnabled(LogLevel logLevel) => true; public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) { } } diff --git a/tests/OmniSharp.Tests/Fakes/FakeLogger.cs b/tests/OmniSharp.Tests/Fakes/FakeLogger.cs index 468705c4ed..dd5a12b572 100644 --- a/tests/OmniSharp.Tests/Fakes/FakeLogger.cs +++ b/tests/OmniSharp.Tests/Fakes/FakeLogger.cs @@ -7,10 +7,11 @@ public class FakeLogger : ILogger { public bool IsEnabled(LogLevel level) => true; - public IDisposable BeginScopeImpl(object owner) => new NoopDisposable(); + public IDisposable BeginScope(TState state) => new NoopDisposable(); public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) { } + private class NoopDisposable : IDisposable { public void Dispose() { } diff --git a/tests/OmniSharp.Tests/TestHelpers.cs b/tests/OmniSharp.Tests/TestHelpers.cs index 378c7ca0ff..46ef25cd2a 100644 --- a/tests/OmniSharp.Tests/TestHelpers.cs +++ b/tests/OmniSharp.Tests/TestHelpers.cs @@ -206,7 +206,7 @@ public static async Task SymbolFromQuickFix(OmnisharpWorkspace workspac var sourceText = await document.GetTextAsync(); var position = sourceText.Lines.GetPosition(new LinePosition(result.Line - 1, result.Column - 1)); var semanticModel = await document.GetSemanticModelAsync(); - return SymbolFinder.FindSymbolAtPosition(semanticModel, position, workspace); + return await SymbolFinder.FindSymbolAtPositionAsync(semanticModel, position, workspace); } public static async Task> SymbolsFromQuickFixes(OmnisharpWorkspace workspace, IEnumerable quickFixes) diff --git a/tests/OmniSharp.Tests/project.json b/tests/OmniSharp.Tests/project.json index 4be07ffa86..eeb3bdde5e 100644 --- a/tests/OmniSharp.Tests/project.json +++ b/tests/OmniSharp.Tests/project.json @@ -6,21 +6,24 @@ "dependencies": { "OmniSharp.Host": "1.0.0-*", "OmniSharp.Roslyn.CSharp": "1.0.0-*", - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.1", - "Microsoft.DotNet.InternalAbstractions": "1.0.0-beta-*", - "Microsoft.Extensions.DependencyModel": "1.0.0-beta-*", + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160321-04", + "Microsoft.DotNet.InternalAbstractions": "1.0.0-beta-002202", + "Microsoft.Extensions.DependencyModel": "1.0.0-beta-002202", "xunit": "2.1.0" }, "frameworks": { "netcoreapp1.0": { "imports": [ + "netstandardapp1.5", "dnxcore50", "portable-net45+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-beta-*", - "dotnet-test-xunit": "1.0.0-dev-91790-12" + "NETStandard.Library": "1.5.0-rc2-23931", + "Microsoft.DotNet.ProjectModel": "1.0.0-beta-002202", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23931", + "System.IO.Compression": "4.1.0-rc2-23931", + "dotnet-test-xunit": "1.0.0-dev-128011-22" } }, "net451": {