From 871f9e43ca8b2b1c13107e90a2b37ee9b5f375d9 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Mon, 6 Mar 2017 18:09:16 -0800 Subject: [PATCH] Update versions of VS and Roslyn 2.0.0 dependencies VS has gone RTM so, updating to the RTM versions of those dependencies. Roslyn does not publish our shim packages on NuGet.org, so updating those to a non-ancient version for projects that use 2.0.0. The projects that use 1.3.x are staying put for now. The code change is dealing with something that was obsoleted. --- ...Microsoft.CodeAnalysis.Remote.Razor.csproj | 4 +- .../RazorLanguageService.cs | 4 +- ...VisualStudio.LanguageServices.Razor.csproj | 6 +-- ...lStudio.LanguageServices.Razor.Test.csproj | 2 +- ...crosoft.VisualStudio.RazorExtension.csproj | 47 +++++++++---------- .../packages.config | 36 +++++++------- 6 files changed, 48 insertions(+), 51 deletions(-) diff --git a/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj b/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj index 5a320ad6c9..3131a49925 100644 --- a/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj +++ b/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj @@ -11,8 +11,8 @@ $(PackageTargetFallback);portable-net45+win8+wp8+wpa81; - - + + diff --git a/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs b/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs index 587277501e..1b7117a57f 100644 --- a/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs +++ b/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs @@ -15,8 +15,8 @@ namespace Microsoft.CodeAnalysis.Remote.Razor { internal class RazorLanguageService : ServiceHubServiceBase { - public RazorLanguageService(Stream stream, IServiceProvider serviceProvider) - : base(stream, serviceProvider) + public RazorLanguageService(IServiceProvider serviceProvider, Stream stream) + : base(serviceProvider, stream) { } diff --git a/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj b/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj index 39415fcb8a..0c8c87bef4 100644 --- a/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj +++ b/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj @@ -20,9 +20,9 @@ - - - + + + diff --git a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj index 7fd0a0f802..98bca3e263 100644 --- a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj +++ b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj @@ -19,7 +19,7 @@ - + diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj index bdde7f0d0d..0c1157f9aa 100644 --- a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj +++ b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj @@ -1,6 +1,6 @@  - + 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -102,61 +102,58 @@ ..\..\packages\ManagedEsent.1.9.4\lib\net40\Esent.Interop.dll - ..\..\packages\Microsoft.CodeAnalysis.Common.2.0.0-rc3-61306-01\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - True + ..\..\packages\Microsoft.CodeAnalysis.Common.2.0.0-rc5-61501-05\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - ..\..\packages\Microsoft.CodeAnalysis.CSharp.2.0.0-rc3-61306-01\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll - True + ..\..\packages\Microsoft.CodeAnalysis.CSharp.2.0.0-rc5-61501-05\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll - ..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.2.0.0-rc3-61306-01\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + ..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.2.0.0-rc5-61501-05\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Workspaces.dll ..\..\packages\Microsoft.CodeAnalysis.Elfie.0.10.6-rc2\lib\net46\Microsoft.CodeAnalysis.Elfie.dll - ..\..\packages\Microsoft.CodeAnalysis.VisualBasic.2.0.0-rc3-61306-01\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.dll - True + ..\..\packages\Microsoft.CodeAnalysis.VisualBasic.2.0.0-rc5-61501-05\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.dll - ..\..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.2.0.0-rc3-61306-01\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + ..\..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.2.0.0-rc5-61501-05\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll - ..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.0.0-rc3-61306-01\lib\net46\Microsoft.CodeAnalysis.Workspaces.dll + ..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.0.0-rc5-61501-05\lib\net46\Microsoft.CodeAnalysis.Workspaces.dll - ..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.0.0-rc3-61306-01\lib\net46\Microsoft.CodeAnalysis.Workspaces.Desktop.dll + ..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.0.0-rc5-61501-05\lib\net46\Microsoft.CodeAnalysis.Workspaces.Desktop.dll False - ..\..\packages\Microsoft.VisualStudio.ComponentModelHost.15.0.25824-RC\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll + ..\..\packages\Microsoft.VisualStudio.ComponentModelHost.15.0.26201\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll True - ..\..\packages\Microsoft.VisualStudio.CoreUtility.15.0.25901-RC\lib\net45\Microsoft.VisualStudio.CoreUtility.dll + ..\..\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll True - ..\..\packages\Microsoft.VisualStudio.Imaging.15.0.25901-RC\lib\net45\Microsoft.VisualStudio.Imaging.dll + ..\..\packages\Microsoft.VisualStudio.Imaging.15.0.26201\lib\net45\Microsoft.VisualStudio.Imaging.dll True - ..\..\packages\Microsoft.VisualStudio.LanguageServices.2.0.0-rc3-61306-01\lib\net46\Microsoft.VisualStudio.LanguageServices.dll + ..\..\packages\Microsoft.VisualStudio.LanguageServices.2.0.0-rc5-61501-05\lib\net46\Microsoft.VisualStudio.LanguageServices.dll ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll True - ..\..\packages\Microsoft.VisualStudio.Shell.15.0.15.0.25901-RC\lib\Microsoft.VisualStudio.Shell.15.0.dll + ..\..\packages\Microsoft.VisualStudio.Shell.15.0.15.0.26201\lib\Microsoft.VisualStudio.Shell.15.0.dll True - ..\..\packages\Microsoft.VisualStudio.Shell.Framework.15.0.25901-RC\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll + ..\..\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll True @@ -187,7 +184,7 @@ True - ..\..\packages\Microsoft.VisualStudio.Text.Data.15.0.25901-RC\lib\net45\Microsoft.VisualStudio.Text.Data.dll + ..\..\packages\Microsoft.VisualStudio.Text.Data.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.Data.dll True @@ -199,15 +196,15 @@ True - ..\..\packages\Microsoft.VisualStudio.Threading.15.0.20-pre\lib\net45\Microsoft.VisualStudio.Threading.dll + ..\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll True - ..\..\packages\Microsoft.VisualStudio.Utilities.15.0.25901-RC\lib\net45\Microsoft.VisualStudio.Utilities.dll + ..\..\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll True - ..\..\packages\Microsoft.VisualStudio.Validation.15.0.11-pre\lib\net45\Microsoft.VisualStudio.Validation.dll + ..\..\packages\Microsoft.VisualStudio.Validation.15.0.82\lib\net45\Microsoft.VisualStudio.Validation.dll True @@ -418,8 +415,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - - + + \ No newline at end of file diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/packages.config b/tooling/Microsoft.VisualStudio.RazorExtension/packages.config index 28164c0d1a..911970feab 100644 --- a/tooling/Microsoft.VisualStudio.RazorExtension/packages.config +++ b/tooling/Microsoft.VisualStudio.RazorExtension/packages.config @@ -1,36 +1,36 @@  - + - - - + + + - - - + + + - - - - + + + + - - + + - + - - - - + + + +