Update dependencies and DNX

build.cmd

@@ -16,10 +16,10 @@ if %ERRORLEVEL% neq 0 (
 rmdir /s /q artifacts
 set
 call dnvm update-self
-call dnvm install 1.0.0-rc2-16430 -u -r clr -arch x86
-call dnvm install 1.0.0-rc2-16430 -u -r clr -arch x64
-call dnvm install 1.0.0-rc2-16430 -u -r coreclr -arch x86
-call dnvm install 1.0.0-rc2-16430 -u -r coreclr -arch x64
+call dnvm install 1.0.0-rc2-16444 -u -r clr -arch x86
+call dnvm install 1.0.0-rc2-16444 -u -r clr -arch x64
+call dnvm install 1.0.0-rc2-16444 -u -r coreclr -arch x86
+call dnvm install 1.0.0-rc2-16444 -u -r coreclr -arch x64
 
 call dnu restore --quiet --parallel
 if %errorlevel% neq 0 exit /b %errorlevel%
@@ -65,7 +65,7 @@ call:_publish "OmniSharp.Bootstrap" "coreclr" "x64" "artifacts\boot-coreclr-win-
 :: omnisharp.bootstrap.zip
 :::: TODO
 
-call dnvm use 1.0.0-rc2-16430 -r coreclr -arch x86
+call dnvm use 1.0.0-rc2-16444 -r coreclr -arch x86
 call:_pack OmniSharp.Host
 call:_pack OmniSharp.Abstractions
 call:_pack OmniSharp.Bootstrap
@@ -85,7 +85,7 @@ GOTO:EOF
 ::--------------------------------------------------------
 :_test - %~1=project %~2=parallel
 setlocal
-call dnvm use 1.0.0-rc2-16430 -r %~2 -arch x86
+call dnvm use 1.0.0-rc2-16444 -r %~2 -arch x86
 pushd tests\%~1
 if "%~2" == "" (
   call dnx test
@@ -113,7 +113,7 @@ GOTO:EOF
 
 :_publish - %~1=project %~2=runtime %~3=arch %~4=dest %~5=zip
 setlocal
-call dnvm use 1.0.0-rc2-16430 -r %~2 -arch %~3
+call dnvm use 1.0.0-rc2-16444 -r %~2 -arch %~3
 call dnu publish "src\%~1" --configuration Release --no-source --quiet --runtime active --out "%~4"
 if %errorlevel% neq 0 (
   echo Publish failed for src/%~1 with runtime %~2-%~3, destination: %~4

build.sh

@@ -2,7 +2,7 @@
 _test() {
   local _project="$1"
   local _runtime="$2"
-  dnvm use 1.0.0-rc2-16430 -r $_runtime
+  dnvm use 1.0.0-rc2-16444 -r $_runtime
   pushd tests/$_project
   dnx test -parallel none
   rc=$?; if [[ $rc != 0 ]]; then
@@ -31,7 +31,7 @@ _pack() {
 _publish() {
   local _project="$1"
   local _runtime="$2"
-  local _version="1.0.0-rc2-16430"
+  local _version="1.0.0-rc2-16444"
   local _dest="$3"
   local _tar="$4"
 
@@ -77,10 +77,10 @@ fi
 export DNX_UNSTABLE_FEED=https://www.myget.org/F/aspnetcidev/api/v2
 dnvm update-self
 
-dnvm install 1.0.0-rc2-16430 -u -r mono
+dnvm install 1.0.0-rc2-16444 -u -r mono
 rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
 
-dnvm install 1.0.0-rc2-16430 -u -r coreclr
+dnvm install 1.0.0-rc2-16444 -u -r coreclr
 rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
 
 dnu restore --quiet --parallel

src/OmniSharp.Abstractions/project.json

@@ -7,12 +7,12 @@
     "Newtonsoft.Json": "7.0.1",
     "Microsoft.CodeAnalysis": "1.1.1",
     "Microsoft.Composition": "1.0.30",
-    "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-16055",
-    "Microsoft.Extensions.Configuration": "1.0.0-rc2-16019",
-    "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc2-16019",
-    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15988",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-16028",
-    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16534"
+    "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-16063",
+    "Microsoft.Extensions.Configuration": "1.0.0-rc2-16025",
+    "Microsoft.Extensions.Configuration.Binder": "1.0.0-rc2-16024",
+    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15993",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-16041",
+    "Microsoft.Extensions.PlatformAbstractions.Dnx": "1.0.0-rc2-16444"
   },
   "frameworks": {
     "dnx451": {
@@ -34,8 +34,8 @@
     "dnxcore50": {
       "dependencies": {
         "NETStandard.Library": "1.0.0-rc2-23722",
-        "System.IO.FileSystem.Watcher": "4.0.0-rc2-23722",
-        "System.Threading.Thread": "4.0.0-rc2-23722"
+        "System.IO.FileSystem.Watcher": "4.0.0-rc2-23727",
+        "System.Threading.Thread": "4.0.0-rc2-23727"
       }
     }
   }

src/OmniSharp.Bootstrap/project.json

@@ -4,7 +4,8 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16534",
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16538",
+    "Microsoft.Extensions.PlatformAbstractions.Dnx": "1.0.0-rc2-16444",
     "Newtonsoft.Json": "7.0.1"
   },
   "commands": {

src/OmniSharp.Dnx/project.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "OmniSharp.Abstractions": "1.0.0-*",
     "OmniSharp.Roslyn.CSharp": "1.0.0-*",
-    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-16256"
+    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-16263"
   },
   "frameworks": {
     "dnx451": {

src/OmniSharp.Host/Startup.cs

@@ -121,10 +121,10 @@ public void Configure(IApplicationBuilder app,
                               ISharedTextWriter writer,
                               IOptions<OmniSharpOptions> optionsAccessor)
         {
-            var assemblies = PlatformServices.Default.LibraryManager.GetReferencingLibraries("OmniSharp.Abstractions")
+            var assemblies = DnxPlatformServices.Default.LibraryManager.GetReferencingLibraries("OmniSharp.Abstractions")
                 .SelectMany(libraryInformation => libraryInformation.Assemblies)
                 .Concat(
-                    PlatformServices.Default.LibraryManager.GetReferencingLibraries("OmniSharp.Roslyn")
+                    DnxPlatformServices.Default.LibraryManager.GetReferencingLibraries("OmniSharp.Roslyn")
                         .SelectMany(libraryInformation => libraryInformation.Assemblies)
                 )
                 .Select(assemblyName => Assembly.Load(assemblyName));

src/OmniSharp.Host/project.json

@@ -9,16 +9,16 @@
     "OmniSharp.Stdio": "1.0.0-*",
     "OmniSharp.Plugins": "1.0.0-*",
     "OmniSharp.Roslyn": "1.0.0-*",
-    "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-16526",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-16349",
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-16536",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-16357",
     "Microsoft.Composition": "1.0.30",
-    "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-16055",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-16019",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-15983",
-    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15988",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-16028",
-    "Microsoft.Extensions.Options": "1.0.0-rc2-16010",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-16010"
+    "Microsoft.Extensions.Caching.Memory": "1.0.0-rc2-16063",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-16025",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-15993",
+    "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15993",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-16041",
+    "Microsoft.Extensions.Options": "1.0.0-rc2-16016",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-16015"
   },
   "commands": {
     "omnisharp.host": "run"

src/OmniSharp.MSBuild/project.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "OmniSharp.Abstractions": "1.0.0-*",
     "OmniSharp.Roslyn.CSharp": "1.0.0-*",
-    "Microsoft.Extensions.Options": "1.0.0-rc2-16010"
+    "Microsoft.Extensions.Options": "1.0.0-rc2-16016"
   },
   "frameworks": {
     "dnx451": {

src/OmniSharp.Roslyn.CSharp/CodeActions/RoslynCodeActionProvider.cs

@@ -13,8 +13,8 @@ public class RoslynCodeActionProvider : AbstractCodeActionProvider
     {
         private static ImmutableArray<Assembly> _mefAssemblies =>
             ImmutableArray.Create<Assembly>(
-                PlatformServices.Default.AssemblyLoadContextAccessor.Default.Load("Microsoft.CodeAnalysis.CSharp.Features, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"),
-                PlatformServices.Default.AssemblyLoadContextAccessor.Default.Load("Microsoft.CodeAnalysis.Features, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")
+                DnxPlatformServices.Default.AssemblyLoadContextAccessor.Default.Load("Microsoft.CodeAnalysis.CSharp.Features, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"),
+                DnxPlatformServices.Default.AssemblyLoadContextAccessor.Default.Load("Microsoft.CodeAnalysis.Features, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")
             );
 
         // TODO: Come in and pass Microsoft.CodeAnalysis.Features as well (today this breaks)

src/OmniSharp.Roslyn/MetadataHelper.cs

@@ -96,9 +96,12 @@ private static INamedTypeSymbol GetTopLevelContainingNamedType(ISymbol symbol)
             return (INamedTypeSymbol)topLevelNamedType;
         }
 
-        private static Lazy<Assembly> featuresAssembly = new Lazy<Assembly>(() => PlatformServices.Default.AssemblyLoadContextAccessor.Default.Load("Microsoft.CodeAnalysis.Features, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"));
-        private static Lazy<Assembly> csharpFeaturesAssembly = new Lazy<Assembly>(() => PlatformServices.Default.AssemblyLoadContextAccessor.Default.Load("Microsoft.CodeAnalysis.CSharp.Features, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"));
-        private static Lazy<Assembly> workspacesAssembly = new Lazy<Assembly>(() => PlatformServices.Default.AssemblyLoadContextAccessor.Default.Load("Microsoft.CodeAnalysis.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"));
+        private static Lazy<Assembly> featuresAssembly = new Lazy<Assembly>(() => LoadAssemblyFromName(
+            "Microsoft.CodeAnalysis.Features, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"));
+        private static Lazy<Assembly> csharpFeaturesAssembly = new Lazy<Assembly>(() => LoadAssemblyFromName(
+            "Microsoft.CodeAnalysis.CSharp.Features, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"));
+        private static Lazy<Assembly> workspacesAssembly = new Lazy<Assembly>(() => LoadAssemblyFromName(
+            "Microsoft.CodeAnalysis.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"));
 
         private static Lazy<Type> _CSharpMetadataAsSourceService = new Lazy<Type>(() =>
         {
@@ -124,5 +127,10 @@ private static INamedTypeSymbol GetTopLevelContainingNamedType(ISymbol symbol)
         {
             return _MetadataAsSourceHelpers.Value.GetMethod("GetLocationInGeneratedSourceAsync");
         });
+
+        private static Assembly LoadAssemblyFromName(string name)
+        {
+            return DnxPlatformServices.Default.AssemblyLoadContextAccessor.Default.Load(name);
+        }
     }
 }

src/OmniSharp.Roslyn/Services/AbstractCodeActionProvider.cs

@@ -14,7 +14,7 @@ public abstract class AbstractCodeActionProvider : ICodeActionProvider
         private readonly IEnumerable<CodeRefactoringProvider> _refactorings;
         private readonly IEnumerable<CodeFixProvider> _codeFixes;
 
-        protected AbstractCodeActionProvider(string assemblyName) : this(PlatformServices.Default.AssemblyLoadContextAccessor.Default.Load(assemblyName))
+        protected AbstractCodeActionProvider(string assemblyName) : this(DnxPlatformServices.Default.AssemblyLoadContextAccessor.Default.Load(assemblyName))
         {
         }
 

src/OmniSharp.Roslyn/project.json

@@ -5,7 +5,7 @@
   },
   "dependencies": {
     "OmniSharp.Abstractions": "1.0.0-*",
-    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16534",
+    "Microsoft.Extensions.PlatformAbstractions.Dnx": "1.0.0-rc2-16444",
     "Microsoft.CodeAnalysis": "1.1.1"
   },
   "frameworks": {

src/OmniSharp.Stdio/Logging/StdioLogger.cs

@@ -29,7 +29,7 @@ public bool IsEnabled(LogLevel logLevel)
             return _filter(this._name, logLevel);
         }
 
-        public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
         {
             if (!IsEnabled(logLevel))
             {

src/OmniSharp.Stdio/project.json

@@ -6,8 +6,8 @@
   },
   "dependencies": {
     "OmniSharp.Abstractions": "1.0.0-*",
-    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-16256",
-    "Microsoft.AspNetCore.Http.Features": "1.0.0-rc2-16180",
+    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-16263",
+    "Microsoft.AspNetCore.Http.Features": "1.0.0-rc2-16187",
     "Newtonsoft.Json": "7.0.1"
   },
   "frameworks": {

tests/OmniSharp.Bootstrap.Tests/project.json

@@ -5,7 +5,7 @@
   },
   "dependencies": {
     "OmniSharp.Bootstrap": "1.0.0-*",
-    "Microsoft.AspNetCore.Testing": "1.0.0-rc2-16119",
+    "Microsoft.AspNetCore.Testing": "1.0.0-rc2-16128",
     "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.1",
     "xunit.runner.aspnet": "2.0.0-aspnet-16076"
   },

tests/OmniSharp.Plugins.Tests/project.json

@@ -5,7 +5,7 @@
   },
   "dependencies": {
     "OmniSharp.Plugins": "1.0.0-*",
-    "Microsoft.AspNetCore.Testing": "1.0.0-rc2-16119",
+    "Microsoft.AspNetCore.Testing": "1.0.0-rc2-16128",
     "xunit.runner.aspnet": "2.0.0-aspnet-16076"
   },
   "commands": {

tests/OmniSharp.Tests/EndpointMiddlewareFacts.cs

@@ -94,7 +94,7 @@ class Logger : ILogger
         {
             public IDisposable BeginScopeImpl(object state) => new Disposable();
             public bool IsEnabled(LogLevel logLevel) => true;
-            public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter) { }
+            public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter) { }
         }
 
         [Fact]

tests/OmniSharp.Tests/Fakes/FakeLogger.cs

@@ -9,7 +9,7 @@ public class FakeLogger : ILogger
 
         public IDisposable BeginScopeImpl(object owner) => new NoopDisposable();
 
-        public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter) { }
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter) { }
 
         private class NoopDisposable : IDisposable
         {