Skip to content

Commit

Permalink
Merge pull request #500 from OmniSharp/troy/fix.deps
Browse files Browse the repository at this point in the history
Update dependencies to the latests:
* ASP.NET packages to 1.0.0-rc2-20448
* CLI packages to 1.0.0-beta-002202
* Roslyn packages to 1.3.0-beta1
  • Loading branch information
troydai committed Apr 4, 2016
2 parents f2939e4 + 8356c00 commit 2f4774e
Show file tree
Hide file tree
Showing 30 changed files with 203 additions and 120 deletions.
12 changes: 3 additions & 9 deletions NuGet.Config
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<!-- OmniSharp-Roslyn-CI feed is a mirror of following sources. -->
<add key="aspnet" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
<add key="dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" />
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
<add key="nuget" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<clear />
<add key="omnisharp" value="https://www.myget.org/F/omnisharp-roslyn-ci/api/v3/index.json" />
<clear/>
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
79 changes: 65 additions & 14 deletions depversion.json
Original file line number Diff line number Diff line change
@@ -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"
}
26 changes: 14 additions & 12 deletions src/OmniSharp.Abstractions/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
}
}
Expand Down
12 changes: 7 additions & 5 deletions src/OmniSharp.Bootstrap/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/OmniSharp.DotNet/Tools/DummyLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace Microsoft.Extensions.Logging
{
public class DummyLogger<T> : ILogger<T>
{
public IDisposable BeginScopeImpl(object state) => new Disposable();
public IDisposable BeginScope<TState>(TState state) => new Disposable();

public bool IsEnabled(LogLevel logLevel) => false;

Expand Down
14 changes: 9 additions & 5 deletions src/OmniSharp.DotNet/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
}
}
Expand Down
26 changes: 14 additions & 12 deletions src/OmniSharp.Host/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/OmniSharp.MSBuild/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
8 changes: 4 additions & 4 deletions src/OmniSharp.Nuget/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -36,7 +36,7 @@
"portable-net45+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-*"
"NETStandard.Library": "1.5.0-rc2-23931"
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/OmniSharp.Plugins/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -26,7 +26,7 @@
"portable-net45+win8"
],
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-*"
"NETStandard.Library": "1.5.0-rc2-23931"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
{ }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public async Task<IEnumerable<AutoCompleteResponse>> 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)))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public async Task<QuickFixResponse> 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<QuickFix>();

var implementations = await SymbolFinder.FindImplementationsAsync(symbol, _workspace.CurrentSolution);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public async Task<QuickFixResponse> 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))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public async Task<GotoDefinitionResponse> 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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/OmniSharp.Roslyn.CSharp/Services/Types/TypeLookup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public async Task<TypeLookupResponse> 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
Expand Down
10 changes: 5 additions & 5 deletions src/OmniSharp.Roslyn.CSharp/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
}
}
Expand Down
Loading

0 comments on commit 2f4774e

Please sign in to comment.