Moving the SyntaxVisualizer to use the v1.1.0 of the Roslyn.Analyzers

Restore.cmd

@@ -41,9 +41,6 @@ call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev14.project.json"
 echo Restoring packages: Toolsets (Dev15 VS SDK RC build tools)
 call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev15rc.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
 
-echo Restoring packages: Roslyn SDK
-call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\roslynsdk.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
-
 echo Locating MSBuild for Solution restore
 call "%RoslynRoot%SetDevCommandPrompt.cmd" || goto :RestoreFailed
 

build/ToolsetPackages/README.md

@@ -8,6 +8,5 @@ For such toolset packages we use the project.json files in this directory to res
 - dev14.project.json: The Dev14 SDK and toolsets
 - dev15rc.project.json: The Dev15 RC SDK and toolsets.  
 - closed.project.json: Contains all of the NuGet packages contained in our closed repo that aren't in Open.  This is done only to give visibility to these packages in our build verification tools. 
-- roslynsdk.project.json: Download the V1 Roslyn SDK.  This is used as assets in our SDK VSIX projects.
 
 In general we try and keep the number of files here low.  New ones are added only when the contents can potentially conflict with packages listed in the existing files.

build/ToolsetPackages/roslynsdk.project.json

-{
-  "supports": {},
-  "dependencies": {
-    "NuGet.CommandLine": "2.8.5",
-    "Microsoft.Composition": "1.0.27",
-    "Microsoft.CodeAnalysis.Analyzers": "1.1.0",
-    "Microsoft.CodeAnalysis.Common": "1.0.0",
-    "Microsoft.CodeAnalysis.CSharp": "1.0.0",
-    "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.0.0",
-    "Microsoft.CodeAnalysis.EditorFeatures.Text": "1.0.0",
-    "Microsoft.CodeAnalysis.VisualBasic": "1.0.0",
-    "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "1.0.0",
-    "Microsoft.CodeAnalysis.Workspaces.Common": "1.0.0",
-    "System.Reflection.Metadata": "1.0.21",
-    "System.Collections.Immutable": "1.1.36"
-  },
-  "frameworks": {
-    ".NETFramework,Version=v4.6": {}
-  },
-  "runtimes": {
-    "win": { },
-    "win7": { }
-  }
-}

src/Setup/Templates/project.json

 {
   "dependencies": {
-    "EnvDTE": "8.0.0"
+    "EnvDTE": "8.0.0",
+    "Microsoft.Composition": "1.0.27",
+    "Microsoft.CodeAnalysis.Analyzers": "1.1.0",
+    "Microsoft.CodeAnalysis.Common": "1.0.0",
+    "Microsoft.CodeAnalysis.CSharp": "1.0.0",
+    "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.0.0",
+    "Microsoft.CodeAnalysis.EditorFeatures.Text": "1.0.0",
+    "Microsoft.CodeAnalysis.VisualBasic": "1.0.0",
+    "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "1.0.0",
+    "Microsoft.CodeAnalysis.Workspaces.Common": "1.0.0",
+    "NuGet.CommandLine": "2.8.5",
+    "System.Collections.Immutable": "1.1.36",
+    "System.Reflection.Metadata": "1.0.21"
   },
   "frameworks": {
     "net46": { }

src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/project.json

 {
   "dependencies": {
     "Microsoft.Composition": "1.0.27",
-    "System.Collections.Immutable": "1.1.36",
-    "System.Reflection.Metadata": "1.0.21",
+    "Microsoft.CodeAnalysis.Analyzers": "1.1.0",
     "Microsoft.CodeAnalysis.Common": "1.0.0",
     "Microsoft.CodeAnalysis.CSharp": "1.0.0",
-    "Microsoft.CodeAnalysis.VisualBasic": "1.0.0"
+    "Microsoft.CodeAnalysis.VisualBasic": "1.0.0",
+    "System.Collections.Immutable": "1.1.36",
+    "System.Reflection.Metadata": "1.0.21"
   },
   "frameworks": {
     "net46": { }

src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/project.json

 {
   "dependencies": {
     "Microsoft.Composition": "1.0.27",
-    "System.Collections.Immutable": "1.1.36",
-    "System.Reflection.Metadata": "1.0.21",
+    "Microsoft.CodeAnalysis.Analyzers": "1.1.0",
     "Microsoft.CodeAnalysis.Common": "1.0.0",
     "Microsoft.CodeAnalysis.VisualBasic": "1.0.0",
-    "Microsoft.CodeAnalysis.CSharp": "1.0.0"
+    "Microsoft.CodeAnalysis.CSharp": "1.0.0",
+    "System.Collections.Immutable": "1.1.36",
+    "System.Reflection.Metadata": "1.0.21"
   },
   "frameworks": {
     "net46": { }

src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/project.json

@@ -3,8 +3,7 @@
     "EnvDTE": "8.0.0",
     "EnvDTE80": "8.0.0",
     "Microsoft.Composition": "1.0.27",
-    "System.Collections.Immutable": "1.1.36",
-    "System.Reflection.Metadata": "1.0.21",
+    "Microsoft.CodeAnalysis.Analyzers": "1.1.0",
     "Microsoft.CodeAnalysis.Common": "1.0.0",
     "Microsoft.CodeAnalysis.EditorFeatures.Text": "1.0.0",
     "Microsoft.CodeAnalysis.Workspaces.Common": "1.0.0",
@@ -22,7 +21,9 @@
     "Microsoft.VisualStudio.Shell.Interop.9.0": "9.0.30729",
     "Microsoft.VisualStudio.Shell.Interop.10.0": "10.0.30319",
     "Microsoft.VisualStudio.TextManager.Interop": "7.10.6070",
-    "RoslynDependencies.Microsoft.VisualStudio.ComponentModelHost": "14.3.25407"
+    "RoslynDependencies.Microsoft.VisualStudio.ComponentModelHost": "14.3.25407",
+    "System.Collections.Immutable": "1.1.36",
+    "System.Reflection.Metadata": "1.0.21"
   },
   "frameworks": {
     "net46": { }