Merge pull request #1237 from OmniSharp/update/extensions-2.1.0

Upgrade dependencies
OmniSharp · Jul 19, 2018 · 49ba7fd · 49ba7fd
2 parents 129dd45 + db0c9b7
commit 49ba7fd
Show file tree

Hide file tree

Showing 45 changed files with 100 additions and 113 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,12 @@ All changes to the project will be documented in this file.
 * Fixed bug where find usages returned usages from loaded `.cake` files even though `OnlyThisFile` was set to `true` in the request. ([#1204](https://github.com/OmniSharp/omnisharp-roslyn/issues/1204), PR: [#1213](https://github.com/OmniSharp/omnisharp-roslyn/pull/1213))
 * Performance improvements for line mappings when working with `.cake` files. (PR: [#1226](https://github.com/OmniSharp/omnisharp-roslyn/pull/1226))
 * Fixed a bug where a new debug session could not be started after a previous one failed due to build error. (PR: [#1239](https://github.com/OmniSharp/omnisharp-roslyn/pull/1239))
+* Upgraded dependencies (PR: [#1237](https://github.com/OmniSharp/omnisharp-roslyn/pull/1237))
+  * Upgraded to .NET Core SDK 2.1.301
+  * Upgraded to Microsoft.AspNetCore.* version 2.1.1
+  * Upgraded to Microsoft.Extensions.* version 2.1.1
+  * Upgraded to MSBuild 15.7
+  * Upgraded to Roslyn 2.8.2
 
 ## [1.31.1] - 2018-05-28
 * Fixed bug where diagnostics from loaded `.cake` files was shown in the current file. (PR: [#1201](https://github.com/OmniSharp/omnisharp-roslyn/pull/1201))

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ omnisharp-roslyn
 
 OmniSharp-Roslyn is a .NET development platform based on [Roslyn](https://github.com/dotnet/roslyn) workspaces. It provides project dependencies and language syntax to various IDE and plugins.
 
-OmniSharp-Roslyn is built with the [.NET Core SDK](https://dot.net/) on Windows and [Mono](http://www.mono-project.com/) on OSX/Linux. It targets the __net46__ target framework. OmniSharp requires __mono__ (>=5.2.0) if it is run on a platform other than Windows.
+OmniSharp-Roslyn is built with the [.NET Core SDK](https://dot.net/) on Windows and [Mono](http://www.mono-project.com/) on OSX/Linux. It targets the __net461__ target framework. OmniSharp requires __mono__ (>=5.2.0) if it is run on a platform other than Windows.
 
 For Arch Linux users, need package [msbuild-stable](https://aur.archlinux.org/packages/msbuild-stable/) (>= 15.0)
 

diff --git a/build.cake b/build.cake
@@ -366,7 +366,7 @@ Task("CreateMSBuildFolder")
     foreach (var nugetPackage in nugetPackages)
     {
         var binaryName = nugetPackage + ".dll";
-        
+
         FileHelper.Copy(
             source: CombinePaths(env.Folders.Tools, nugetPackage, "lib", "net46", binaryName),
             destination: CombinePaths(msbuild15BinTargetFolder, binaryName));
@@ -618,7 +618,7 @@ Task("Test")
         {
             PrintBlankLine();
 
-            var instanceFolder = CombinePaths(env.Folders.Bin, configuration, testProject, "net46");
+            var instanceFolder = CombinePaths(env.Folders.Bin, configuration, testProject, "net461");
 
             // Copy xunit executable to test folder to solve path errors
             var xunitToolsFolder = CombinePaths(env.Folders.Tools, "xunit.runner.console", "tools", "net452");
@@ -632,7 +632,7 @@ Task("Test")
             if (Platform.Current.IsWindows)
             {
                 Run(xunitInstancePath, arguments, instanceFolder)
-                    .ExceptionOnError($"Test {testProject} failed for net46");
+                    .ExceptionOnError($"Test {testProject} failed for net461");
             }
             else
             {
@@ -647,7 +647,7 @@ Task("Test")
                 // By default, the run script launches OmniSharp. To launch our Mono runtime
                 // with xUnit rather than OmniSharp, we pass '--no-omnisharp'
                 Run(runScript, $"--no-omnisharp \"{xunitInstancePath}\" {arguments}", instanceFolder)
-                    .ExceptionOnError($"Test {testProject} failed for net46");
+                    .ExceptionOnError($"Test {testProject} failed for net461");
             }
         }
     }
@@ -693,7 +693,7 @@ string PublishMonoBuild(string project, BuildEnvironment env, BuildPlan plan, st
 
     var outputFolder = CombinePaths(env.Folders.ArtifactsPublish, project, "mono");
 
-    var buildFolder = CombinePaths(env.Folders.Bin, configuration, project, "net46");
+    var buildFolder = CombinePaths(env.Folders.Bin, configuration, project, "net461");
 
     CopyMonoBuild(env, buildFolder, outputFolder);
 

diff --git a/build.json b/build.json
@@ -1,7 +1,7 @@
 {
   "DotNetInstallScriptURL": "https://dot.net/v1",
   "DotNetChannel": "preview",
-  "DotNetVersion": "2.1.300",
+  "DotNetVersion": "2.1.301",
   "DotNetSharedRuntimeVersions": [
     "1.1.2"
   ],

diff --git a/build/Packages.props b/build/Packages.props
@@ -2,57 +2,57 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <MSBuildPackageVersion>15.6.82</MSBuildPackageVersion>
-    <NuGetPackageVersion>4.3.0</NuGetPackageVersion>
-    <RoslynPackageVersion>2.8.0</RoslynPackageVersion>
+    <MSBuildPackageVersion>15.7.179</MSBuildPackageVersion>
+    <NuGetPackageVersion>4.7.0</NuGetPackageVersion>
+    <RoslynPackageVersion>2.8.2</RoslynPackageVersion>
     <XunitPackageVersion>2.3.1</XunitPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Update="Cake.Scripting.Transport" Version="0.2.0" />
-    
+    <PackageReference Update="Cake.Scripting.Transport" Version="0.3.0" />
+
     <PackageReference Update="Dotnet.Script.DependencyModel" Version="0.6.1" />
     <PackageReference Update="Dotnet.Script.DependencyModel.NuGet" Version="0.6.2" />
 
-    <PackageReference Update="Microsoft.AspNetCore.Diagnostics" Version="1.1.0" />
-    <PackageReference Update="Microsoft.AspNetCore.Hosting" Version="1.1.0" />
-    <PackageReference Update="Microsoft.AspNetCore.Http.Features" Version="1.1.0" />
-    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.0" />
+    <PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="2.2.4" />
+
+    <PackageReference Update="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
+    <PackageReference Update="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
+    <PackageReference Update="Microsoft.AspNetCore.Http.Features" Version="2.1.1" />
+    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.1" />
 
     <PackageReference Update="Microsoft.Build" Version="$(MSBuildPackageVersion)" />
     <PackageReference Update="Microsoft.Build.Framework" Version="$(MSBuildPackageVersion)" />
     <PackageReference Update="Microsoft.Build.Tasks.Core" Version="$(MSBuildPackageVersion)" />
     <PackageReference Update="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageVersion)" />
-    
+
     <PackageReference Update="Microsoft.CodeAnalysis.Common" Version="$(RoslynPackageVersion)" />
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynPackageVersion)" />
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Features" Version="$(RoslynPackageVersion)" />
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(RoslynPackageVersion)" />
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynPackageVersion)" />
     <PackageReference Update="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynPackageVersion)" />
 
-    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="2.0.0" />
-    <PackageReference Update="Microsoft.Extensions.FileProviders.Physical" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.FileSystemGlobbing" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.Options" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.0" />
-    <PackageReference Update="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
-
+    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="2.1.1" />
+    <PackageReference Update="Microsoft.Extensions.Configuration" Version="2.1.1" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.1" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
+    <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
+    <PackageReference Update="Microsoft.Extensions.FileProviders.Physical" Version="2.1.1" />
+    <PackageReference Update="Microsoft.Extensions.FileSystemGlobbing" Version="2.1.1" />
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="2.1.1" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
+    <PackageReference Update="Microsoft.Extensions.Options" Version="2.1.1" />
+    <PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
+
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Update="Microsoft.TestPlatform.TranslationLayer" Version="15.7.2" />
     <PackageReference Update="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.14.114" />
     <PackageReference Update="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.12" />
-    
+
     <PackageReference Update="Newtonsoft.Json" Version="9.0.1" />
 
     <PackageReference Update="Nuget.Packaging" Version="$(NuGetPackageVersion)" />

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "2.1.300"
+        "version": "2.1.301"
     }
-}
+}
diff --git a/src/OmniSharp.Abstractions/Logging/LoggerExtensions.cs b/src/OmniSharp.Abstractions/Logging/LoggerExtensions.cs
diff --git a/src/OmniSharp.Abstractions/OmniSharp.Abstractions.csproj b/src/OmniSharp.Abstractions/OmniSharp.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <RootNamespace>OmniSharp</RootNamespace>
   </PropertyGroup>
@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
     <PackageReference Include="Microsoft.Extensions.Logging" />
-    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="NuGet.Versioning" />
     <PackageReference Include="System.Collections.Immutable" />

diff --git a/src/OmniSharp.Cake/OmniSharp.Cake.csproj b/src/OmniSharp.Cake/OmniSharp.Cake.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 

diff --git a/src/OmniSharp.DotNet.ProjectModel/OmniSharp.DotNet.ProjectModel.csproj b/src/OmniSharp.DotNet.ProjectModel/OmniSharp.DotNet.ProjectModel.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/OmniSharp.DotNet/OmniSharp.DotNet.csproj b/src/OmniSharp.DotNet/OmniSharp.DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 

diff --git a/src/OmniSharp.DotNetTest/OmniSharp.DotNetTest.csproj b/src/OmniSharp.DotNetTest/OmniSharp.DotNetTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 

diff --git a/src/OmniSharp.Host/CommandLineApplication.cs b/src/OmniSharp.Host/CommandLineApplication.cs
@@ -5,15 +5,15 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Internal;
 
 namespace OmniSharp
 {
     public class CommandLineApplication
     {
-        protected readonly Microsoft.Extensions.CommandLineUtils.CommandLineApplication Application;
+        protected readonly McMaster.Extensions.CommandLineUtils.CommandLineApplication Application;
         private readonly CommandOption _hostPid;
         private readonly CommandOption _zeroBasedIndices;
         private readonly CommandOption _plugin;
@@ -24,7 +24,7 @@ public class CommandLineApplication
 
         public CommandLineApplication()
         {
-            Application = new Microsoft.Extensions.CommandLineUtils.CommandLineApplication(throwOnUnexpectedArg: false);
+            Application = new McMaster.Extensions.CommandLineUtils.CommandLineApplication(throwOnUnexpectedArg: false);
             Application.HelpOption("-? | -h | --help");
 
             _applicationRoot = Application.Option("-s | --source", "Solution or directory for OmniSharp to point at (defaults to current directory).", CommandOptionType.SingleValue);

diff --git a/src/OmniSharp.Host/ConfigurationBuilder.cs b/src/OmniSharp.Host/ConfigurationBuilder.cs
@@ -51,7 +51,7 @@ public IConfigurationRoot Build()
             return configBuilder.Build();
         }
 
-        public Dictionary<string, object> Properties => _builder.Properties;
-        public IEnumerable<IConfigurationSource> Sources => _builder.Sources;
+        public IDictionary<string, object> Properties => _builder.Properties;
+        public IList<IConfigurationSource> Sources => _builder.Sources;
     }
 }
diff --git a/src/OmniSharp.Host/Internal/CommandOptionExtensions.cs b/src/OmniSharp.Host/Internal/CommandOptionExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel;
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
 
 namespace OmniSharp.Internal
 {

diff --git a/src/OmniSharp.Host/OmniSharp.Host.csproj b/src/OmniSharp.Host/OmniSharp.Host.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <RootNamespace>OmniSharp</RootNamespace>
   </PropertyGroup>
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />

diff --git a/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj b/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net46</TargetFramework>
+        <TargetFramework>net461</TargetFramework>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <AssemblyName>OmniSharp</AssemblyName>
         <OutputType>Exe</OutputType>

diff --git a/src/OmniSharp.Http.Driver/app.config b/src/OmniSharp.Http.Driver/app.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

diff --git a/src/OmniSharp.Http/HttpCommandLineApplication.cs b/src/OmniSharp.Http/HttpCommandLineApplication.cs
@@ -1,4 +1,4 @@
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
 using OmniSharp.Internal;
 
 namespace OmniSharp.Http

diff --git a/src/OmniSharp.Http/OmniSharp.Http.csproj b/src/OmniSharp.Http/OmniSharp.Http.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net46</TargetFramework>
+        <TargetFramework>net461</TargetFramework>
         <PlatformTarget>AnyCPU</PlatformTarget>
     </PropertyGroup>
 

diff --git a/src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj b/src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net46</TargetFramework>
+        <TargetFramework>net461</TargetFramework>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <AssemblyName>OmniSharp.LanguageServerProtocol</AssemblyName>
         <PreserveCompilationContext>true</PreserveCompilationContext>

diff --git a/src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj b/src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 

diff --git a/src/OmniSharp.Plugins/OmniSharp.Plugins.csproj b/src/OmniSharp.Plugins/OmniSharp.Plugins.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 

diff --git a/src/OmniSharp.Roslyn.CSharp/OmniSharp.Roslyn.CSharp.csproj b/src/OmniSharp.Roslyn.CSharp/OmniSharp.Roslyn.CSharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 

diff --git a/src/OmniSharp.Roslyn/OmniSharp.Roslyn.csproj b/src/OmniSharp.Roslyn/OmniSharp.Roslyn.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 

diff --git a/src/OmniSharp.Script/OmniSharp.Script.csproj b/src/OmniSharp.Script/OmniSharp.Script.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>