diff --git a/Restore.cmd b/Restore.cmd index 422c17926f32f7772e9db2504a1ddb8a962089ed..a241c1b81e9f0fbe55c69a98bfb72e6454e06caa 100644 --- a/Restore.cmd +++ b/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 diff --git a/build/ToolsetPackages/README.md b/build/ToolsetPackages/README.md index be7c5ae3b53b83b115ad87e5e873ac435b4cb516..ffd7658a03780875a9bbe16aefa9571a4a633751 100644 --- a/build/ToolsetPackages/README.md +++ b/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. diff --git a/build/ToolsetPackages/roslynsdk.project.json b/build/ToolsetPackages/roslynsdk.project.json deleted file mode 100644 index 521f0cd14e42a3dd4a138e3a43d96b6ccfe653ed..0000000000000000000000000000000000000000 --- a/build/ToolsetPackages/roslynsdk.project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "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": { } - } -} diff --git a/src/Setup/Templates/project.json b/src/Setup/Templates/project.json index a4ea92668ecffd111fad962afa845a955a9ae1db..d341ff0c32f5d743e856db283887c2d7865e4fa2 100644 --- a/src/Setup/Templates/project.json +++ b/src/Setup/Templates/project.json @@ -1,6 +1,18 @@ { "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": { } diff --git a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/project.json b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/project.json index de4dd5bfbecf960a64cf80b4f0ccf656924b7e29..469d3296a1dd931ab8210081a0e76f527f4a6195 100644 --- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/project.json +++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/project.json @@ -1,11 +1,12 @@ { "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": { } diff --git a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/project.json b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/project.json index 5b382606a0d277d5ec787c189ea25e9a16d94430..12098edd9c8daec848578211a99f310d36e64b4b 100644 --- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/project.json +++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/project.json @@ -1,11 +1,12 @@ { "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": { } diff --git a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/project.json b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/project.json index 52141a21a8df58179da37ce6229c997f59c34798..5d19255cec4a3b3a239b5f11123c4117eb8e4f65 100644 --- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/project.json +++ b/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": { }