From fcb8669c9804e0f798765163db8f08754edd0aa1 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 31 May 2017 09:19:13 -0700 Subject: [PATCH] Use project.json for the VSIX project Also did some spring cleaning on redundent references in the language services package. Note that the 'immutable' packages are now totally redundant with Shell.15.0. You're supposed to use one or the other. Since our minimum VS is 15, I just went with shell 15.0. Now the VSIX project doesn't have many references in it. --- .gitignore | 4 +- build/VSIX.targets | 2 +- build/dependencies.props | 1 + ...VisualStudio.LanguageServices.Razor.csproj | 14 +- ...crosoft.VisualStudio.RazorExtension.csproj | 272 ++---------------- .../app.config | 63 ---- .../packages.config | 88 ------ .../project.json | 14 + 8 files changed, 45 insertions(+), 413 deletions(-) delete mode 100644 tooling/Microsoft.VisualStudio.RazorExtension/app.config delete mode 100644 tooling/Microsoft.VisualStudio.RazorExtension/packages.config create mode 100644 tooling/Microsoft.VisualStudio.RazorExtension/project.json diff --git a/.gitignore b/.gitignore index 9432c1a8b7..c8b352d992 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,6 @@ project.lock.json launchSettings.json global.json .vscode/* -BenchmarkDotNet.Artifacts/ \ No newline at end of file +BenchmarkDotNet.Artifacts/ +Microsoft.VisualStudio.RazorExtension.nuget.props +Microsoft.VisualStudio.RazorExtension.nuget.targets \ No newline at end of file diff --git a/build/VSIX.targets b/build/VSIX.targets index c7f3ebebe9..961e3759be 100644 --- a/build/VSIX.targets +++ b/build/VSIX.targets @@ -1,7 +1,7 @@ $(PackageDependsOn);GenerateVSIX - 3.5.0 + 4.1.0 Microsoft.VisualStudio.RazorExtension $(RepositoryRoot)tooling\$(VSIXName)\$(VSIXName).csproj diff --git a/build/dependencies.props b/build/dependencies.props index 1dc89239d0..8e049ebd2f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -13,6 +13,7 @@ 2.3.0-beta1-61624-03 1.0.2-rc 15.3.0-* + 15.0.26201 2.3.0-beta2-* 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 de6e58223a..96ba6e56f6 100644 --- a/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj +++ b/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj @@ -23,25 +23,23 @@ - + + + - - - - - + - - + + diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj index 5c7450c3c5..29dc26db94 100644 --- a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj +++ b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj @@ -1,6 +1,5 @@  - 15.4 $(VsixVersion).$(BuildNumber) @@ -87,8 +86,6 @@ - - Always true @@ -96,6 +93,7 @@ true + Designer @@ -113,249 +111,13 @@ False - - ..\..\packages\ManagedEsent.1.9.4\lib\net40\Esent.Interop.dll - - - ..\..\packages\Microsoft.CodeAnalysis.Common.2.3.0-beta1-61624-03\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - - - ..\..\packages\Microsoft.CodeAnalysis.CSharp.2.3.0-beta1-61624-03\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll - - - ..\..\packages\Microsoft.CodeAnalysis.EditorFeatures.2.3.0-beta1-61624-03\lib\net46\Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll - - - ..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.2.3.0-beta1-61624-03\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Workspaces.dll - - - ..\..\packages\Microsoft.CodeAnalysis.EditorFeatures.2.3.0-beta1-61624-03\lib\net46\Microsoft.CodeAnalysis.EditorFeatures.dll - - - ..\..\packages\Microsoft.CodeAnalysis.EditorFeatures.Text.2.3.0-beta1-61624-03\lib\net46\Microsoft.CodeAnalysis.EditorFeatures.Text.dll - - - ..\..\packages\Microsoft.CodeAnalysis.Elfie.0.10.6-rc2\lib\net46\Microsoft.CodeAnalysis.Elfie.dll - - - ..\..\packages\Microsoft.CodeAnalysis.Features.2.3.0-beta1-61624-03\lib\netstandard1.3\Microsoft.CodeAnalysis.Features.dll - - - ..\..\packages\Microsoft.CodeAnalysis.VisualBasic.2.3.0-beta1-61624-03\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.dll - - - ..\..\packages\Microsoft.CodeAnalysis.EditorFeatures.2.3.0-beta1-61624-03\lib\net46\Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.dll - - - ..\..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.2.3.0-beta1-61624-03\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll - - - ..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.3.0-beta1-61624-03\lib\net46\Microsoft.CodeAnalysis.Workspaces.dll - - - ..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.3.0-beta1-61624-03\lib\net46\Microsoft.CodeAnalysis.Workspaces.Desktop.dll - - - - False - - - ..\..\packages\Microsoft.VisualStudio.ComponentModelHost.15.0.26201\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll - True - - - ..\..\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Editor.15.0.26201\lib\net45\Microsoft.VisualStudio.Editor.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Imaging.15.0.26201\lib\net45\Microsoft.VisualStudio.Imaging.dll - True - - - ..\..\packages\Microsoft.VisualStudio.LanguageServices.2.3.0-beta1-61624-03\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.26201\lib\Microsoft.VisualStudio.Shell.15.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Data.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.Data.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Logic.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.Logic.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.UI.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Validation.15.0.82\lib\net45\Microsoft.VisualStudio.Validation.dll - True - - - False - - - ..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - True - - - ..\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - - - - ..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll - True - - - ..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll - True - - - ..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll - True - - - ..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll - True - - - ..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll - True - - - ..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll - - - - ..\..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - - - ..\..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll - - - ..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - - - ..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - - - ..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - - - - ..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - - ..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net46\System.Security.Cryptography.Algorithms.dll - True - - - ..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - - - ..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - - ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net46\System.Security.Cryptography.X509Certificates.dll - True - - - ..\..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll - - - ..\..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll - - - ..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll - True - - - - - ..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - - - ..\..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll - - - ..\..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll - - - ..\..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll - @@ -436,6 +198,11 @@ + + + false + + @@ -464,7 +231,18 @@ - + + + + + false + + @@ -476,19 +254,9 @@ PreserveNewest - - - - + + - - - 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/app.config b/tooling/Microsoft.VisualStudio.RazorExtension/app.config deleted file mode 100644 index e6e0dd8593..0000000000 --- a/tooling/Microsoft.VisualStudio.RazorExtension/app.config +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/packages.config b/tooling/Microsoft.VisualStudio.RazorExtension/packages.config deleted file mode 100644 index a349f28fa7..0000000000 --- a/tooling/Microsoft.VisualStudio.RazorExtension/packages.config +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/project.json b/tooling/Microsoft.VisualStudio.RazorExtension/project.json new file mode 100644 index 0000000000..42889aa612 --- /dev/null +++ b/tooling/Microsoft.VisualStudio.RazorExtension/project.json @@ -0,0 +1,14 @@ +{ + "frameworks": { + "net46": { + "dependencies": { + "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201", + "Microsoft.VisualStudio.Shell.15.0": "15.0.26201", + "Microsoft.VSSDK.BuildTools": "15.0.26201" + } + } + }, + "runtimes": { + "win": { } + } +}