From c228beb8b75956a0e2148f0d61d3b9fd4b510ea8 Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Sat, 22 Apr 2017 21:11:08 -0700 Subject: [PATCH] Automated migration of project files This is an automated migration of our project files to the new SDK / PackageReference. It is done using the tool located here: https://github.com/jaredpar/ConvertPackageRef --- build/Toolset/Toolset.csproj | 6 +- build/Toolset/project.json | 11 -- .../CSharp/Analyzers/CSharpCodeStyle.csproj | 9 +- src/CodeStyle/CSharp/Analyzers/project.json | 9 -- .../CodeFixes/CSharpCodeStyleFixes.csproj | 9 +- src/CodeStyle/CSharp/CodeFixes/project.json | 9 -- .../CSharp/Tests/CSharpCodeStyleTests.csproj | 10 +- src/CodeStyle/CSharp/Tests/project.json | 12 -- src/CodeStyle/Core/Analyzers/CodeStyle.csproj | 10 +- src/CodeStyle/Core/Analyzers/project.json | 9 -- .../Core/CodeFixes/CodeStyleFixes.csproj | 10 +- src/CodeStyle/Core/CodeFixes/project.json | 9 -- .../Core/Tests/CodeStyleTests.csproj | 11 +- src/CodeStyle/Core/Tests/project.json | 12 -- .../Analyzers/BasicCodeStyle.vbproj | 9 +- .../VisualBasic/Analyzers/project.json | 9 -- .../CodeFixes/BasicCodeStyleFixes.vbproj | 9 +- .../VisualBasic/CodeFixes/project.json | 9 -- .../Tests/BasicCodeStyleTests.vbproj | 10 +- src/CodeStyle/VisualBasic/Tests/project.json | 12 -- src/Compilers/CSharp/CscCore/CscCore.csproj | 11 +- src/Compilers/CSharp/CscCore/project.json | 65 -------- .../CSharp/Portable/CSharpCodeAnalysis.csproj | 8 +- src/Compilers/CSharp/Portable/project.json | 9 -- .../CommandLine/CSharpCommandLineTest.csproj | 13 +- .../CSharp/Test/CommandLine/project.json | 13 -- .../Test/Emit/CSharpCompilerEmitTest.csproj | 16 +- src/Compilers/CSharp/Test/Emit/project.json | 14 -- .../CSharpCompilerSemanticTest.csproj | 13 +- .../CSharp/Test/Semantic/project.json | 13 -- .../Symbol/CSharpCompilerSymbolTest.csproj | 14 +- src/Compilers/CSharp/Test/Symbol/project.json | 14 -- .../Syntax/CSharpCompilerSyntaxTest.csproj | 11 +- src/Compilers/CSharp/Test/Syntax/project.json | 8 - .../CSharp/Test/WinRT/CSharpWinRTTest.csproj | 13 +- src/Compilers/CSharp/Test/WinRT/project.json | 13 -- src/Compilers/CSharp/csc/csc.csproj | 5 +- src/Compilers/CSharp/csc/project.json | 11 -- .../CodeAnalysisTest/CodeAnalysisTest.csproj | 16 +- .../Core/CodeAnalysisTest/project.json | 14 -- .../Core/MSBuildTask/MSBuildTask.csproj | 30 +++- src/Compilers/Core/MSBuildTask/project.json | 34 ----- .../MSBuildTaskTests/MSBuildTaskTests.csproj | 24 ++- .../Core/MSBuildTaskTests/project.json | 16 -- .../Core/Portable/CodeAnalysis.csproj | 8 +- src/Compilers/Core/Portable/project.json | 31 ---- .../Extension/CompilerExtension.csproj | 25 ++- src/Compilers/Extension/project.json | 17 --- .../PortableServer/PortableServer.csproj | 30 +++- .../Server/PortableServer/project.json | 34 ----- .../Server/VBCSCompiler/VBCSCompiler.csproj | 2 +- .../Server/VBCSCompiler/project.json | 12 -- .../VBCSCompilerTests.csproj | 21 ++- .../Server/VBCSCompilerTests/project.json | 15 -- .../Core/CompilerTestResources.csproj | 10 +- .../Test/Resources/Core/project.json | 10 -- ...CSharpCompilerTestUtilities.Desktop.csproj | 3 - .../Utilities/CSharp.Desktop/project.json | 6 - .../CSharp/CSharpCompilerTestUtilities.csproj | 13 +- .../Test/Utilities/CSharp/project.json | 10 -- .../BasicCompilerTestUtilities.vbproj | 5 +- .../Test/Utilities/VisualBasic/project.json | 6 - .../Portable/BasicCodeAnalysis.vbproj | 11 +- .../VisualBasic/Portable/project.json | 8 - .../CommandLine/BasicCommandLineTest.vbproj | 13 +- .../VisualBasic/Test/CommandLine/project.json | 13 -- .../Test/Emit/BasicCompilerEmitTest.vbproj | 16 +- .../VisualBasic/Test/Emit/project.json | 14 -- .../Semantic/BasicCompilerSemanticTest.vbproj | 13 +- .../VisualBasic/Test/Semantic/project.json | 13 -- .../Symbol/BasicCompilerSymbolTest.vbproj | 13 +- .../VisualBasic/Test/Symbol/project.json | 13 -- .../Syntax/BasicCompilerSyntaxTest.vbproj | 13 +- .../VisualBasic/Test/Syntax/project.json | 13 -- .../VisualBasic/VbcCore/VbcCore.csproj | 60 +++++++- .../VisualBasic/VbcCore/project.json | 65 -------- src/Compilers/VisualBasic/vbc/project.json | 11 -- src/Compilers/VisualBasic/vbc/vbc.csproj | 5 +- src/Deployment/Roslyn.csproj | 2 +- .../CSharp/CSharpEditorFeatures.csproj | 8 +- src/EditorFeatures/CSharp/project.json | 9 -- .../CSharpEditorServicesTest.csproj | 39 ++++- src/EditorFeatures/CSharpTest/project.json | 22 --- .../CSharpEditorServicesTest2.csproj | 3 +- src/EditorFeatures/CSharpTest2/project.json | 9 -- src/EditorFeatures/Core/EditorFeatures.csproj | 49 +++++- src/EditorFeatures/Core/project.json | 23 --- .../Next/EditorFeatures.Next.csproj | 56 ++++++- src/EditorFeatures/Next/project.json | 25 --- .../Test/EditorServicesTest.csproj | 39 ++++- src/EditorFeatures/Test/project.json | 22 --- .../Test2/EditorServicesTest2.vbproj | 50 +++++- src/EditorFeatures/Test2/project.json | 26 ---- .../ServicesTestUtilities.csproj | 58 ++++++- src/EditorFeatures/TestUtilities/project.json | 25 --- .../ServicesTestUtilities2.vbproj | 40 ++++- .../TestUtilities2/project.json | 22 --- .../Text/TextEditorFeatures.csproj | 22 ++- src/EditorFeatures/Text/project.json | 14 -- .../VisualBasic/BasicEditorFeatures.vbproj | 12 +- src/EditorFeatures/VisualBasic/project.json | 10 -- .../BasicEditorServicesTest.vbproj | 38 ++++- .../VisualBasicTest/project.json | 22 --- .../CSharpExpressionCompiler.csproj | 8 +- .../Source/ExpressionCompiler/project.json | 10 -- .../CSharpResultProvider.Portable.csproj | 12 +- .../ResultProvider/Portable/project.json | 9 -- .../CSharpExpressionCompilerTest.csproj | 21 ++- .../Test/ExpressionCompiler/project.json | 15 -- .../CSharpResultProviderTest.csproj | 15 +- .../CSharp/Test/ResultProvider/project.json | 13 -- .../ExpressionCompiler.csproj | 9 +- .../Source/ExpressionCompiler/project.json | 11 -- .../FunctionResolver/FunctionResolver.csproj | 16 +- .../Core/Source/FunctionResolver/project.json | 17 --- .../Portable/ResultProvider.Portable.csproj | 16 +- .../ResultProvider/Portable/project.json | 9 -- .../ExpressionCompilerTestUtilities.csproj | 19 ++- .../Core/Test/ExpressionCompiler/project.json | 12 -- .../FunctionResolverTest.csproj | 16 +- .../Core/Test/FunctionResolver/project.json | 14 -- .../ResultProviderTestUtilities.csproj | 20 ++- .../Core/Test/ResultProvider/project.json | 12 -- .../Package/ExpressionEvaluatorPackage.csproj | 2 +- src/ExpressionEvaluator/Package/project.json | 9 -- .../BasicExpressionCompiler.vbproj | 16 +- .../Source/ExpressionCompiler/project.json | 14 -- .../BasicResultProvider.Portable.vbproj | 12 +- .../ResultProvider/Portable/project.json | 9 -- .../BasicExpressionCompilerTest.vbproj | 19 ++- .../Test/ExpressionCompiler/project.json | 15 -- .../BasicResultProviderTest.vbproj | 15 +- .../Test/ResultProvider/project.json | 13 -- .../CSharp/Portable/CSharpFeatures.csproj | 11 +- src/Features/CSharp/Portable/project.json | 10 -- src/Features/Core/Portable/Features.csproj | 11 +- src/Features/Core/Portable/project.json | 10 -- .../VisualBasic/Portable/BasicFeatures.vbproj | 9 +- .../VisualBasic/Portable/project.json | 8 - src/Interactive/CsiCore/CsiCore.csproj | 66 +++++++- src/Interactive/CsiCore/project.json | 71 --------- .../CSharpInteractiveEditorFeatures.csproj | 10 +- .../EditorFeatures/CSharp/project.json | 10 -- .../Core/InteractiveEditorFeatures.csproj | 13 +- .../EditorFeatures/Core/project.json | 11 -- .../BasicInteractiveEditorFeatures.vbproj | 10 +- .../EditorFeatures/VisualBasic/project.json | 10 -- .../Features/InteractiveFeatures.csproj | 1 - src/Interactive/Features/project.json | 6 - src/Interactive/Host/InteractiveHost.csproj | 4 +- src/Interactive/Host/project.json | 9 -- .../HostTest/InteractiveHostTest.csproj | 9 +- src/Interactive/HostTest/project.json | 11 -- src/Interactive/VbiCore/VbiCore.vbproj | 66 +++++++- src/Interactive/VbiCore/project.json | 71 --------- src/Interactive/csi/csi.csproj | 13 +- src/Interactive/csi/project.json | 13 -- src/Interactive/vbi/project.json | 13 -- src/Interactive/vbi/vbi.vbproj | 13 +- .../APISampleUnitTestsCS.csproj | 13 +- .../CSharp/APISampleUnitTests/project.json | 13 -- .../CSharpAnalyzers.Test.csproj | 12 +- .../CSharpAnalyzers.Test/project.json | 8 - .../CSharpAnalyzers.Vsix.csproj | 2 +- .../CSharpAnalyzers/CSharpAnalyzers.csproj | 10 +- .../CSharpAnalyzers/project.json | 10 -- .../ConsoleClassifierCS.csproj | 7 +- .../CSharp/ConsoleClassifier/project.json | 11 -- .../ConvertToAutoPropertyCS.csproj | 5 +- .../CSharp/ConvertToAutoProperty/project.json | 11 -- .../Impl/ConvertToConditionalCS.csproj | 5 +- .../ConvertToConditional/Impl/project.json | 11 -- .../ConvertToConditionalCS.UnitTests.csproj | 14 +- .../ConvertToConditional/Test/project.json | 13 -- .../CopyPasteWithUsing.csproj | 14 +- .../CSharp/CopyPasteWithUsing/project.json | 14 -- .../FormatSolution/FormatSolutionCS.csproj | 6 +- .../CSharp/FormatSolution/project.json | 11 -- .../ImplementNotifyPropertyChangedCS.csproj | 9 +- .../Impl/project.json | 12 -- ...ntNotifyPropertyChangedCS.UnitTests.csproj | 14 +- .../Test/project.json | 13 -- .../CSharp/MakeConst/Impl/MakeConstCS.csproj | 5 +- .../CSharp/MakeConst/Impl/project.json | 11 -- .../AddOrRemoveRefOutModifier.csproj | 5 +- .../CSharp/RefOutModifier/project.json | 11 -- .../TreeTransforms/TreeTransformsCS.csproj | 4 +- .../CSharp/TreeTransforms/project.json | 9 -- .../UnitTestFramework.csproj | 16 +- .../Shared/UnitTestFramework/project.json | 14 -- .../APISampleUnitTestsVB.vbproj | 13 +- .../APISampleUnitTests/project.json | 13 -- .../BasicAnalyzers.Test.vbproj | 6 +- .../BasicAnalyzers.Test/project.json | 8 - .../BasicAnalyzers.Vsix.vbproj | 3 +- .../BasicAnalyzers/BasicAnalyzers.vbproj | 8 +- .../BasicAnalyzers/project.json | 8 - .../ConsoleClassifierVB.vbproj | 4 +- .../ConsoleClassifier/project.json | 9 -- .../Impl/ConvertToAutoPropertyVB.vbproj | 5 +- .../ConvertToAutoProperty/Impl/project.json | 11 -- .../ConvertToAutoPropertyVB.UnitTests.vbproj | 15 +- .../ConvertToAutoProperty/Test/project.json | 13 -- .../FormatSolution/FormatSolutionVB.vbproj | 3 +- .../VisualBasic/FormatSolution/project.json | 9 -- .../ImplementNotifyPropertyChangedVB.vbproj | 8 +- .../Impl/project.json | 12 -- ...ntNotifyPropertyChangedVB.UnitTests.vbproj | 15 +- .../Test/project.json | 13 -- .../MakeConst/Impl/MakeConstVB.vbproj | 5 +- .../VisualBasic/MakeConst/Impl/project.json | 11 -- .../RemoveByVal/Impl/RemoveByValVB.vbproj | 5 +- .../VisualBasic/RemoveByVal/Impl/project.json | 11 -- .../Test/RemoveByValVB.UnitTests.vbproj | 15 +- .../VisualBasic/RemoveByVal/Test/project.json | 13 -- .../TreeTransforms/TreeTransformsVB.vbproj | 7 +- .../VisualBasic/TreeTransforms/project.json | 11 -- src/Scripting/CSharp/CSharpScripting.csproj | 15 +- src/Scripting/CSharp/project.json | 11 -- .../CSharpScriptingTest.Desktop.csproj | 7 +- src/Scripting/CSharpTest.Desktop/project.json | 11 -- .../CSharpTest/CSharpScriptingTest.csproj | 11 +- src/Scripting/CSharpTest/project.json | 10 -- src/Scripting/Core/Scripting.csproj | 28 +++- src/Scripting/Core/project.json | 29 ---- .../ScriptingTest.Desktop.csproj | 13 +- src/Scripting/CoreTest.Desktop/project.json | 13 -- src/Scripting/CoreTest/ScriptingTest.csproj | 10 +- src/Scripting/CoreTest/project.json | 8 - .../ScriptingTestUtilities.csproj | 22 ++- src/Scripting/CoreTestUtilities/project.json | 25 --- .../VisualBasic/BasicScripting.vbproj | 14 +- src/Scripting/VisualBasic/project.json | 10 -- .../BasicScriptingTest.Desktop.vbproj | 13 +- .../VisualBasicTest.Desktop/project.json | 13 -- .../VisualBasicTest/BasicScriptingTest.vbproj | 9 +- src/Scripting/VisualBasicTest/project.json | 9 -- .../DevDivInsertionFiles.vbproj | 10 +- src/Setup/DevDivInsertionFiles/project.json | 12 -- src/Setup/Templates/Templates.csproj | 49 +++++- src/Setup/Templates/project.json | 25 --- .../DeployCoreClrTestRuntime.csproj | 13 +- .../DeployCoreClrTestRuntime/project.json | 20 --- .../DeployDesktopTestRuntime.csproj | 4 +- .../DeployDesktopTestRuntime/project.json | 9 -- src/Test/Diagnostics/Diagnostics.csproj | 3 - src/Test/Diagnostics/project.json | 6 - src/Test/PdbUtilities/PdbUtilities.csproj | 18 ++- src/Test/PdbUtilities/project.json | 17 --- src/Test/Perf/Runner/Perf.Runner.csproj | 7 +- src/Test/Perf/Runner/project.json | 13 -- .../Perf/StackDepthTest/StackDepthTest.csproj | 8 +- src/Test/Perf/StackDepthTest/project.json | 12 -- src/Test/Perf/tests/Perf.Tests.csproj | 2 +- .../CoreClr/TestUtilities.CoreClr.csproj | 28 +++- src/Test/Utilities/CoreClr/project.json | 29 ---- .../Desktop/TestUtilities.Desktop.csproj | 22 ++- src/Test/Utilities/Desktop/project.json | 18 --- .../Utilities/Portable/TestUtilities.csproj | 35 ++++- src/Test/Utilities/Portable/project.json | 32 ---- src/Tools/BuildBoss/BuildBoss.csproj | 8 +- src/Tools/BuildBoss/project.json | 13 -- .../ProcessWatchdog/ProcessWatchdog.csproj | 13 +- src/Tools/ProcessWatchdog/project.json | 13 -- src/Tools/RepoUtil/RepoUtil.csproj | 8 +- src/Tools/RepoUtil/project.json | 13 -- ...DeployCompilerGeneratorToolsRuntime.csproj | 18 +-- .../project.json | 19 --- .../CompilersBoundTreeGenerator.csproj | 15 +- .../Source/BoundTreeGenerator/project.json | 17 --- .../CSharpErrorFactsGenerator.csproj | 15 +- .../CSharpErrorFactsGenerator/project.json | 15 -- .../CSharpSyntaxGenerator.csproj | 17 +-- .../Source/CSharpSyntaxGenerator/project.json | 17 --- .../VisualBasicErrorFactsGenerator.vbproj | 13 +- .../project.json | 15 -- .../VisualBasicSyntaxGenerator.vbproj | 15 +- .../VisualBasicSyntaxGenerator/project.json | 17 --- src/Tools/Source/RunTests/RunTests.csproj | 19 ++- src/Tools/Source/RunTests/project.json | 15 -- .../SyntaxVisualizerControl.csproj | 25 ++- .../SyntaxVisualizerControl/project.json | 17 --- .../SyntaxVisualizerDgmlHelper.vbproj | 25 ++- .../SyntaxVisualizerDgmlHelper/project.json | 17 --- .../SyntaxVisualizerExtension.csproj | 74 ++++++++- .../SyntaxVisualizerExtension/project.json | 34 ----- .../CSharp/Impl/CSharpVisualStudio.csproj | 36 ++++- src/VisualStudio/CSharp/Impl/project.json | 18 --- .../CSharp/Repl/CSharpVisualStudioRepl.csproj | 12 +- src/VisualStudio/CSharp/Repl/project.json | 10 -- .../CSharp/Test/CSharpVisualStudioTest.csproj | 45 ++++-- src/VisualStudio/CSharp/Test/project.json | 18 --- .../Core/Def/ServicesVisualStudio.csproj | 143 +++++++++++++++++- src/VisualStudio/Core/Def/project.json | 54 ------- .../Core/Impl/ServicesVisualStudioImpl.csproj | 37 ++++- src/VisualStudio/Core/Impl/project.json | 18 --- .../Next/ServicesVisualStudio.Next.csproj | 68 ++++++++- src/VisualStudio/Core/Next/project.json | 29 ---- .../SolutionExplorerShim.csproj | 24 ++- .../Core/SolutionExplorerShim/project.json | 14 -- .../Test.Next/VisualStudioTest.Next.csproj | 83 +++++++++- src/VisualStudio/Core/Test.Next/project.json | 36 ----- .../Core/Test/ServicesVisualStudioTest.vbproj | 55 ++++++- src/VisualStudio/Core/Test/project.json | 27 ---- .../VisualStudioIntegrationTests.csproj | 23 ++- .../IntegrationTests/project.json | 16 -- .../VisualStudioIntegrationTestSetup.csproj | 8 +- .../IntegrationTest/TestSetup/project.json | 12 -- ...isualStudioIntegrationTestUtilities.csproj | 59 +++++++- .../TestUtilities/project.json | 29 ---- .../VisualStudioInteractiveServices.csproj | 24 ++- .../InteractiveServices/project.json | 14 -- .../Razor/RazorVisualStudio.csproj | 3 - src/VisualStudio/Razor/project.json | 6 - .../RemoteHostClientMock.csproj | 11 +- .../RemoteHostClientMock/project.json | 13 -- .../VisualStudioSetup.Dependencies.csproj | 106 ++++++++++++- .../Setup.Dependencies/project.json | 44 ------ .../Setup.Next/VisualStudioSetup.Next.csproj | 22 ++- src/VisualStudio/Setup.Next/project.json | 16 -- .../Setup/VisualStudioSetup.csproj | 39 ++--- src/VisualStudio/Setup/project.json | 12 -- .../VisualStudioTestUtilities2.vbproj | 79 +++++++++- src/VisualStudio/TestUtilities2/project.json | 35 ----- .../VisualBasic/Impl/BasicVisualStudio.vbproj | 27 +++- .../VisualBasic/Impl/project.json | 15 -- .../Repl/BasicVisualStudioRepl.vbproj | 9 +- .../VisualBasic/Repl/project.json | 9 -- .../VisualStudioDiagnosticsWindow.csproj | 20 ++- .../project.json | 16 -- .../VisualStudioInteractiveComponents.csproj | 2 +- .../project.json | 9 -- .../Xaml/Impl/XamlVisualStudio.csproj | 24 ++- src/VisualStudio/Xaml/Impl/project.json | 14 -- .../CSharp/Portable/CSharpWorkspace.csproj | 7 +- src/Workspaces/CSharp/Portable/project.json | 8 - .../CSharpTest/CSharpServicesTest.csproj | 15 +- src/Workspaces/CSharpTest/project.json | 13 -- .../Core/Desktop/Workspaces.Desktop.csproj | 13 +- src/Workspaces/Core/Desktop/project.json | 11 -- .../Core/Portable/Workspaces.csproj | 21 ++- src/Workspaces/Core/Portable/project.json | 16 -- src/Workspaces/CoreTest/ServicesTest.csproj | 17 ++- src/Workspaces/CoreTest/project.json | 15 -- .../WorkspacesTestUtilities.csproj | 13 +- src/Workspaces/CoreTestUtilities/project.json | 13 -- .../Remote/Core/RemoteWorkspaces.csproj | 5 +- src/Workspaces/Remote/Core/project.json | 8 - .../Remote/Razor/RazorServiceHub.csproj | 5 +- src/Workspaces/Remote/Razor/project.json | 8 - .../Remote/ServiceHub/ServiceHub.csproj | 11 +- src/Workspaces/Remote/ServiceHub/project.json | 10 -- .../Portable/BasicWorkspace.vbproj | 9 +- .../VisualBasic/Portable/project.json | 8 - .../VisualBasicServicesTest.vbproj | 15 +- src/Workspaces/VisualBasicTest/project.json | 13 -- 356 files changed, 2700 insertions(+), 3400 deletions(-) delete mode 100644 build/Toolset/project.json delete mode 100644 src/CodeStyle/CSharp/Analyzers/project.json delete mode 100644 src/CodeStyle/CSharp/CodeFixes/project.json delete mode 100644 src/CodeStyle/CSharp/Tests/project.json delete mode 100644 src/CodeStyle/Core/Analyzers/project.json delete mode 100644 src/CodeStyle/Core/CodeFixes/project.json delete mode 100644 src/CodeStyle/Core/Tests/project.json delete mode 100644 src/CodeStyle/VisualBasic/Analyzers/project.json delete mode 100644 src/CodeStyle/VisualBasic/CodeFixes/project.json delete mode 100644 src/CodeStyle/VisualBasic/Tests/project.json delete mode 100644 src/Compilers/CSharp/CscCore/project.json delete mode 100644 src/Compilers/CSharp/Portable/project.json delete mode 100644 src/Compilers/CSharp/Test/CommandLine/project.json delete mode 100644 src/Compilers/CSharp/Test/Emit/project.json delete mode 100644 src/Compilers/CSharp/Test/Semantic/project.json delete mode 100644 src/Compilers/CSharp/Test/Symbol/project.json delete mode 100644 src/Compilers/CSharp/Test/Syntax/project.json delete mode 100644 src/Compilers/CSharp/Test/WinRT/project.json delete mode 100644 src/Compilers/CSharp/csc/project.json delete mode 100644 src/Compilers/Core/CodeAnalysisTest/project.json delete mode 100644 src/Compilers/Core/MSBuildTask/project.json delete mode 100644 src/Compilers/Core/MSBuildTaskTests/project.json delete mode 100644 src/Compilers/Core/Portable/project.json delete mode 100644 src/Compilers/Extension/project.json delete mode 100644 src/Compilers/Server/PortableServer/project.json delete mode 100644 src/Compilers/Server/VBCSCompiler/project.json delete mode 100644 src/Compilers/Server/VBCSCompilerTests/project.json delete mode 100644 src/Compilers/Test/Resources/Core/project.json delete mode 100644 src/Compilers/Test/Utilities/CSharp.Desktop/project.json delete mode 100644 src/Compilers/Test/Utilities/CSharp/project.json delete mode 100644 src/Compilers/Test/Utilities/VisualBasic/project.json delete mode 100644 src/Compilers/VisualBasic/Portable/project.json delete mode 100644 src/Compilers/VisualBasic/Test/CommandLine/project.json delete mode 100644 src/Compilers/VisualBasic/Test/Emit/project.json delete mode 100644 src/Compilers/VisualBasic/Test/Semantic/project.json delete mode 100644 src/Compilers/VisualBasic/Test/Symbol/project.json delete mode 100644 src/Compilers/VisualBasic/Test/Syntax/project.json delete mode 100644 src/Compilers/VisualBasic/VbcCore/project.json delete mode 100644 src/Compilers/VisualBasic/vbc/project.json delete mode 100644 src/EditorFeatures/CSharp/project.json delete mode 100644 src/EditorFeatures/CSharpTest/project.json delete mode 100644 src/EditorFeatures/CSharpTest2/project.json delete mode 100644 src/EditorFeatures/Core/project.json delete mode 100644 src/EditorFeatures/Next/project.json delete mode 100644 src/EditorFeatures/Test/project.json delete mode 100644 src/EditorFeatures/Test2/project.json delete mode 100644 src/EditorFeatures/TestUtilities/project.json delete mode 100644 src/EditorFeatures/TestUtilities2/project.json delete mode 100644 src/EditorFeatures/Text/project.json delete mode 100644 src/EditorFeatures/VisualBasic/project.json delete mode 100644 src/EditorFeatures/VisualBasicTest/project.json delete mode 100644 src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/project.json delete mode 100644 src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/project.json delete mode 100644 src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json delete mode 100644 src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json delete mode 100644 src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json delete mode 100644 src/ExpressionEvaluator/Core/Source/FunctionResolver/project.json delete mode 100644 src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/project.json delete mode 100644 src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json delete mode 100644 src/ExpressionEvaluator/Core/Test/FunctionResolver/project.json delete mode 100644 src/ExpressionEvaluator/Core/Test/ResultProvider/project.json delete mode 100644 src/ExpressionEvaluator/Package/project.json delete mode 100644 src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/project.json delete mode 100644 src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/project.json delete mode 100644 src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json delete mode 100644 src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.json delete mode 100644 src/Features/CSharp/Portable/project.json delete mode 100644 src/Features/Core/Portable/project.json delete mode 100644 src/Features/VisualBasic/Portable/project.json delete mode 100644 src/Interactive/CsiCore/project.json delete mode 100644 src/Interactive/EditorFeatures/CSharp/project.json delete mode 100644 src/Interactive/EditorFeatures/Core/project.json delete mode 100644 src/Interactive/EditorFeatures/VisualBasic/project.json delete mode 100644 src/Interactive/Features/project.json delete mode 100644 src/Interactive/Host/project.json delete mode 100644 src/Interactive/HostTest/project.json delete mode 100644 src/Interactive/VbiCore/project.json delete mode 100644 src/Interactive/csi/project.json delete mode 100644 src/Interactive/vbi/project.json delete mode 100644 src/Samples/CSharp/APISampleUnitTests/project.json delete mode 100644 src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json delete mode 100644 src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json delete mode 100644 src/Samples/CSharp/ConsoleClassifier/project.json delete mode 100644 src/Samples/CSharp/ConvertToAutoProperty/project.json delete mode 100644 src/Samples/CSharp/ConvertToConditional/Impl/project.json delete mode 100644 src/Samples/CSharp/ConvertToConditional/Test/project.json delete mode 100644 src/Samples/CSharp/CopyPasteWithUsing/project.json delete mode 100644 src/Samples/CSharp/FormatSolution/project.json delete mode 100644 src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.json delete mode 100644 src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json delete mode 100644 src/Samples/CSharp/MakeConst/Impl/project.json delete mode 100644 src/Samples/CSharp/RefOutModifier/project.json delete mode 100644 src/Samples/CSharp/TreeTransforms/project.json delete mode 100644 src/Samples/Shared/UnitTestFramework/project.json delete mode 100644 src/Samples/VisualBasic/APISampleUnitTests/project.json delete mode 100644 src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.json delete mode 100644 src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json delete mode 100644 src/Samples/VisualBasic/ConsoleClassifier/project.json delete mode 100644 src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.json delete mode 100644 src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json delete mode 100644 src/Samples/VisualBasic/FormatSolution/project.json delete mode 100644 src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.json delete mode 100644 src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json delete mode 100644 src/Samples/VisualBasic/MakeConst/Impl/project.json delete mode 100644 src/Samples/VisualBasic/RemoveByVal/Impl/project.json delete mode 100644 src/Samples/VisualBasic/RemoveByVal/Test/project.json delete mode 100644 src/Samples/VisualBasic/TreeTransforms/project.json delete mode 100644 src/Scripting/CSharp/project.json delete mode 100644 src/Scripting/CSharpTest.Desktop/project.json delete mode 100644 src/Scripting/CSharpTest/project.json delete mode 100644 src/Scripting/Core/project.json delete mode 100644 src/Scripting/CoreTest.Desktop/project.json delete mode 100644 src/Scripting/CoreTest/project.json delete mode 100644 src/Scripting/CoreTestUtilities/project.json delete mode 100644 src/Scripting/VisualBasic/project.json delete mode 100644 src/Scripting/VisualBasicTest.Desktop/project.json delete mode 100644 src/Scripting/VisualBasicTest/project.json delete mode 100644 src/Setup/DevDivInsertionFiles/project.json delete mode 100644 src/Setup/Templates/project.json delete mode 100644 src/Test/DeployCoreClrTestRuntime/project.json delete mode 100644 src/Test/DeployDesktopTestRuntime/project.json delete mode 100644 src/Test/Diagnostics/project.json delete mode 100644 src/Test/PdbUtilities/project.json delete mode 100644 src/Test/Perf/Runner/project.json delete mode 100644 src/Test/Perf/StackDepthTest/project.json delete mode 100644 src/Test/Utilities/CoreClr/project.json delete mode 100644 src/Test/Utilities/Desktop/project.json delete mode 100644 src/Test/Utilities/Portable/project.json delete mode 100644 src/Tools/BuildBoss/project.json delete mode 100644 src/Tools/ProcessWatchdog/project.json delete mode 100644 src/Tools/RepoUtil/project.json delete mode 100644 src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json delete mode 100644 src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json delete mode 100644 src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json delete mode 100644 src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json delete mode 100644 src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json delete mode 100644 src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json delete mode 100644 src/Tools/Source/RunTests/project.json delete mode 100644 src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/project.json delete mode 100644 src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/project.json delete mode 100644 src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/project.json delete mode 100644 src/VisualStudio/CSharp/Impl/project.json delete mode 100644 src/VisualStudio/CSharp/Repl/project.json delete mode 100644 src/VisualStudio/CSharp/Test/project.json delete mode 100644 src/VisualStudio/Core/Def/project.json delete mode 100644 src/VisualStudio/Core/Impl/project.json delete mode 100644 src/VisualStudio/Core/Next/project.json delete mode 100644 src/VisualStudio/Core/SolutionExplorerShim/project.json delete mode 100644 src/VisualStudio/Core/Test.Next/project.json delete mode 100644 src/VisualStudio/Core/Test/project.json delete mode 100644 src/VisualStudio/IntegrationTest/IntegrationTests/project.json delete mode 100644 src/VisualStudio/IntegrationTest/TestSetup/project.json delete mode 100644 src/VisualStudio/IntegrationTest/TestUtilities/project.json delete mode 100644 src/VisualStudio/InteractiveServices/project.json delete mode 100644 src/VisualStudio/Razor/project.json delete mode 100644 src/VisualStudio/RemoteHostClientMock/project.json delete mode 100644 src/VisualStudio/Setup.Dependencies/project.json delete mode 100644 src/VisualStudio/Setup.Next/project.json delete mode 100644 src/VisualStudio/Setup/project.json delete mode 100644 src/VisualStudio/TestUtilities2/project.json delete mode 100644 src/VisualStudio/VisualBasic/Impl/project.json delete mode 100644 src/VisualStudio/VisualBasic/Repl/project.json delete mode 100644 src/VisualStudio/VisualStudioDiagnosticsToolWindow/project.json delete mode 100644 src/VisualStudio/VisualStudioInteractiveComponents/project.json delete mode 100644 src/VisualStudio/Xaml/Impl/project.json delete mode 100644 src/Workspaces/CSharp/Portable/project.json delete mode 100644 src/Workspaces/CSharpTest/project.json delete mode 100644 src/Workspaces/Core/Desktop/project.json delete mode 100644 src/Workspaces/Core/Portable/project.json delete mode 100644 src/Workspaces/CoreTest/project.json delete mode 100644 src/Workspaces/CoreTestUtilities/project.json delete mode 100644 src/Workspaces/Remote/Core/project.json delete mode 100644 src/Workspaces/Remote/Razor/project.json delete mode 100644 src/Workspaces/Remote/ServiceHub/project.json delete mode 100644 src/Workspaces/VisualBasic/Portable/project.json delete mode 100644 src/Workspaces/VisualBasicTest/project.json diff --git a/build/Toolset/Toolset.csproj b/build/Toolset/Toolset.csproj index 60033f61110..4b342a34ddf 100644 --- a/build/Toolset/Toolset.csproj +++ b/build/Toolset/Toolset.csproj @@ -10,6 +10,7 @@ Toolset Toolset_DoNetUse v4.6.2 + win7;ubuntu.14.04;osx.10.10 true @@ -20,9 +21,6 @@ - - - {7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3} @@ -66,4 +64,4 @@ - + \ No newline at end of file diff --git a/build/Toolset/project.json b/build/Toolset/project.json deleted file mode 100644 index 50182c18072..00000000000 --- a/build/Toolset/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { }, - "ubuntu.14.04": { }, - "osx.10.10": { } - } -} diff --git a/src/CodeStyle/CSharp/Analyzers/CSharpCodeStyle.csproj b/src/CodeStyle/CSharp/Analyzers/CSharpCodeStyle.csproj index 73d91dd1bc3..1c90fe219f3 100644 --- a/src/CodeStyle/CSharp/Analyzers/CSharpCodeStyle.csproj +++ b/src/CodeStyle/CSharp/Analyzers/CSharpCodeStyle.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,8 @@ Microsoft.CodeAnalysis.CSharp Microsoft.CodeAnalysis.CSharp.CodeStyle .dll - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -48,9 +48,6 @@ CSharpCodeStyleResources.Designer.cs - - - diff --git a/src/CodeStyle/CSharp/Analyzers/project.json b/src/CodeStyle/CSharp/Analyzers/project.json deleted file mode 100644 index ce32acbdb67..00000000000 --- a/src/CodeStyle/CSharp/Analyzers/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/CodeStyle/CSharp/CodeFixes/CSharpCodeStyleFixes.csproj b/src/CodeStyle/CSharp/CodeFixes/CSharpCodeStyleFixes.csproj index 727d2d72b7e..4b72cf6189f 100644 --- a/src/CodeStyle/CSharp/CodeFixes/CSharpCodeStyleFixes.csproj +++ b/src/CodeStyle/CSharp/CodeFixes/CSharpCodeStyleFixes.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,8 @@ Microsoft.CodeAnalysis.CSharp Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes .dll - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -63,9 +63,6 @@ CSharpCodeStyleFixesResources.Designer.cs - - - diff --git a/src/CodeStyle/CSharp/CodeFixes/project.json b/src/CodeStyle/CSharp/CodeFixes/project.json deleted file mode 100644 index ce32acbdb67..00000000000 --- a/src/CodeStyle/CSharp/CodeFixes/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/CodeStyle/CSharp/Tests/CSharpCodeStyleTests.csproj b/src/CodeStyle/CSharp/Tests/CSharpCodeStyleTests.csproj index 381b79c577f..065f4aa27c7 100644 --- a/src/CodeStyle/CSharp/Tests/CSharpCodeStyleTests.csproj +++ b/src/CodeStyle/CSharp/Tests/CSharpCodeStyleTests.csproj @@ -1,7 +1,7 @@  - + True AnyCPU @@ -11,8 +11,8 @@ Microsoft.CodeAnalysis.CSharp Microsoft.CodeAnalysis.CSharp.CodeStyle.UnitTests .dll - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTestPortable @@ -53,7 +53,9 @@ - + + + \ No newline at end of file diff --git a/src/CodeStyle/CSharp/Tests/project.json b/src/CodeStyle/CSharp/Tests/project.json deleted file mode 100644 index 7261258ae6d..00000000000 --- a/src/CodeStyle/CSharp/Tests/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/CodeStyle/Core/Analyzers/CodeStyle.csproj b/src/CodeStyle/Core/Analyzers/CodeStyle.csproj index 1a8110e8f1d..222e1b82795 100644 --- a/src/CodeStyle/Core/Analyzers/CodeStyle.csproj +++ b/src/CodeStyle/Core/Analyzers/CodeStyle.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -9,8 +9,8 @@ Library Microsoft.CodeAnalysis Microsoft.CodeAnalysis.CodeStyle - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -45,13 +45,9 @@ CodeStyleResources.Designer.cs - - - - \ No newline at end of file diff --git a/src/CodeStyle/Core/Analyzers/project.json b/src/CodeStyle/Core/Analyzers/project.json deleted file mode 100644 index ce32acbdb67..00000000000 --- a/src/CodeStyle/Core/Analyzers/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/CodeStyle/Core/CodeFixes/CodeStyleFixes.csproj b/src/CodeStyle/Core/CodeFixes/CodeStyleFixes.csproj index d3ebbd7dc8c..947bb41941a 100644 --- a/src/CodeStyle/Core/CodeFixes/CodeStyleFixes.csproj +++ b/src/CodeStyle/Core/CodeFixes/CodeStyleFixes.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -9,8 +9,8 @@ Library Microsoft.CodeAnalysis Microsoft.CodeAnalysis.CodeStyle.Fixes - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -50,13 +50,9 @@ CodeStyleFixesResources.Designer.cs - - - - \ No newline at end of file diff --git a/src/CodeStyle/Core/CodeFixes/project.json b/src/CodeStyle/Core/CodeFixes/project.json deleted file mode 100644 index ce32acbdb67..00000000000 --- a/src/CodeStyle/Core/CodeFixes/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/CodeStyle/Core/Tests/CodeStyleTests.csproj b/src/CodeStyle/Core/Tests/CodeStyleTests.csproj index 885413a389d..466801b686f 100644 --- a/src/CodeStyle/Core/Tests/CodeStyleTests.csproj +++ b/src/CodeStyle/Core/Tests/CodeStyleTests.csproj @@ -1,7 +1,7 @@  - + True AnyCPU @@ -10,8 +10,8 @@ Library Microsoft.CodeAnalysis Microsoft.CodeAnalysis.CodeStyle.UnitTests - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTestPortable @@ -40,8 +40,9 @@ - + + + - \ No newline at end of file diff --git a/src/CodeStyle/Core/Tests/project.json b/src/CodeStyle/Core/Tests/project.json deleted file mode 100644 index 7261258ae6d..00000000000 --- a/src/CodeStyle/Core/Tests/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/CodeStyle/VisualBasic/Analyzers/BasicCodeStyle.vbproj b/src/CodeStyle/VisualBasic/Analyzers/BasicCodeStyle.vbproj index 5959d079898..5af7fe694bd 100644 --- a/src/CodeStyle/VisualBasic/Analyzers/BasicCodeStyle.vbproj +++ b/src/CodeStyle/VisualBasic/Analyzers/BasicCodeStyle.vbproj @@ -1,15 +1,15 @@  - + AnyCPU AnyCPU {2531A8C4-97DD-47BC-A79C-B7846051E137} Library Microsoft.CodeAnalysis.VisualBasic.CodeStyle - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} @@ -47,9 +47,6 @@ Designer - - - diff --git a/src/CodeStyle/VisualBasic/Analyzers/project.json b/src/CodeStyle/VisualBasic/Analyzers/project.json deleted file mode 100644 index ce32acbdb67..00000000000 --- a/src/CodeStyle/VisualBasic/Analyzers/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/CodeStyle/VisualBasic/CodeFixes/BasicCodeStyleFixes.vbproj b/src/CodeStyle/VisualBasic/CodeFixes/BasicCodeStyleFixes.vbproj index b69692ace0e..64e7126bc7a 100644 --- a/src/CodeStyle/VisualBasic/CodeFixes/BasicCodeStyleFixes.vbproj +++ b/src/CodeStyle/VisualBasic/CodeFixes/BasicCodeStyleFixes.vbproj @@ -1,15 +1,15 @@  - + AnyCPU AnyCPU {0141285D-8F6C-42C7-BAF3-3C0CCD61C716} Library Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} @@ -62,9 +62,6 @@ Designer - - - diff --git a/src/CodeStyle/VisualBasic/CodeFixes/project.json b/src/CodeStyle/VisualBasic/CodeFixes/project.json deleted file mode 100644 index ce32acbdb67..00000000000 --- a/src/CodeStyle/VisualBasic/CodeFixes/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/CodeStyle/VisualBasic/Tests/BasicCodeStyleTests.vbproj b/src/CodeStyle/VisualBasic/Tests/BasicCodeStyleTests.vbproj index 87803ded492..858b924d082 100644 --- a/src/CodeStyle/VisualBasic/Tests/BasicCodeStyleTests.vbproj +++ b/src/CodeStyle/VisualBasic/Tests/BasicCodeStyleTests.vbproj @@ -1,7 +1,7 @@  - + True AnyCPU @@ -9,8 +9,8 @@ {E512C6C1-F085-4AD7-B0D9-E8F1A0A2A510} Library Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} UnitTestPortable @@ -51,7 +51,9 @@ - + + + \ No newline at end of file diff --git a/src/CodeStyle/VisualBasic/Tests/project.json b/src/CodeStyle/VisualBasic/Tests/project.json deleted file mode 100644 index 7261258ae6d..00000000000 --- a/src/CodeStyle/VisualBasic/Tests/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/Compilers/CSharp/CscCore/CscCore.csproj b/src/Compilers/CSharp/CscCore/CscCore.csproj index 5d717c4d01d..082c80c66c1 100644 --- a/src/Compilers/CSharp/CscCore/CscCore.csproj +++ b/src/Compilers/CSharp/CscCore/CscCore.csproj @@ -1,12 +1,11 @@  - + AnyCPU AnyCPU x64 - $(BaseNuGetRuntimeIdentifier)-$(RuntimeIdentifier) {E3CD2895-76A8-4D11-A316-EA67CB5EA42C} Exe Microsoft.CodeAnalysis.CSharp.CommandLine @@ -17,8 +16,9 @@ true True {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netcoreapp1.1 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 + portable-net452 true @@ -65,8 +65,7 @@ PreserveNewest - - + \ No newline at end of file diff --git a/src/Compilers/CSharp/CscCore/project.json b/src/Compilers/CSharp/CscCore/project.json deleted file mode 100644 index e98469c3153..00000000000 --- a/src/Compilers/CSharp/CscCore/project.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.1.0", - "Microsoft.NETCore.TestHost": "1.1.0", - "System.AppContext": "4.3.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.Immutable": "1.3.1", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.FileVersionInfo": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.Diagnostics.StackTrace": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.IO.FileSystem.Watcher": "4.3.0", - "System.IO.Pipes": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Loader": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Runtime.Serialization.Json": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.CodePages": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Parallel": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XPath.XDocument": "4.3.0" - }, - "frameworks": { - "NETCoreApp1.0": { - "imports": "portable-net452" - } - }, - "runtimes": { - "win7-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.16.04-x64": { }, - "osx.10.12-x64": { } - } -} diff --git a/src/Compilers/CSharp/Portable/CSharpCodeAnalysis.csproj b/src/Compilers/CSharp/Portable/CSharpCodeAnalysis.csproj index e89a0abf57b..046bc5a69f0 100644 --- a/src/Compilers/CSharp/Portable/CSharpCodeAnalysis.csproj +++ b/src/Compilers/CSharp/Portable/CSharpCodeAnalysis.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,7 @@ Microsoft.CodeAnalysis.CSharp Microsoft.CodeAnalysis.CSharp true - .NETPortable - v5.0 + netstandard1.3 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true ..\CSharpCodeAnalysisRules.ruleset @@ -815,7 +814,6 @@ - Designer @@ -871,4 +869,4 @@ - + \ No newline at end of file diff --git a/src/Compilers/CSharp/Portable/project.json b/src/Compilers/CSharp/Portable/project.json deleted file mode 100644 index 5f08b428e77..00000000000 --- a/src/Compilers/CSharp/Portable/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "System.Linq.Expressions": "4.3.0", - "System.Threading.Tasks.Parallel": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj b/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj index e7331994ef7..f2dd5e45354 100644 --- a/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj +++ b/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj @@ -12,6 +12,7 @@ Roslyn.Compilers.CSharp.CommandLine.UnitTests false v4.6 + win7 UnitTest @@ -68,6 +69,15 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -85,7 +95,6 @@ csc.rsp - @@ -97,4 +106,4 @@ - + \ No newline at end of file diff --git a/src/Compilers/CSharp/Test/CommandLine/project.json b/src/Compilers/CSharp/Test/CommandLine/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/Compilers/CSharp/Test/CommandLine/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj b/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj index 2b69608a19d..8e08dde650f 100644 --- a/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj +++ b/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj @@ -11,6 +11,7 @@ Microsoft.CodeAnalysis.CSharp.UnitTests Roslyn.Compilers.CSharp.Emit.UnitTests v4.6 + win7 UnitTest true @@ -176,6 +177,18 @@ + + $(MicrosoftDiaSymReaderVersion) + + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -184,9 +197,6 @@ Designer - - - diff --git a/src/Compilers/CSharp/Test/Emit/project.json b/src/Compilers/CSharp/Test/Emit/project.json deleted file mode 100644 index fb565e13bff..00000000000 --- a/src/Compilers/CSharp/Test/Emit/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "Microsoft.DiaSymReader": "1.1.0", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj b/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj index c6e668ed7af..9d45cd0c9cd 100644 --- a/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj +++ b/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj @@ -12,6 +12,7 @@ Roslyn.Compilers.CSharp.Semantic.UnitTests false v4.6 + win7 UnitTest @@ -157,9 +158,15 @@ - - - + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + diff --git a/src/Compilers/CSharp/Test/Semantic/project.json b/src/Compilers/CSharp/Test/Semantic/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/Compilers/CSharp/Test/Semantic/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj b/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj index c3b122ff144..0286f88d34c 100644 --- a/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj +++ b/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj @@ -1,7 +1,7 @@  - + true AnyCPU @@ -11,8 +11,8 @@ Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests Roslyn.Compilers.CSharp.Symbol.UnitTests {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netstandard1.3 + portable-net452 true UnitTestPortable true @@ -170,10 +170,14 @@ - + - + + + + + \ No newline at end of file diff --git a/src/Compilers/CSharp/Test/Symbol/project.json b/src/Compilers/CSharp/Test/Symbol/project.json deleted file mode 100644 index 2034ad8a7f3..00000000000 --- a/src/Compilers/CSharp/Test/Symbol/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "microsoft.netcore.portable.compatibility": "1.0.1", - "System.Linq.Parallel": "4.3.0", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net452" - } - } -} diff --git a/src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj b/src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj index 497158da542..22e0c724b89 100644 --- a/src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj +++ b/src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj @@ -1,7 +1,7 @@  - + true AnyCPU @@ -12,8 +12,8 @@ Roslyn.Compilers.CSharp.Syntax.UnitTests false {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netstandard1.3 + portable-net452 true true UnitTestPortable @@ -138,11 +138,8 @@ Designer - - - - + \ No newline at end of file diff --git a/src/Compilers/CSharp/Test/Syntax/project.json b/src/Compilers/CSharp/Test/Syntax/project.json deleted file mode 100644 index c3ff33cba93..00000000000 --- a/src/Compilers/CSharp/Test/Syntax/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net452" - } - } -} diff --git a/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj b/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj index 9b7bde3d364..53c52e3c205 100644 --- a/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj +++ b/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj @@ -12,6 +12,7 @@ Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen Roslyn.Compilers.CSharp.WinRT.UnitTests v4.6 + win7 UnitTest @@ -67,9 +68,15 @@ - - - + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + diff --git a/src/Compilers/CSharp/Test/WinRT/project.json b/src/Compilers/CSharp/Test/WinRT/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/Compilers/CSharp/Test/WinRT/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Compilers/CSharp/csc/csc.csproj b/src/Compilers/CSharp/csc/csc.csproj index fa44aed7c7e..647d8bfac2e 100644 --- a/src/Compilers/CSharp/csc/csc.csproj +++ b/src/Compilers/CSharp/csc/csc.csproj @@ -14,6 +14,7 @@ true Microsoft.CodeAnalysis.CSharp.CommandLine.Program v4.6 + win7 @@ -29,6 +30,9 @@ + + $(MicrosoftDiaSymReaderNativeVersion) + @@ -59,7 +63,6 @@ PreserveNewest - diff --git a/src/Compilers/CSharp/csc/project.json b/src/Compilers/CSharp/csc/project.json deleted file mode 100644 index f39a9046cb9..00000000000 --- a/src/Compilers/CSharp/csc/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.DiaSymReader.Native": "1.5.0" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj b/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj index 9833d2a8ae3..99a7238811d 100644 --- a/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj +++ b/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj @@ -12,6 +12,7 @@ Roslyn.Compilers.UnitTests true v4.6 + win7 UnitTest @@ -84,6 +85,18 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + + + $(MoqVersion) + @@ -162,7 +175,6 @@ - @@ -172,4 +184,4 @@ - + \ No newline at end of file diff --git a/src/Compilers/Core/CodeAnalysisTest/project.json b/src/Compilers/Core/CodeAnalysisTest/project.json deleted file mode 100644 index 13ace6039d1..00000000000 --- a/src/Compilers/Core/CodeAnalysisTest/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194", - "Moq": "4.2.1402.2112" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Compilers/Core/MSBuildTask/MSBuildTask.csproj b/src/Compilers/Core/MSBuildTask/MSBuildTask.csproj index d9b7f527e37..663ec10f920 100644 --- a/src/Compilers/Core/MSBuildTask/MSBuildTask.csproj +++ b/src/Compilers/Core/MSBuildTask/MSBuildTask.csproj @@ -1,7 +1,7 @@  - + 14.0 AnyCPU @@ -13,8 +13,8 @@ Microsoft.Build.Tasks.CodeAnalysis en-US {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netstandard1.5 + portable-net452;dotnet5.4 @@ -25,7 +25,6 @@ PreserveNewest - @@ -80,6 +79,29 @@ ErrorString.Designer.cs + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Compilers/Core/MSBuildTask/project.json b/src/Compilers/Core/MSBuildTask/project.json deleted file mode 100644 index ac0c51a5b30..00000000000 --- a/src/Compilers/Core/MSBuildTask/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "dependencies": { - "Microsoft.Build": "14.3.0", - "Microsoft.Build.Tasks.Core": "14.3.0", - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "Microsoft.Win32.Primitives": "4.3.0", - "System.AppContext": "4.3.0", - "System.Console": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.DriveInfo": "4.3.0", - "System.IO.Pipes": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Security.AccessControl": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Thread": "4.3.0" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ - "portable-net452", - "dotnet5.4" - ] - } - } -} diff --git a/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj b/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj index af436f6ad5a..1c2169707e1 100644 --- a/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj +++ b/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj @@ -12,6 +12,7 @@ Microsoft.Build.Tasks.CodeAnalysis.UnitTests true v4.6.2 + win7 UnitTest @@ -61,6 +62,24 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + + + $(SystemCollectionsImmutableVersion) + + + $(MicrosoftBuildFixedVersion) + + + $(MoqVersion) + @@ -73,8 +92,5 @@ - - - - + \ No newline at end of file diff --git a/src/Compilers/Core/MSBuildTaskTests/project.json b/src/Compilers/Core/MSBuildTaskTests/project.json deleted file mode 100644 index a97c5b37557..00000000000 --- a/src/Compilers/Core/MSBuildTaskTests/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194", - "System.Collections.Immutable": "1.3.1", - "Microsoft.Build": "14.3.0", - "Moq": "4.2.1402.2112" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/Compilers/Core/Portable/CodeAnalysis.csproj b/src/Compilers/Core/Portable/CodeAnalysis.csproj index 606f520a095..6e0f986e285 100644 --- a/src/Compilers/Core/Portable/CodeAnalysis.csproj +++ b/src/Compilers/Core/Portable/CodeAnalysis.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,7 @@ Microsoft.CodeAnalysis Microsoft.CodeAnalysis true - .NETPortable - v5.0 + netstandard1.3 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true $(DefineConstants);COMPILERCORE @@ -912,7 +911,6 @@ Designer - Designer @@ -923,4 +921,4 @@ - + \ No newline at end of file diff --git a/src/Compilers/Core/Portable/project.json b/src/Compilers/Core/Portable/project.json deleted file mode 100644 index 5e2cd7f27f0..00000000000 --- a/src/Compilers/Core/Portable/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "supports": {}, - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "System.Collections.Immutable": "1.3.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.FileVersionInfo": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Reflection.Metadata": "1.4.2", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.CodePages": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.ValueTuple": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XPath.XDocument": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/Compilers/Extension/CompilerExtension.csproj b/src/Compilers/Extension/CompilerExtension.csproj index 3b72addb088..9cca3834575 100644 --- a/src/Compilers/Extension/CompilerExtension.csproj +++ b/src/Compilers/Extension/CompilerExtension.csproj @@ -12,6 +12,7 @@ Roslyn.Compilers.Extension Roslyn.Compilers.Extension v4.6.2 + win7 True true true @@ -36,7 +37,6 @@ - Designer @@ -150,6 +150,27 @@ DebugSymbolsProjectOutputGroup%3b true + + $(EnvDTEVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioShellInterop80Version) + + + $(MicrosoftVisualStudioShellInterop90Version) + + + $(MicrosoftVisualStudioShellInterop100Version) + + + $(MicrosoftVisualStudioShellFrameworkVersion) + + + $(MicrosoftVisualStudioUtilitiesVersion) + - + \ No newline at end of file diff --git a/src/Compilers/Extension/project.json b/src/Compilers/Extension/project.json deleted file mode 100644 index 000d1f61619..00000000000 --- a/src/Compilers/Extension/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Interop.8.0": "8.0.50727", - "Microsoft.VisualStudio.Shell.Interop.9.0": "9.0.30729", - "Microsoft.VisualStudio.Shell.Interop.10.0": "10.0.30319", - "Microsoft.VisualStudio.Shell.Framework": "15.0.26201-alpha", - "Microsoft.VisualStudio.Utilities": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/Compilers/Server/PortableServer/PortableServer.csproj b/src/Compilers/Server/PortableServer/PortableServer.csproj index 013efcf4655..db879d1a28b 100644 --- a/src/Compilers/Server/PortableServer/PortableServer.csproj +++ b/src/Compilers/Server/PortableServer/PortableServer.csproj @@ -1,12 +1,11 @@  - + x64 AnyCPU x64 - $(BaseNuGetRuntimeIdentifier)-$(RuntimeIdentifier) {06B26DCB-7A12-48EF-AE50-708593ABD05F} Exe Microsoft.CodeAnalysis.CompilerServer @@ -16,8 +15,9 @@ Microsoft.CodeAnalysis.CompilerServer.Program True {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netcoreapp1.1 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.10-x64 + portable-net452 true ExeNonDeployment @@ -50,7 +50,27 @@ PreserveNewest - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Compilers/Server/PortableServer/project.json b/src/Compilers/Server/PortableServer/project.json deleted file mode 100644 index 828b58f2cda..00000000000 --- a/src/Compilers/Server/PortableServer/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "dependencies": { - "System.AppContext": "4.3.0", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.FileVersionInfo": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.Diagnostics.StackTrace": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.IO.FileSystem.Watcher": "4.3.0", - "System.IO.Pipes": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Runtime.Loader": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Parallel": "4.3.0", - "System.Threading.Thread": "4.3.0" - }, - "frameworks": { - "NETCoreApp1.0": { - "imports": "portable-net452" - } - }, - "runtimes": { - "win7-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.16.04-x64": { }, - "osx.10.10-x64": { } - } -} diff --git a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj index 0293319c5aa..8d87945b41a 100644 --- a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj +++ b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj @@ -13,6 +13,7 @@ VBCSCompiler true v4.6 + win7;ubuntu.14.04;osx.10.10 false false @@ -66,7 +67,6 @@ - diff --git a/src/Compilers/Server/VBCSCompiler/project.json b/src/Compilers/Server/VBCSCompiler/project.json deleted file mode 100644 index 3d4d7145ee3..00000000000 --- a/src/Compilers/Server/VBCSCompiler/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { }, - "ubuntu.14.04": { }, - "osx.10.10": { } - } -} diff --git a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj index e5d125d4031..3b4191aafe5 100644 --- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj +++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj @@ -12,6 +12,7 @@ Roslyn.Compilers.CompilerServer.UnitTests true v4.6 + win7 UnitTest @@ -63,6 +64,21 @@ + + $(MicrosoftDiaSymReaderVersion) + + + $(MoqVersion) + + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -83,8 +99,5 @@ - - - - + \ No newline at end of file diff --git a/src/Compilers/Server/VBCSCompilerTests/project.json b/src/Compilers/Server/VBCSCompilerTests/project.json deleted file mode 100644 index 78c253b9770..00000000000 --- a/src/Compilers/Server/VBCSCompilerTests/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Microsoft.DiaSymReader": "1.1.0", - "Moq": "4.2.1402.2112", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/Compilers/Test/Resources/Core/CompilerTestResources.csproj b/src/Compilers/Test/Resources/Core/CompilerTestResources.csproj index db0885b81c0..c6ec80358e4 100644 --- a/src/Compilers/Test/Resources/Core/CompilerTestResources.csproj +++ b/src/Compilers/Test/Resources/Core/CompilerTestResources.csproj @@ -1,7 +1,7 @@  - + true AnyCPU @@ -9,8 +9,7 @@ {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD} Library Roslyn.Compilers.Test.Resources - .NETPortable - v5.0 + netstandard1.3 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -401,5 +400,8 @@ + + + - + \ No newline at end of file diff --git a/src/Compilers/Test/Resources/Core/project.json b/src/Compilers/Test/Resources/Core/project.json deleted file mode 100644 index 3aa9724d274..00000000000 --- a/src/Compilers/Test/Resources/Core/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "supports": { }, - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "System.Xml.ReaderWriter": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/Compilers/Test/Utilities/CSharp.Desktop/CSharpCompilerTestUtilities.Desktop.csproj b/src/Compilers/Test/Utilities/CSharp.Desktop/CSharpCompilerTestUtilities.Desktop.csproj index 4e9ec1b4200..d5f6cba44a1 100644 --- a/src/Compilers/Test/Utilities/CSharp.Desktop/CSharpCompilerTestUtilities.Desktop.csproj +++ b/src/Compilers/Test/Utilities/CSharp.Desktop/CSharpCompilerTestUtilities.Desktop.csproj @@ -70,8 +70,5 @@ - - - \ No newline at end of file diff --git a/src/Compilers/Test/Utilities/CSharp.Desktop/project.json b/src/Compilers/Test/Utilities/CSharp.Desktop/project.json deleted file mode 100644 index f6d5f3296a0..00000000000 --- a/src/Compilers/Test/Utilities/CSharp.Desktop/project.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "net46": { } - } -} diff --git a/src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj b/src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj index e1d6b8930d4..a89fe261882 100644 --- a/src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj +++ b/src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj @@ -1,7 +1,7 @@  - + 14.0 AnyCPU @@ -13,17 +13,13 @@ true en-US {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netstandard1.3 + portable-net452 true true - - - - @@ -76,6 +72,9 @@ + + + diff --git a/src/Compilers/Test/Utilities/CSharp/project.json b/src/Compilers/Test/Utilities/CSharp/project.json deleted file mode 100644 index 08df93dc5a3..00000000000 --- a/src/Compilers/Test/Utilities/CSharp/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Runtime.Extensions": "4.3.0" - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net452" - } - } -} \ No newline at end of file diff --git a/src/Compilers/Test/Utilities/VisualBasic/BasicCompilerTestUtilities.vbproj b/src/Compilers/Test/Utilities/VisualBasic/BasicCompilerTestUtilities.vbproj index 47da85a3365..f97ec9d594b 100644 --- a/src/Compilers/Test/Utilities/VisualBasic/BasicCompilerTestUtilities.vbproj +++ b/src/Compilers/Test/Utilities/VisualBasic/BasicCompilerTestUtilities.vbproj @@ -89,8 +89,5 @@ - - - - + \ No newline at end of file diff --git a/src/Compilers/Test/Utilities/VisualBasic/project.json b/src/Compilers/Test/Utilities/VisualBasic/project.json deleted file mode 100644 index f6d5f3296a0..00000000000 --- a/src/Compilers/Test/Utilities/VisualBasic/project.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "net46": { } - } -} diff --git a/src/Compilers/VisualBasic/Portable/BasicCodeAnalysis.vbproj b/src/Compilers/VisualBasic/Portable/BasicCodeAnalysis.vbproj index 81cb093a9b9..c9e925f0e6d 100644 --- a/src/Compilers/VisualBasic/Portable/BasicCodeAnalysis.vbproj +++ b/src/Compilers/VisualBasic/Portable/BasicCodeAnalysis.vbproj @@ -1,15 +1,14 @@  - + AnyCPU AnyCPU {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6} Library Microsoft.CodeAnalysis.VisualBasic - .NETPortable - v5.0 + netstandard1.3 {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} true $(NoWarn);42014 @@ -972,8 +971,10 @@ Designer - + + + - + \ No newline at end of file diff --git a/src/Compilers/VisualBasic/Portable/project.json b/src/Compilers/VisualBasic/Portable/project.json deleted file mode 100644 index 0a20ca659d4..00000000000 --- a/src/Compilers/VisualBasic/Portable/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Threading.Tasks.Parallel": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj b/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj index 41ea7dd7c59..26b6b5e2331 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj +++ b/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj @@ -11,6 +11,7 @@ Roslyn.Compilers.VisualBasic.CommandLine.UnitTests false v4.6 + win7 UnitTest @@ -62,6 +63,15 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -119,10 +129,9 @@ My Settings.Designer.vb - - + \ No newline at end of file diff --git a/src/Compilers/VisualBasic/Test/CommandLine/project.json b/src/Compilers/VisualBasic/Test/CommandLine/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/Compilers/VisualBasic/Test/CommandLine/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj b/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj index 6e5e837dc58..b3b892af154 100644 --- a/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj +++ b/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj @@ -10,6 +10,7 @@ Library Roslyn.Compilers.VisualBasic.Emit.UnitTests v4.6 + win7 UnitTest @@ -53,6 +54,18 @@ + + $(MicrosoftDiaSymReaderVersion) + + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -239,9 +252,6 @@ - - - diff --git a/src/Compilers/VisualBasic/Test/Emit/project.json b/src/Compilers/VisualBasic/Test/Emit/project.json deleted file mode 100644 index 1397eb0f966..00000000000 --- a/src/Compilers/VisualBasic/Test/Emit/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "Microsoft.DiaSymReader": "1.1.0", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj b/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj index 4a44eebd9c1..3ba2d014bb6 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj +++ b/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj @@ -10,6 +10,7 @@ Library Roslyn.Compilers.VisualBasic.Semantic.UnitTests v4.6 + win7 UnitTest @@ -53,6 +54,15 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -210,9 +220,6 @@ - - - diff --git a/src/Compilers/VisualBasic/Test/Semantic/project.json b/src/Compilers/VisualBasic/Test/Semantic/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/Compilers/VisualBasic/Test/Semantic/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj b/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj index 580ffd368bd..1659ea54b14 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj +++ b/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj @@ -10,6 +10,7 @@ Library Roslyn.Compilers.VisualBasic.Symbol.UnitTests v4.6 + win7 UnitTest @@ -53,6 +54,15 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -152,11 +162,10 @@ - - + \ No newline at end of file diff --git a/src/Compilers/VisualBasic/Test/Symbol/project.json b/src/Compilers/VisualBasic/Test/Symbol/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/Compilers/VisualBasic/Test/Symbol/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj b/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj index f81bcac1c7e..cbfc5084f0e 100644 --- a/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj +++ b/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj @@ -10,6 +10,7 @@ Library Roslyn.Compilers.VisualBasic.Syntax.UnitTests v4.6 + win7 UnitTest @@ -60,6 +61,15 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -118,7 +128,6 @@ - @@ -140,4 +149,4 @@ - + \ No newline at end of file diff --git a/src/Compilers/VisualBasic/Test/Syntax/project.json b/src/Compilers/VisualBasic/Test/Syntax/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/Compilers/VisualBasic/Test/Syntax/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj b/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj index d991a33422d..da9e9289fc0 100644 --- a/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj +++ b/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj @@ -1,12 +1,11 @@  - + AnyCPU AnyCPU x64 - $(BaseNuGetRuntimeIdentifier)-$(RuntimeIdentifier) {8CE3A581-2969-4864-A803-013E9D977C3A} Exe Microsoft.CodeAnalysis.VisualBasic.CommandLine @@ -17,8 +16,9 @@ true True {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netcoreapp1.1 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 + portable-net452 true @@ -58,7 +58,57 @@ PreserveNewest - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Compilers/VisualBasic/VbcCore/project.json b/src/Compilers/VisualBasic/VbcCore/project.json deleted file mode 100644 index e98469c3153..00000000000 --- a/src/Compilers/VisualBasic/VbcCore/project.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.1.0", - "Microsoft.NETCore.TestHost": "1.1.0", - "System.AppContext": "4.3.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.Immutable": "1.3.1", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.FileVersionInfo": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.Diagnostics.StackTrace": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.IO.FileSystem.Watcher": "4.3.0", - "System.IO.Pipes": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Loader": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Runtime.Serialization.Json": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.CodePages": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Parallel": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XPath.XDocument": "4.3.0" - }, - "frameworks": { - "NETCoreApp1.0": { - "imports": "portable-net452" - } - }, - "runtimes": { - "win7-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.16.04-x64": { }, - "osx.10.12-x64": { } - } -} diff --git a/src/Compilers/VisualBasic/vbc/project.json b/src/Compilers/VisualBasic/vbc/project.json deleted file mode 100644 index f39a9046cb9..00000000000 --- a/src/Compilers/VisualBasic/vbc/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.DiaSymReader.Native": "1.5.0" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Compilers/VisualBasic/vbc/vbc.csproj b/src/Compilers/VisualBasic/vbc/vbc.csproj index 38cf14a6274..c1eb3e3f562 100644 --- a/src/Compilers/VisualBasic/vbc/vbc.csproj +++ b/src/Compilers/VisualBasic/vbc/vbc.csproj @@ -14,6 +14,7 @@ true Microsoft.CodeAnalysis.VisualBasic.CommandLine.Program v4.6 + win7 @@ -29,6 +30,9 @@ + + $(MicrosoftDiaSymReaderNativeVersion) + @@ -55,7 +59,6 @@ - PreserveNewest diff --git a/src/Deployment/Roslyn.csproj b/src/Deployment/Roslyn.csproj index 5e8ea35e9a3..d652368df9e 100644 --- a/src/Deployment/Roslyn.csproj +++ b/src/Deployment/Roslyn.csproj @@ -64,4 +64,4 @@ - + \ No newline at end of file diff --git a/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj b/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj index 516c7b22ee5..508f732f4d6 100644 --- a/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj +++ b/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj @@ -163,6 +163,12 @@ + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + @@ -172,10 +178,8 @@ - - \ No newline at end of file diff --git a/src/EditorFeatures/CSharp/project.json b/src/EditorFeatures/CSharp/project.json deleted file mode 100644 index 41c2585f1b0..00000000000 --- a/src/EditorFeatures/CSharp/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj index fb163f46e95..cc0cccb8142 100644 --- a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj +++ b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj @@ -5,6 +5,7 @@ v4.6 + win7 @@ -161,6 +162,42 @@ + + $(MicrosoftVisualStudioCompositionVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorInteropVersion) + + + $(BasicUndoVersion) + + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(MicrosoftVisualStudioLanguageCallHierarchyVersion) + + + $(MicrosoftVisualStudioLanguageNavigateToInterfacesVersion) + + + $(MicrosoftVisualStudioLanguageStandardClassificationVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + @@ -472,7 +509,6 @@ - PreserveNewest @@ -587,7 +623,6 @@ PreserveNewest - diff --git a/src/EditorFeatures/CSharpTest/project.json b/src/EditorFeatures/CSharpTest/project.json deleted file mode 100644 index 706fe3b9a3a..00000000000 --- a/src/EditorFeatures/CSharpTest/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Composition": "15.0.66-rc", - "Microsoft.VisualStudio.Platform.VSEditor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26201-alpha", - "BasicUndo": "0.9.3", - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.StandardClassification": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj b/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj index 6e717f8d238..95478228211 100644 --- a/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj +++ b/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj @@ -5,6 +5,7 @@ v4.6 + win7 @@ -288,9 +289,7 @@ - - diff --git a/src/EditorFeatures/CSharpTest2/project.json b/src/EditorFeatures/CSharpTest2/project.json deleted file mode 100644 index 774d452c57d..00000000000 --- a/src/EditorFeatures/CSharpTest2/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/EditorFeatures/Core/EditorFeatures.csproj b/src/EditorFeatures/Core/EditorFeatures.csproj index 73d114a50ab..18b9836a0c8 100644 --- a/src/EditorFeatures/Core/EditorFeatures.csproj +++ b/src/EditorFeatures/Core/EditorFeatures.csproj @@ -53,6 +53,54 @@ + + $(SystemCollectionsImmutableVersion) + + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(MicrosoftVisualStudioLanguageCallHierarchyVersion) + + + $(MicrosoftVisualStudioLanguageNavigateToInterfacesVersion) + + + $(MicrosoftVisualStudioLanguageStandardClassificationVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioImagingVersion) + + + $(MicrosoftVisualStudioImagingInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioImageCatalogVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + + + $(MicrosoftVisualStudioUtilitiesVersion) + + + $(MicrosoftVisualStudioValidationVersion) + + + $(MicrosoftVisualStudioThreadingVersion) + + + $(MicrosoftCodeAnalysisElfieVersion) + + + $(MicrosoftVisualStudioRemoteControlVersion) + @@ -795,7 +843,6 @@ - diff --git a/src/EditorFeatures/Core/project.json b/src/EditorFeatures/Core/project.json deleted file mode 100644 index efa53fae567..00000000000 --- a/src/EditorFeatures/Core/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "dependencies": { - "System.Collections.Immutable": "1.3.1", - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.StandardClassification": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Imaging": "15.0.26201-alpha", - "Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.VisualStudio.ImageCatalog": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha", - "Microsoft.VisualStudio.Utilities": "15.0.26201-alpha", - "Microsoft.VisualStudio.Validation": "15.0.26201-alpha", - "Microsoft.VisualStudio.Threading": "15.0.26201-alpha", - "Microsoft.CodeAnalysis.Elfie": "0.10.6-rc2", - "Microsoft.VisualStudio.RemoteControl": "14.0.249-master2E2DC10C" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/EditorFeatures/Next/EditorFeatures.Next.csproj b/src/EditorFeatures/Next/EditorFeatures.Next.csproj index d00129dba7a..9ff0ce18a0d 100644 --- a/src/EditorFeatures/Next/EditorFeatures.Next.csproj +++ b/src/EditorFeatures/Next/EditorFeatures.Next.csproj @@ -49,9 +49,62 @@ + + $(MicrosoftVisualStudioCoreUtilityVersion) + + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioImagingVersion) + + + $(MicrosoftVisualStudioImagingInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioShellInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioImageCatalogVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextDataVersion) + + + $(MicrosoftVisualStudioTextLogicVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + + + $(MicrosoftVisualStudioUtilitiesVersion) + + + $(MicrosoftVisualStudioLanguageNavigateToInterfacesVersion) + + + $(MicrosoftVisualStudioValidationVersion) + + + $(MicrosoftVisualStudioThreadingVersion) + + + $(SystemCollectionsImmutableVersion) + + + $(MicrosoftTplDataflowVersion) + + + $(VSExternalAPIsCodingConventionsVersion) + - @@ -70,6 +123,5 @@ - \ No newline at end of file diff --git a/src/EditorFeatures/Next/project.json b/src/EditorFeatures/Next/project.json deleted file mode 100644 index 2daf0e2dfcd..00000000000 --- a/src/EditorFeatures/Next/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.CoreUtility": "15.0.26201-alpha", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Imaging": "15.0.26201-alpha", - "Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.VisualStudio.ImageCatalog": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Data": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Logic": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha", - "Microsoft.VisualStudio.Utilities": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26201-alpha", - "Microsoft.VisualStudio.Validation": "15.0.26201-alpha", - "Microsoft.VisualStudio.Threading": "15.0.26201-alpha", - "System.Collections.Immutable": "1.3.1", - "Microsoft.Tpl.Dataflow": "4.5.24", - "VS.ExternalAPIs.CodingConventions": "1.0.60704.2" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/EditorFeatures/Test/EditorServicesTest.csproj b/src/EditorFeatures/Test/EditorServicesTest.csproj index e126b5a04ec..3e97cdf6e5b 100644 --- a/src/EditorFeatures/Test/EditorServicesTest.csproj +++ b/src/EditorFeatures/Test/EditorServicesTest.csproj @@ -11,6 +11,7 @@ Microsoft.CodeAnalysis.Editor.UnitTests Roslyn.Services.Editor.UnitTests v4.6 + win7 UnitTest @@ -158,6 +159,42 @@ + + $(BasicUndoVersion) + + + $(MicrosoftVisualStudioCompositionVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorInteropVersion) + + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(MicrosoftVisualStudioLanguageCallHierarchyVersion) + + + $(MicrosoftVisualStudioLanguageNavigateToInterfacesVersion) + + + $(MicrosoftVisualStudioLanguageStandardClassificationVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + @@ -245,7 +282,6 @@ - PreserveNewest Designer @@ -254,6 +290,5 @@ - \ No newline at end of file diff --git a/src/EditorFeatures/Test/project.json b/src/EditorFeatures/Test/project.json deleted file mode 100644 index 30980745aa3..00000000000 --- a/src/EditorFeatures/Test/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "BasicUndo": "0.9.3", - "Microsoft.VisualStudio.Composition": "15.0.66-rc", - "Microsoft.VisualStudio.Platform.VSEditor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26201-alpha", - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.StandardClassification": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/EditorFeatures/Test2/EditorServicesTest2.vbproj b/src/EditorFeatures/Test2/EditorServicesTest2.vbproj index 1c801cd5525..d0b690759a7 100644 --- a/src/EditorFeatures/Test2/EditorServicesTest2.vbproj +++ b/src/EditorFeatures/Test2/EditorServicesTest2.vbproj @@ -11,6 +11,7 @@ Roslyn.Services.Editor2.UnitTests Off v4.6 + win7 UnitTest @@ -167,6 +168,54 @@ + + $(MicrosoftTplDataflowVersion) + + + $(MicrosoftVisualStudioCompositionVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorInteropVersion) + + + $(BasicUndoVersion) + + + $(MicrosoftBuildRuntimeVersion) + + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(MicrosoftVisualStudioLanguageCallHierarchyVersion) + + + $(MicrosoftVisualStudioImagingVersion) + + + $(MicrosoftVisualStudioImagingInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioLanguageStandardClassificationVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + @@ -320,7 +369,6 @@ - PreserveNewest diff --git a/src/EditorFeatures/Test2/project.json b/src/EditorFeatures/Test2/project.json deleted file mode 100644 index 36018607970..00000000000 --- a/src/EditorFeatures/Test2/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "dependencies": { - "Microsoft.Tpl.Dataflow": "4.5.24", - "Microsoft.VisualStudio.Composition": "15.0.66-rc", - "Microsoft.VisualStudio.Platform.VSEditor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26201-alpha", - "BasicUndo": "0.9.3", - "Microsoft.Build.Runtime": "15.1.0-preview-000458-02", - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26201-alpha", - "Microsoft.VisualStudio.Imaging": "15.0.26201-alpha", - "Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.VisualStudio.Language.StandardClassification": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj b/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj index 3026d33cb55..e72245fa212 100644 --- a/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj +++ b/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj @@ -114,6 +114,60 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + + + $(MoqVersion) + + + $(NewtonsoftJsonVersion) + + + $(NerdbankFullDuplexStreamVersion) + + + $(BasicUndoVersion) + + + $(MicrosoftServiceHubClientVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorInteropVersion) + + + $(MicrosoftVisualStudioCompositionVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(MicrosoftVisualStudioLanguageStandardClassificationVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioLanguageCallHierarchyVersion) + + + $(MicrosoftVisualStudioLanguageNavigateToInterfacesVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + @@ -271,9 +325,5 @@ - - - - \ No newline at end of file diff --git a/src/EditorFeatures/TestUtilities/project.json b/src/EditorFeatures/TestUtilities/project.json deleted file mode 100644 index cb41a232eff..00000000000 --- a/src/EditorFeatures/TestUtilities/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194", - "Moq": "4.2.1402.2112", - "Newtonsoft.Json": "8.0.3", - "Nerdbank.FullDuplexStream": "1.0.1", - "BasicUndo": "0.9.3", - "Microsoft.ServiceHub.Client": "1.0.177-rc-g56d40a8a02", - "Microsoft.VisualStudio.Platform.VSEditor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26201-alpha", - "Microsoft.VisualStudio.Composition": "15.0.66-rc", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.StandardClassification": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj b/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj index 5825b4edbef..8be12b57b55 100644 --- a/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj +++ b/src/EditorFeatures/TestUtilities2/ServicesTestUtilities2.vbproj @@ -11,6 +11,7 @@ Roslyn.Services.Test.Utilities2 Off v4.6 + win7 @@ -110,6 +111,42 @@ + + $(MicrosoftVisualStudioCompositionVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorInteropVersion) + + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(MicrosoftVisualStudioLanguageCallHierarchyVersion) + + + $(MicrosoftVisualStudioImagingVersion) + + + $(MicrosoftVisualStudioImagingInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + @@ -139,10 +176,9 @@ - - + \ No newline at end of file diff --git a/src/EditorFeatures/TestUtilities2/project.json b/src/EditorFeatures/TestUtilities2/project.json deleted file mode 100644 index a0f407427bb..00000000000 --- a/src/EditorFeatures/TestUtilities2/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Composition": "15.0.66-rc", - "Microsoft.VisualStudio.Platform.VSEditor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26201-alpha", - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26201-alpha", - "Microsoft.VisualStudio.Imaging": "15.0.26201-alpha", - "Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/EditorFeatures/Text/TextEditorFeatures.csproj b/src/EditorFeatures/Text/TextEditorFeatures.csproj index 0bf0ffdedb9..ec6b8affc80 100644 --- a/src/EditorFeatures/Text/TextEditorFeatures.csproj +++ b/src/EditorFeatures/Text/TextEditorFeatures.csproj @@ -27,6 +27,27 @@ + + $(MicrosoftVisualStudioTextDataVersion) + + + $(MicrosoftVisualStudioTextLogicVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(MicrosoftVisualStudioCoreUtilityVersion) + + + $(MicrosoftVisualStudioUtilitiesVersion) + @@ -80,7 +101,6 @@ - diff --git a/src/EditorFeatures/Text/project.json b/src/EditorFeatures/Text/project.json deleted file mode 100644 index d3cb93ca901..00000000000 --- a/src/EditorFeatures/Text/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Text.Data": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Logic": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "Microsoft.VisualStudio.CoreUtility": "15.0.26201-alpha", - "Microsoft.VisualStudio.Utilities": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj b/src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj index e80f4930b60..531d79a604a 100644 --- a/src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj +++ b/src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj @@ -177,6 +177,15 @@ + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + @@ -209,9 +218,6 @@ - - - diff --git a/src/EditorFeatures/VisualBasic/project.json b/src/EditorFeatures/VisualBasic/project.json deleted file mode 100644 index 0c5cf700314..00000000000 --- a/src/EditorFeatures/VisualBasic/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj b/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj index 9192251c5d4..800d051d8af 100644 --- a/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj +++ b/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj @@ -12,6 +12,7 @@ Off Default v4.6 + win7 UnitTest @@ -152,6 +153,42 @@ + + $(MicrosoftVisualStudioCompositionVersion) + + + $(BasicUndoVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorInteropVersion) + + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(MicrosoftVisualStudioLanguageCallHierarchyVersion) + + + $(MicrosoftVisualStudioLanguageNavigateToInterfacesVersion) + + + $(MicrosoftVisualStudioLanguageStandardClassificationVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + @@ -578,7 +615,6 @@ - PreserveNewest diff --git a/src/EditorFeatures/VisualBasicTest/project.json b/src/EditorFeatures/VisualBasicTest/project.json deleted file mode 100644 index 4e86fa04ac6..00000000000 --- a/src/EditorFeatures/VisualBasicTest/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Composition": "15.0.66-rc", - "BasicUndo": "0.9.3", - "Microsoft.VisualStudio.Platform.VSEditor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26201-alpha", - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.StandardClassification": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpExpressionCompiler.csproj b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpExpressionCompiler.csproj index 7f780badbbe..65386c234e5 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpExpressionCompiler.csproj +++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpExpressionCompiler.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,8 @@ Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler true - .NETPortable - v5.0 + netstandard1.3 + portable-net46 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -80,7 +80,7 @@ - + diff --git a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/project.json b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/project.json deleted file mode 100644 index 6aa4190a411..00000000000 --- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma" - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net46" - } - } -} diff --git a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj index d4762c9acee..064adb82253 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj +++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -9,9 +9,8 @@ Library Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider - v4.5 - Profile7 - .NETPortable + netstandard1.3 + portable-net45+win8 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} false @@ -41,9 +40,10 @@ - + + - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/project.json b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/project.json deleted file mode 100644 index 9563e6f779a..00000000000 --- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma", - "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-gamma" - }, - "frameworks": { - ".NETPortable,Version=v4.5,Profile=Profile7": {} - } -} diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj index 29e290bd94c..e0a13de03a2 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj @@ -11,6 +11,7 @@ Microsoft.CodeAnalysis.CSharp.UnitTests Roslyn.ExpressionEvaluator.CSharp.ExpressionCompiler.UnitTests v4.6 + win7 UnitTest true @@ -70,6 +71,21 @@ + + $(MicrosoftVisualStudioDebuggerEngineVersion) + + + $(MicrosoftDiaSymReaderVersion) + + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -95,9 +111,6 @@ - - - PreserveNewest @@ -107,4 +120,4 @@ - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json deleted file mode 100644 index 471a2f76a5e..00000000000 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma", - "Microsoft.DiaSymReader": "1.1.0", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj index b59f585cc7f..25a836918cd 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj @@ -11,6 +11,7 @@ Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator Roslyn.ExpressionEvaluator.CSharp.ResultProvider.UnitTests v4.6 + win7 UnitTest true @@ -62,6 +63,15 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -91,12 +101,9 @@ - - - - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj index 42c0a5829fb..ff21a442768 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,8 @@ Microsoft.CodeAnalysis.ExpressionEvaluator Microsoft.CodeAnalysis.ExpressionEvaluator.ExpressionCompiler true - .NETPortable - v5.0 + netstandard1.3 + portable-net46 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(DefineConstants);EXPRESSIONCOMPILER @@ -78,7 +78,8 @@ - + + \ No newline at end of file diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json deleted file mode 100644 index 106d3eba336..00000000000 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma", - "Microsoft.DiaSymReader": "1.1.0" - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net46" - } - } -} diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolver.csproj b/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolver.csproj index 834c7af81df..efb70e6d488 100644 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolver.csproj +++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolver.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,8 @@ Microsoft.CodeAnalysis.ExpressionEvaluator Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver true - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} false @@ -67,8 +67,14 @@ - + + + + + $(MicrosoftVisualStudioDebuggerMetadataVersion) + compile + - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/Core/Source/FunctionResolver/project.json b/src/ExpressionEvaluator/Core/Source/FunctionResolver/project.json deleted file mode 100644 index b044a8b00a1..00000000000 --- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "System.Collections.Immutable": "1.3.1", - "System.Reflection.Metadata": "1.4.2", - "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma", - "Microsoft.VisualStudio.Debugger.Metadata": { - "version": "15.0.26201-gamma", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net45+win8" - } - } -} diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj index de79c60b8a9..afb9d5d27a8 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -9,9 +9,8 @@ Library Microsoft.CodeAnalysis.ExpressionEvaluator Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider - v4.5 - Profile7 - .NETPortable + netstandard1.3 + portable-net45+win8 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} false @@ -85,13 +84,14 @@ Resources.Designer.cs - - - + + + + - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/project.json b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/project.json deleted file mode 100644 index 9563e6f779a..00000000000 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma", - "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-gamma" - }, - "frameworks": { - ".NETPortable,Version=v4.5,Profile=Profile7": {} - } -} diff --git a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj index 6a42c878818..a2d2c7a46c9 100644 --- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj +++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj @@ -15,6 +15,21 @@ + + $(MicrosoftVisualStudioDebuggerEngineVersion) + + + $(MicrosoftDiaSymReaderVersion) + + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -62,7 +77,6 @@ - @@ -78,6 +92,5 @@ Resources.Designer.cs - - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json deleted file mode 100644 index 3171587e360..00000000000 --- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma", - "Microsoft.DiaSymReader": "1.1.0", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": {} - } -} diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTest.csproj b/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTest.csproj index c165ca65969..b5ce3283082 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTest.csproj +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/FunctionResolverTest.csproj @@ -12,6 +12,7 @@ Roslyn.ExpressionEvaluator.FunctionResolver.UnitTests true v4.6 + win7 UnitTest @@ -79,10 +80,21 @@ - + - + + $(MicrosoftVisualStudioDebuggerEngineVersion) + + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + \ No newline at end of file diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/project.json b/src/ExpressionEvaluator/Core/Test/FunctionResolver/project.json deleted file mode 100644 index 21751ed43af..00000000000 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj index c3e01e8fdcf..b24ef0f9cd2 100644 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj +++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj @@ -28,6 +28,21 @@ + + $(SystemCollectionsImmutableVersion) + + + $(MicrosoftVisualStudioDebuggerMetadataVersion) + + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -159,9 +174,6 @@ Microsoft.CodeAnalysis.ExpressionEvaluator - - - - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json b/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json deleted file mode 100644 index 56cdf21878f..00000000000 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Collections.Immutable": "1.3.1", - "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-gamma", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": {} - } -} diff --git a/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj b/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj index 8b22b3aedff..e4d4429cf28 100644 --- a/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj +++ b/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj @@ -23,6 +23,7 @@ $(VisualStudioVersion) ExpressionEvaluatorPackage.vsix v4.6 + win7 Vsix true CommonExtensions @@ -117,7 +118,6 @@ - Designer diff --git a/src/ExpressionEvaluator/Package/project.json b/src/ExpressionEvaluator/Package/project.json deleted file mode 100644 index 9f25b41ded4..00000000000 --- a/src/ExpressionEvaluator/Package/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/BasicExpressionCompiler.vbproj b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/BasicExpressionCompiler.vbproj index e8ee62cb967..8e9dda7575d 100644 --- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/BasicExpressionCompiler.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/BasicExpressionCompiler.vbproj @@ -1,15 +1,15 @@  - + AnyCPU AnyCPU {73242A2D-6300-499D-8C15-FADF7ECB185C} Library Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler - .NETPortable - v5.0 + netstandard1.3 + portable-net46 {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} @@ -88,9 +88,6 @@ - - - Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator @@ -99,6 +96,13 @@ Designer + + + + $(MicrosoftVisualStudioDebuggerMetadataVersion) + compile + + \ No newline at end of file diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/project.json b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/project.json deleted file mode 100644 index b69b1703ac1..00000000000 --- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma", - "Microsoft.VisualStudio.Debugger.Metadata": { - "version": "15.0.26201-gamma", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net46" - } - } -} diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj index 307ace93867..8e7894329d5 100644 --- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj @@ -1,16 +1,15 @@  - + AnyCPU AnyCPU {76242A2D-2600-49DD-8C15-FEA07ECB1843} Library Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider - v4.5 - Profile7 - .NETPortable + netstandard1.3 + portable-net45+win8 {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} false @@ -43,9 +42,10 @@ - + + - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/project.json b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/project.json deleted file mode 100644 index 9563e6f779a..00000000000 --- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma", - "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-gamma" - }, - "frameworks": { - ".NETPortable,Version=v4.5,Profile=Profile7": {} - } -} diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj index 703b923fb14..ab92292b374 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj @@ -10,6 +10,7 @@ Library Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests v4.6 + win7 UnitTest @@ -66,6 +67,21 @@ + + $(MicrosoftVisualStudioDebuggerEngineVersion) + + + $(MicrosoftDiaSymReaderVersion) + + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -89,9 +105,6 @@ - - - diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json deleted file mode 100644 index 471a2f76a5e..00000000000 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma", - "Microsoft.DiaSymReader": "1.1.0", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj index 90dd6e645f4..7e3fb7a3176 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj @@ -10,6 +10,7 @@ Library Roslyn.ExpressionEvaluator.VisualBasic.ResultProvider.UnitTests v4.6 + win7 Default UnitTest @@ -60,6 +61,15 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -80,12 +90,9 @@ - - - - + \ No newline at end of file diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.json b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Features/CSharp/Portable/CSharpFeatures.csproj b/src/Features/CSharp/Portable/CSharpFeatures.csproj index 653a38493d4..2f8b1713231 100644 --- a/src/Features/CSharp/Portable/CSharpFeatures.csproj +++ b/src/Features/CSharp/Portable/CSharpFeatures.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,8 @@ Microsoft.CodeAnalysis.CSharp Microsoft.CodeAnalysis.CSharp.Features .dll - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -481,14 +481,15 @@ - - + + + \ No newline at end of file diff --git a/src/Features/CSharp/Portable/project.json b/src/Features/CSharp/Portable/project.json deleted file mode 100644 index e75a1bda99d..00000000000 --- a/src/Features/CSharp/Portable/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.ValueTuple": "4.3.0" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/Features/Core/Portable/Features.csproj b/src/Features/Core/Portable/Features.csproj index 1eb8e4569d3..92bc7f231b9 100644 --- a/src/Features/Core/Portable/Features.csproj +++ b/src/Features/Core/Portable/Features.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -9,8 +9,8 @@ Library Microsoft.CodeAnalysis Microsoft.CodeAnalysis.Features - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -770,13 +770,14 @@ - - + + + \ No newline at end of file diff --git a/src/Features/Core/Portable/project.json b/src/Features/Core/Portable/project.json deleted file mode 100644 index 5d119fddea3..00000000000 --- a/src/Features/Core/Portable/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.Reflection": "4.3.0" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/Features/VisualBasic/Portable/BasicFeatures.vbproj b/src/Features/VisualBasic/Portable/BasicFeatures.vbproj index 4f643a168c0..4f887e2c7ba 100644 --- a/src/Features/VisualBasic/Portable/BasicFeatures.vbproj +++ b/src/Features/VisualBasic/Portable/BasicFeatures.vbproj @@ -1,15 +1,15 @@  - + AnyCPU AnyCPU {A1BCD0CE-6C2F-4F8C-9A48-D9D93928E26D} Library Microsoft.CodeAnalysis.VisualBasic.Features - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} @@ -455,9 +455,6 @@ - - - diff --git a/src/Features/VisualBasic/Portable/project.json b/src/Features/VisualBasic/Portable/project.json deleted file mode 100644 index a5bfa3b918f..00000000000 --- a/src/Features/VisualBasic/Portable/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/Interactive/CsiCore/CsiCore.csproj b/src/Interactive/CsiCore/CsiCore.csproj index d5c20160126..404bc41443a 100644 --- a/src/Interactive/CsiCore/CsiCore.csproj +++ b/src/Interactive/CsiCore/CsiCore.csproj @@ -1,13 +1,10 @@  - + x64 x64 - - x64 - $(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier) {D1B051A4-F2A1-4E97-9747-C41D13E475FD} Exe CSharpInteractive @@ -15,8 +12,9 @@ false True {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netcoreapp1.1 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 + portable-net452 true @@ -43,10 +41,62 @@ PreserveNewest - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/src/Interactive/CsiCore/project.json b/src/Interactive/CsiCore/project.json deleted file mode 100644 index cf115350b9e..00000000000 --- a/src/Interactive/CsiCore/project.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "dependencies": { - "Microsoft.CSharp": "4.3.0", - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.1.0", - "Microsoft.NETCore.TestHost": "1.1.0", - "System.AppContext": "4.3.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.Immutable": "1.3.1", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.FileVersionInfo": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.Diagnostics.StackTrace": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.IO.FileSystem.Watcher": "4.3.0", - "System.IO.Pipes": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Loader": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Runtime.Serialization.Json": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.CodePages": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Parallel": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.ValueTuple": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XPath.XDocument": "4.3.0" - }, - "frameworks": { - // We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458 - "netstandard1.6": { - "imports": "portable-net452" - }, - "NETCoreApp1.0": { - "imports": "portable-net452" - } - }, - "runtimes": { - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "osx.10.12-x64": {} - } -} diff --git a/src/Interactive/EditorFeatures/CSharp/CSharpInteractiveEditorFeatures.csproj b/src/Interactive/EditorFeatures/CSharp/CSharpInteractiveEditorFeatures.csproj index 0fbbe62900e..4ff1e84c567 100644 --- a/src/Interactive/EditorFeatures/CSharp/CSharpInteractiveEditorFeatures.csproj +++ b/src/Interactive/EditorFeatures/CSharp/CSharpInteractiveEditorFeatures.csproj @@ -100,6 +100,15 @@ + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + @@ -109,7 +118,6 @@ - diff --git a/src/Interactive/EditorFeatures/CSharp/project.json b/src/Interactive/EditorFeatures/CSharp/project.json deleted file mode 100644 index 9fbece95d62..00000000000 --- a/src/Interactive/EditorFeatures/CSharp/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/Interactive/EditorFeatures/Core/InteractiveEditorFeatures.csproj b/src/Interactive/EditorFeatures/Core/InteractiveEditorFeatures.csproj index c30a848be9d..943854a9aab 100644 --- a/src/Interactive/EditorFeatures/Core/InteractiveEditorFeatures.csproj +++ b/src/Interactive/EditorFeatures/Core/InteractiveEditorFeatures.csproj @@ -61,6 +61,18 @@ + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioLanguageStandardClassificationVersion) + @@ -121,7 +133,6 @@ - diff --git a/src/Interactive/EditorFeatures/Core/project.json b/src/Interactive/EditorFeatures/Core/project.json deleted file mode 100644 index 0a11b6dcccd..00000000000 --- a/src/Interactive/EditorFeatures/Core/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.StandardClassification": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/Interactive/EditorFeatures/VisualBasic/BasicInteractiveEditorFeatures.vbproj b/src/Interactive/EditorFeatures/VisualBasic/BasicInteractiveEditorFeatures.vbproj index 9197e8faa44..d5df24ac735 100644 --- a/src/Interactive/EditorFeatures/VisualBasic/BasicInteractiveEditorFeatures.vbproj +++ b/src/Interactive/EditorFeatures/VisualBasic/BasicInteractiveEditorFeatures.vbproj @@ -83,6 +83,15 @@ + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + @@ -116,7 +125,6 @@ - diff --git a/src/Interactive/EditorFeatures/VisualBasic/project.json b/src/Interactive/EditorFeatures/VisualBasic/project.json deleted file mode 100644 index 99482b3b514..00000000000 --- a/src/Interactive/EditorFeatures/VisualBasic/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/Interactive/Features/InteractiveFeatures.csproj b/src/Interactive/Features/InteractiveFeatures.csproj index fd114798d7c..8778665680a 100644 --- a/src/Interactive/Features/InteractiveFeatures.csproj +++ b/src/Interactive/Features/InteractiveFeatures.csproj @@ -81,7 +81,6 @@ - diff --git a/src/Interactive/Features/project.json b/src/Interactive/Features/project.json deleted file mode 100644 index e159af8f867..00000000000 --- a/src/Interactive/Features/project.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "net46": { } - } -} \ No newline at end of file diff --git a/src/Interactive/Host/InteractiveHost.csproj b/src/Interactive/Host/InteractiveHost.csproj index 0e9631309c6..ea4a0dc7641 100644 --- a/src/Interactive/Host/InteractiveHost.csproj +++ b/src/Interactive/Host/InteractiveHost.csproj @@ -10,6 +10,7 @@ InteractiveHost InteractiveHost v4.6 + win7 true @@ -43,8 +44,5 @@ - - - \ No newline at end of file diff --git a/src/Interactive/Host/project.json b/src/Interactive/Host/project.json deleted file mode 100644 index 9f25b41ded4..00000000000 --- a/src/Interactive/Host/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/Interactive/HostTest/InteractiveHostTest.csproj b/src/Interactive/HostTest/InteractiveHostTest.csproj index 05e9943b2d6..b3f7f90eba0 100644 --- a/src/Interactive/HostTest/InteractiveHostTest.csproj +++ b/src/Interactive/HostTest/InteractiveHostTest.csproj @@ -11,6 +11,7 @@ Roslyn.InteractiveHost.UnitTests Roslyn.InteractiveHost.UnitTests v4.6 + win7-x86 UnitTest @@ -155,6 +156,9 @@ + + $(MicrosoftServiceHubClientVersion) + @@ -162,11 +166,8 @@ - - - - + \ No newline at end of file diff --git a/src/Interactive/HostTest/project.json b/src/Interactive/HostTest/project.json deleted file mode 100644 index 8bca406a1af..00000000000 --- a/src/Interactive/HostTest/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.ServiceHub.Client": "1.0.177-rc-g56d40a8a02" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7-x86": { } - } -} diff --git a/src/Interactive/VbiCore/VbiCore.vbproj b/src/Interactive/VbiCore/VbiCore.vbproj index a9974a521bf..91752b079a5 100644 --- a/src/Interactive/VbiCore/VbiCore.vbproj +++ b/src/Interactive/VbiCore/VbiCore.vbproj @@ -1,13 +1,10 @@  - + x64 x64 - - x64 - $(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier) {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD} Exe Sub Main @@ -15,8 +12,9 @@ false True {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} - .NETPortable - v5.0 + netcoreapp1.1 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 + portable-net452 true @@ -43,10 +41,62 @@ PreserveNewest - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/src/Interactive/VbiCore/project.json b/src/Interactive/VbiCore/project.json deleted file mode 100644 index 440d16fadaa..00000000000 --- a/src/Interactive/VbiCore/project.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualBasic": "10.1.0", - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.1.0", - "Microsoft.NETCore.TestHost": "1.1.0", - "System.AppContext": "4.3.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Collections.Immutable": "1.3.1", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.FileVersionInfo": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.Diagnostics.StackTrace": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.IO.FileSystem.Watcher": "4.3.0", - "System.IO.Pipes": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Loader": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0", - "System.Runtime.Serialization.Json": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.CodePages": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Parallel": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.ValueTuple": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XPath.XDocument": "4.3.0" - }, - "frameworks": { - // We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458 - "netstandard1.6": { - "imports": "portable-net452" - }, - "NETCoreApp1.0": { - "imports": "portable-net452" - } - }, - "runtimes": { - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "osx.10.12-x64": {} - } -} diff --git a/src/Interactive/csi/csi.csproj b/src/Interactive/csi/csi.csproj index ed6b8a2b494..08e0f6f8fee 100644 --- a/src/Interactive/csi/csi.csproj +++ b/src/Interactive/csi/csi.csproj @@ -12,6 +12,7 @@ csi false v4.6 + win7 @@ -38,7 +39,6 @@ PreserveNewest - @@ -48,5 +48,16 @@ + + + $(SystemValueTupleVersion) + + + $(SystemDynamicRuntimeVersion) + + + $(MicrosoftCSharpVersion) + + \ No newline at end of file diff --git a/src/Interactive/csi/project.json b/src/Interactive/csi/project.json deleted file mode 100644 index bda2b29e5fa..00000000000 --- a/src/Interactive/csi/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.ValueTuple": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "Microsoft.CSharp": "4.3.0" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} diff --git a/src/Interactive/vbi/project.json b/src/Interactive/vbi/project.json deleted file mode 100644 index 1154c175b98..00000000000 --- a/src/Interactive/vbi/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "System.ValueTuple": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "Microsoft.VisualBasic": "10.1.0" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} diff --git a/src/Interactive/vbi/vbi.vbproj b/src/Interactive/vbi/vbi.vbproj index 96953215f84..90058851086 100644 --- a/src/Interactive/vbi/vbi.vbproj +++ b/src/Interactive/vbi/vbi.vbproj @@ -12,6 +12,7 @@ vbi false v4.6 + win7 @@ -35,7 +36,6 @@ - PreserveNewest @@ -48,5 +48,16 @@ + + + $(SystemValueTupleVersion) + + + $(SystemDynamicRuntimeVersion) + + + $(MicrosoftVisualBasicVersion) + + \ No newline at end of file diff --git a/src/Samples/CSharp/APISampleUnitTests/APISampleUnitTestsCS.csproj b/src/Samples/CSharp/APISampleUnitTests/APISampleUnitTestsCS.csproj index f2157e0985f..dfd2fa4b7d5 100644 --- a/src/Samples/CSharp/APISampleUnitTests/APISampleUnitTestsCS.csproj +++ b/src/Samples/CSharp/APISampleUnitTests/APISampleUnitTestsCS.csproj @@ -4,6 +4,7 @@ v4.6 + win7 UnitTest @@ -44,6 +45,15 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -53,8 +63,5 @@ - - - \ No newline at end of file diff --git a/src/Samples/CSharp/APISampleUnitTests/project.json b/src/Samples/CSharp/APISampleUnitTests/project.json deleted file mode 100644 index beae3fcce36..00000000000 --- a/src/Samples/CSharp/APISampleUnitTests/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/CSharpAnalyzers.Test.csproj b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/CSharpAnalyzers.Test.csproj index 6aaa7e322f8..ee9b5f396ee 100644 --- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/CSharpAnalyzers.Test.csproj +++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/CSharpAnalyzers.Test.csproj @@ -30,11 +30,6 @@ - - - Designer - - {409C5A1C-D4DE-43C4-86E1-F598C60B794B} @@ -64,5 +59,10 @@ + + + $(MicrosoftVisualStudioQualityToolsUnitTestFrameworkVersion) + + - + \ No newline at end of file diff --git a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json deleted file mode 100644 index 41940f99df4..00000000000 --- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.QualityTools.UnitTestFramework": "10.0.0.0-alpha" - }, - "frameworks": { - "net46": {} - } -} diff --git a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Vsix/CSharpAnalyzers.Vsix.csproj b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Vsix/CSharpAnalyzers.Vsix.csproj index a32a62864e0..547887aee33 100644 --- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Vsix/CSharpAnalyzers.Vsix.csproj +++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Vsix/CSharpAnalyzers.Vsix.csproj @@ -43,4 +43,4 @@ - + \ No newline at end of file diff --git a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/CSharpAnalyzers.csproj b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/CSharpAnalyzers.csproj index 029611ca2a6..1d9f33bff56 100644 --- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/CSharpAnalyzers.csproj +++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/CSharpAnalyzers.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -11,8 +11,8 @@ CSharpAnalyzers True {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet @@ -67,7 +67,6 @@ Designer PreserveNewest - PreserveNewest @@ -79,6 +78,9 @@ + + + diff --git a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json deleted file mode 100644 index 7c5e8a4a39d..00000000000 --- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "Microsoft.Composition": "1.0.27" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/Samples/CSharp/ConsoleClassifier/ConsoleClassifierCS.csproj b/src/Samples/CSharp/ConsoleClassifier/ConsoleClassifierCS.csproj index 441acfee341..eb02fd6a9de 100644 --- a/src/Samples/CSharp/ConsoleClassifier/ConsoleClassifierCS.csproj +++ b/src/Samples/CSharp/ConsoleClassifier/ConsoleClassifierCS.csproj @@ -13,6 +13,7 @@ Exe ConsoleClassifier v4.6 + win7 true CSharp\ConsoleClassifier @@ -51,13 +52,13 @@ + + $(MicrosoftCompositionVersion) + - - - \ No newline at end of file diff --git a/src/Samples/CSharp/ConsoleClassifier/project.json b/src/Samples/CSharp/ConsoleClassifier/project.json deleted file mode 100644 index 0aa25063f23..00000000000 --- a/src/Samples/CSharp/ConsoleClassifier/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.Composition": "1.0.27" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} diff --git a/src/Samples/CSharp/ConvertToAutoProperty/ConvertToAutoPropertyCS.csproj b/src/Samples/CSharp/ConvertToAutoProperty/ConvertToAutoPropertyCS.csproj index f1a0d40ecf0..39ba125aa2c 100644 --- a/src/Samples/CSharp/ConvertToAutoProperty/ConvertToAutoPropertyCS.csproj +++ b/src/Samples/CSharp/ConvertToAutoProperty/ConvertToAutoPropertyCS.csproj @@ -34,6 +34,7 @@ ConvertToAutoPropertyCS ConvertToAutoPropertyCS v4.6 + win7 true false RoslynDev @@ -65,6 +66,9 @@ + + $(MicrosoftCompositionVersion) + @@ -72,7 +76,6 @@ - Designer diff --git a/src/Samples/CSharp/ConvertToAutoProperty/project.json b/src/Samples/CSharp/ConvertToAutoProperty/project.json deleted file mode 100644 index 0aa25063f23..00000000000 --- a/src/Samples/CSharp/ConvertToAutoProperty/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.Composition": "1.0.27" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} diff --git a/src/Samples/CSharp/ConvertToConditional/Impl/ConvertToConditionalCS.csproj b/src/Samples/CSharp/ConvertToConditional/Impl/ConvertToConditionalCS.csproj index bcd8d771ff5..867abfd029c 100644 --- a/src/Samples/CSharp/ConvertToConditional/Impl/ConvertToConditionalCS.csproj +++ b/src/Samples/CSharp/ConvertToConditional/Impl/ConvertToConditionalCS.csproj @@ -37,6 +37,7 @@ ConvertToConditionalCS ConvertToConditionalCS v4.6 + win7 true false RoslynDev @@ -66,6 +67,9 @@ + + $(MicrosoftCompositionVersion) + @@ -75,7 +79,6 @@ - Designer diff --git a/src/Samples/CSharp/ConvertToConditional/Impl/project.json b/src/Samples/CSharp/ConvertToConditional/Impl/project.json deleted file mode 100644 index 9a2d5d2a471..00000000000 --- a/src/Samples/CSharp/ConvertToConditional/Impl/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.Composition": "1.0.27" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} diff --git a/src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj b/src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj index 4c95b5d9595..e10fe785d2e 100644 --- a/src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj +++ b/src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj @@ -12,6 +12,7 @@ ConvertToConditionalCS.UnitTests ConvertToConditionalCS.UnitTests v4.6 + win7 UnitTest @@ -66,15 +67,20 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + - - - - diff --git a/src/Samples/CSharp/ConvertToConditional/Test/project.json b/src/Samples/CSharp/ConvertToConditional/Test/project.json deleted file mode 100644 index beae3fcce36..00000000000 --- a/src/Samples/CSharp/ConvertToConditional/Test/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/Samples/CSharp/CopyPasteWithUsing/CopyPasteWithUsing.csproj b/src/Samples/CSharp/CopyPasteWithUsing/CopyPasteWithUsing.csproj index 9855b693676..fab5d8fa4fc 100644 --- a/src/Samples/CSharp/CopyPasteWithUsing/CopyPasteWithUsing.csproj +++ b/src/Samples/CSharp/CopyPasteWithUsing/CopyPasteWithUsing.csproj @@ -41,6 +41,7 @@ Roslyn.Samples.CodeAction.CopyPasteWithUsing Roslyn.Samples.CodeAction.CopyPasteWithUsing v4.6 + win7 true false RoslynDev @@ -62,7 +63,6 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - Designer @@ -72,6 +72,18 @@ + + $(MicrosoftCompositionVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioShellInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioEditorVersion) + diff --git a/src/Samples/CSharp/CopyPasteWithUsing/project.json b/src/Samples/CSharp/CopyPasteWithUsing/project.json deleted file mode 100644 index 30164f84162..00000000000 --- a/src/Samples/CSharp/CopyPasteWithUsing/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "Microsoft.Composition": "1.0.27", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/Samples/CSharp/FormatSolution/FormatSolutionCS.csproj b/src/Samples/CSharp/FormatSolution/FormatSolutionCS.csproj index 327a2363ebc..8bdabb777b4 100644 --- a/src/Samples/CSharp/FormatSolution/FormatSolutionCS.csproj +++ b/src/Samples/CSharp/FormatSolution/FormatSolutionCS.csproj @@ -11,6 +11,7 @@ FormatSolution FormatSolution v4.6 + win7 CSharp\FormatSolution true @@ -44,13 +45,15 @@ Microsoft.CodeAnalysis.VisualBasic.Workspaces + + $(MicrosoftCompositionVersion) + - PreserveNewest @@ -67,7 +70,6 @@ PreserveNewest - - + 11.0 AnyCPU @@ -10,8 +10,8 @@ {9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A} Library BasicAnalyzers - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet false Off $(NoWarn);41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 @@ -86,7 +86,6 @@ Designer PreserveNewest - PreserveNewest @@ -100,7 +99,6 @@ - diff --git a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json deleted file mode 100644 index d9ebcfc6514..00000000000 --- a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} \ No newline at end of file diff --git a/src/Samples/VisualBasic/ConsoleClassifier/ConsoleClassifierVB.vbproj b/src/Samples/VisualBasic/ConsoleClassifier/ConsoleClassifierVB.vbproj index 8cbafb06bb7..67d0e4a1f90 100644 --- a/src/Samples/VisualBasic/ConsoleClassifier/ConsoleClassifierVB.vbproj +++ b/src/Samples/VisualBasic/ConsoleClassifier/ConsoleClassifierVB.vbproj @@ -14,6 +14,7 @@ ConsoleClassifier Console v4.6 + win7 VisualBasic\ConsoleClassifier true Off @@ -66,9 +67,6 @@ - - - - + AnyCPU AnyCPU @@ -9,10 +9,8 @@ Library Microsoft.CodeAnalysis.CSharp.Scripting Microsoft.CodeAnalysis.CSharp.Scripting - v5.0 - - - .NETPortable + netstandard1.3 + portable-net452 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -60,9 +58,6 @@ - - - @@ -74,5 +69,9 @@ Designer + + + + \ No newline at end of file diff --git a/src/Scripting/CSharp/project.json b/src/Scripting/CSharp/project.json deleted file mode 100644 index 9bd1aa032eb..00000000000 --- a/src/Scripting/CSharp/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Microsoft.CSharp": "4.3.0", - "System.Dynamic.Runtime": "4.3.0" - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net452" - } - } -} diff --git a/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj b/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj index 3d6ece7424c..41fef097654 100644 --- a/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj +++ b/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj @@ -13,6 +13,7 @@ Microsoft.CodeAnalysis.CSharp.Scripting.Desktop.UnitTests true v4.6 + win7 UnitTest @@ -22,6 +23,9 @@ + + $(SystemDiagnosticsProcessVersion) + @@ -81,9 +85,6 @@ PdbUtilities - - - diff --git a/src/Scripting/CSharpTest.Desktop/project.json b/src/Scripting/CSharpTest.Desktop/project.json deleted file mode 100644 index 12cc9db210e..00000000000 --- a/src/Scripting/CSharpTest.Desktop/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "System.Diagnostics.Process": "4.3.0" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/Scripting/CSharpTest/CSharpScriptingTest.csproj b/src/Scripting/CSharpTest/CSharpScriptingTest.csproj index 657a4b7ed78..8ca43a6381a 100644 --- a/src/Scripting/CSharpTest/CSharpScriptingTest.csproj +++ b/src/Scripting/CSharpTest/CSharpScriptingTest.csproj @@ -1,7 +1,7 @@  - + true AnyCPU @@ -12,9 +12,8 @@ Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests true - v5.0 - - .NETPortable + netstandard1.3 + portable-net452 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTestDesktop @@ -74,10 +73,10 @@ - + - + \ No newline at end of file diff --git a/src/Scripting/CSharpTest/project.json b/src/Scripting/CSharpTest/project.json deleted file mode 100644 index 22c65b94a62..00000000000 --- a/src/Scripting/CSharpTest/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "System.ValueTuple": "4.3.0" - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net452" - } - } -} diff --git a/src/Scripting/Core/Scripting.csproj b/src/Scripting/Core/Scripting.csproj index e6313133a72..c62c65757c6 100644 --- a/src/Scripting/Core/Scripting.csproj +++ b/src/Scripting/Core/Scripting.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,8 @@ Microsoft.CodeAnalysis.Scripting Microsoft.CodeAnalysis.Scripting true - v5.0 - .NETPortable + netstandard1.3 + portable-net452 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(DefineConstants);SCRIPTING @@ -28,6 +28,25 @@ False + + + + + + + + + + + + + + + + + + + @@ -140,9 +159,6 @@ ScriptingResources.Designer.cs - - - diff --git a/src/Scripting/Core/project.json b/src/Scripting/Core/project.json deleted file mode 100644 index bd944a17498..00000000000 --- a/src/Scripting/Core/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "System.AppContext": "4.3.0", - "System.Console": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.StackTrace": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net452" - } - } -} diff --git a/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj b/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj index eb4a6f3e5ff..cec3b5794b5 100644 --- a/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj +++ b/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj @@ -13,6 +13,7 @@ Microsoft.CodeAnalysis.Scripting.Desktop.UnitTests true v4.6 + win7 UnitTest @@ -60,10 +61,18 @@ - + - + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + \ No newline at end of file diff --git a/src/Scripting/CoreTest.Desktop/project.json b/src/Scripting/CoreTest.Desktop/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/Scripting/CoreTest.Desktop/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Scripting/CoreTest/ScriptingTest.csproj b/src/Scripting/CoreTest/ScriptingTest.csproj index 50ac3d86788..3e77db0b4d1 100644 --- a/src/Scripting/CoreTest/ScriptingTest.csproj +++ b/src/Scripting/CoreTest/ScriptingTest.csproj @@ -1,7 +1,7 @@  - + true AnyCPU @@ -12,9 +12,8 @@ Microsoft.CodeAnalysis.Scripting.Test Microsoft.CodeAnalysis.Scripting.UnitTests true - v5.0 - - .NETPortable + netstandard1.3 + portable-net452 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} UnitTestPortable @@ -75,9 +74,6 @@ - - - diff --git a/src/Scripting/CoreTest/project.json b/src/Scripting/CoreTest/project.json deleted file mode 100644 index c3ff33cba93..00000000000 --- a/src/Scripting/CoreTest/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net452" - } - } -} diff --git a/src/Scripting/CoreTestUtilities/ScriptingTestUtilities.csproj b/src/Scripting/CoreTestUtilities/ScriptingTestUtilities.csproj index 5ad611d9d13..675f1436d15 100644 --- a/src/Scripting/CoreTestUtilities/ScriptingTestUtilities.csproj +++ b/src/Scripting/CoreTestUtilities/ScriptingTestUtilities.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,8 @@ Microsoft.CodeAnalysis.Scripting.TestUtilities true true - v5.0 - .NETPortable + netstandard1.3 + portable-net452 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -65,7 +65,21 @@ - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Scripting/CoreTestUtilities/project.json b/src/Scripting/CoreTestUtilities/project.json deleted file mode 100644 index 4d3aa05a237..00000000000 --- a/src/Scripting/CoreTestUtilities/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "Microsoft.CSharp": "4.3.0", - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "System.Collections.Concurrent": "4.3.0", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net452" - } - } -} \ No newline at end of file diff --git a/src/Scripting/VisualBasic/BasicScripting.vbproj b/src/Scripting/VisualBasic/BasicScripting.vbproj index 56cc02a03f9..3858dc320bc 100644 --- a/src/Scripting/VisualBasic/BasicScripting.vbproj +++ b/src/Scripting/VisualBasic/BasicScripting.vbproj @@ -1,17 +1,15 @@  - + AnyCPU AnyCPU {3E7DEA65-317B-4F43-A25D-62F18D96CFD7} Library Microsoft.CodeAnalysis.VisualBasic.Scripting - v5.0 - - - .NETPortable + netstandard1.3 + portable-net452 {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} @@ -64,14 +62,14 @@ - - - + + + \ No newline at end of file diff --git a/src/Scripting/VisualBasic/project.json b/src/Scripting/VisualBasic/project.json deleted file mode 100644 index fff49a7ee43..00000000000 --- a/src/Scripting/VisualBasic/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualBasic": "10.1.0" - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net452" - } - } -} diff --git a/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj b/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj index 5a08de7fe51..43a6e0f83cd 100644 --- a/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj +++ b/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj @@ -12,6 +12,7 @@ Microsoft.CodeAnalysis.VisualBasic.Scripting.Desktop.UnitTests true v4.6 + win7 UnitTest @@ -64,6 +65,15 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -72,9 +82,6 @@ - - - diff --git a/src/Scripting/VisualBasicTest.Desktop/project.json b/src/Scripting/VisualBasicTest.Desktop/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/Scripting/VisualBasicTest.Desktop/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj b/src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj index 2797f9334db..9abfb4ab79f 100644 --- a/src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj +++ b/src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj @@ -1,7 +1,7 @@  - + true AnyCPU @@ -9,8 +9,8 @@ {ABC7262E-1053-49F3-B846-E3091BB92E8C} Library Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests - v5.0 - .NETPortable + netstandard1.3 + portable-net452 {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} UnitTestDesktop @@ -68,9 +68,6 @@ - - - diff --git a/src/Scripting/VisualBasicTest/project.json b/src/Scripting/VisualBasicTest/project.json deleted file mode 100644 index e5f2df04075..00000000000 --- a/src/Scripting/VisualBasicTest/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net452" - } - } -} diff --git a/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj b/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj index cde85889d35..2614c24246a 100644 --- a/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj +++ b/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj @@ -11,6 +11,7 @@ Roslyn.BuildDevDivInsertionFiles Roslyn.BuildDevDivInsertionFiles v4.6 + win7 true Off @@ -27,6 +28,12 @@ + + $(NewtonsoftJsonVersion) + + + $(SystemReflectionMetadataVersion) + @@ -38,8 +45,5 @@ - - - \ No newline at end of file diff --git a/src/Setup/DevDivInsertionFiles/project.json b/src/Setup/DevDivInsertionFiles/project.json deleted file mode 100644 index f61ba075640..00000000000 --- a/src/Setup/DevDivInsertionFiles/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "Newtonsoft.Json": "8.0.3", - "System.Reflection.Metadata": "1.4.2" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} diff --git a/src/Setup/Templates/Templates.csproj b/src/Setup/Templates/Templates.csproj index 8b60e3495ef..b1354cb9ae4 100644 --- a/src/Setup/Templates/Templates.csproj +++ b/src/Setup/Templates/Templates.csproj @@ -23,6 +23,7 @@ true $(VisualStudioVersion) v4.6 + win7 Vsix @@ -50,7 +51,6 @@ EULA.rtf true - Designer @@ -236,6 +236,51 @@ + + $(EnvDTEVersion) + + + $(MicrosoftCompositionVersion) + + + $(MicrosoftCodeAnalysisAnalyzersVersion) + + + $(MicrosoftCodeAnalysisCommonVersion) + + + $(MicrosoftCodeAnalysisCSharpVersion) + + + $(MicrosoftCodeAnalysisCSharpWorkspacesVersion) + + + $(MicrosoftCodeAnalysisEditorFeaturesTextVersion) + + + $(MicrosoftCodeAnalysisVisualBasicVersion) + + + $(MicrosoftCodeAnalysisVisualBasicWorkspacesVersion) + + + $(MicrosoftCodeAnalysisWorkspacesCommonVersion) + + + $(NuGetCommandLineVersion) + + + $(SystemCollectionsImmutableFixedVersion) + + + $(SystemReflectionMetadataFixedVersion) + + + $(MicrosoftVisualStudioTemplateWizardInterfaceVersion) + + + $(VSLangProjVersion) + @@ -343,4 +388,4 @@ $(GetVsixSourceItemsDependsOn);GetVsixTemplateItems - + \ No newline at end of file diff --git a/src/Setup/Templates/project.json b/src/Setup/Templates/project.json deleted file mode 100644 index 3ae9e64d447..00000000000 --- a/src/Setup/Templates/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "Microsoft.Composition": "1.0.27", - "Microsoft.CodeAnalysis.Analyzers": "1.1.0", - "Microsoft.CodeAnalysis.Common": "1.0.1", - "Microsoft.CodeAnalysis.CSharp": "1.0.1", - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.0.1", - "Microsoft.CodeAnalysis.EditorFeatures.Text": "1.0.1", - "Microsoft.CodeAnalysis.VisualBasic": "1.0.1", - "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "1.0.1", - "Microsoft.CodeAnalysis.Workspaces.Common": "1.0.1", - "NuGet.CommandLine": "2.8.5", - "System.Collections.Immutable": "1.1.36", - "System.Reflection.Metadata": "1.0.21", - "Microsoft.VisualStudio.TemplateWizardInterface": "8.0.0.0-alpha", - "VSLangProj": "7.0.3300" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj b/src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj index 21291ae1d7f..e03dc3b0002 100644 --- a/src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj +++ b/src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj @@ -1,12 +1,11 @@  - + x64 x64 x64 - $(BaseNuGetRuntimeIdentifier)-$(RuntimeIdentifier) {59BABFC3-C19B-4472-A93D-3DD3835BC219} Exe DeployCoreClrTestRuntime_DoNotUse @@ -14,8 +13,9 @@ true True {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netcoreapp1.1 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 + portable-net452;dotnet;netstandard1.6 true DeploymentTest @@ -24,9 +24,6 @@ - - - {275812ee-dedb-4232-9439-91c9757d2ae4} @@ -156,4 +153,4 @@ - + \ No newline at end of file diff --git a/src/Test/DeployCoreClrTestRuntime/project.json b/src/Test/DeployCoreClrTestRuntime/project.json deleted file mode 100644 index f265d917be8..00000000000 --- a/src/Test/DeployCoreClrTestRuntime/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "dependencies": { - "xunit.console.netcore": "1.0.2-prerelease-00104", - "Microsoft.NETCore.App": "2.0.0-beta-001836-00", - "Microsoft.NETCore.ILAsm": "1.1.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.1.0", - "Microsoft.NETCore.TestHost": "1.1.0" - }, - "frameworks": { - "netcoreapp2.0": { - "imports": [ "portable-net452", "dotnet", "netstandard1.6" ] - } - }, - "runtimes": { - "win7-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.16.04-x64": { }, - "osx.10.12-x64": { } - } -} diff --git a/src/Test/DeployDesktopTestRuntime/DeployDesktopTestRuntime.csproj b/src/Test/DeployDesktopTestRuntime/DeployDesktopTestRuntime.csproj index d8d619d08d7..18a72576366 100644 --- a/src/Test/DeployDesktopTestRuntime/DeployDesktopTestRuntime.csproj +++ b/src/Test/DeployDesktopTestRuntime/DeployDesktopTestRuntime.csproj @@ -11,13 +11,11 @@ true v4.6 + win7 DeploymentTest - - - {275812ee-dedb-4232-9439-91c9757d2ae4} diff --git a/src/Test/DeployDesktopTestRuntime/project.json b/src/Test/DeployDesktopTestRuntime/project.json deleted file mode 100644 index 774d452c57d..00000000000 --- a/src/Test/DeployDesktopTestRuntime/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/Test/Diagnostics/Diagnostics.csproj b/src/Test/Diagnostics/Diagnostics.csproj index 25600c7b289..96a5c7f36a5 100644 --- a/src/Test/Diagnostics/Diagnostics.csproj +++ b/src/Test/Diagnostics/Diagnostics.csproj @@ -103,8 +103,5 @@ MSBuild:Compile - - - \ No newline at end of file diff --git a/src/Test/Diagnostics/project.json b/src/Test/Diagnostics/project.json deleted file mode 100644 index e159af8f867..00000000000 --- a/src/Test/Diagnostics/project.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "net46": { } - } -} \ No newline at end of file diff --git a/src/Test/PdbUtilities/PdbUtilities.csproj b/src/Test/PdbUtilities/PdbUtilities.csproj index d53b0f23b6d..99b8198fb30 100644 --- a/src/Test/PdbUtilities/PdbUtilities.csproj +++ b/src/Test/PdbUtilities/PdbUtilities.csproj @@ -1,7 +1,7 @@  - + true AnyCPU @@ -10,8 +10,7 @@ Library Roslyn.Test.PdbUtilities Roslyn.Test.PdbUtilities - .NETPortable - v5.0 + netstandard1.3 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 14.0 true @@ -38,13 +37,20 @@ - - - + + + + + + + + + + diff --git a/src/Test/PdbUtilities/project.json b/src/Test/PdbUtilities/project.json deleted file mode 100644 index 37444a1865b..00000000000 --- a/src/Test/PdbUtilities/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "supports": {}, - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "Microsoft.DiaSymReader.Native": "1.5.0", - "Microsoft.DiaSymReader": "1.1.0", - "Microsoft.DiaSymReader.PortablePdb": "1.2.0", - "Microsoft.Metadata.Visualizer": "1.0.0-beta1-61531-03", - "System.Collections.Immutable": "1.3.1", - "System.Reflection.Metadata": "1.4.2", - "System.Xml.ReaderWriter": "4.3.0", - "System.ValueTuple": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/Test/Perf/Runner/Perf.Runner.csproj b/src/Test/Perf/Runner/Perf.Runner.csproj index 8c9fef7adbd..cef540e84f8 100644 --- a/src/Test/Perf/Runner/Perf.Runner.csproj +++ b/src/Test/Perf/Runner/Perf.Runner.csproj @@ -11,6 +11,7 @@ Roslyn.Test.Performance.Runner Roslyn.Test.Performance.Runner v4.6 + win7;ubuntu.14.04;osx.10.10 true false @@ -28,6 +29,9 @@ + + $(MonoOptionsVersion) + @@ -60,9 +64,6 @@ Perf.Utilities - - - diff --git a/src/Test/Perf/Runner/project.json b/src/Test/Perf/Runner/project.json deleted file mode 100644 index 3000db27179..00000000000 --- a/src/Test/Perf/Runner/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "Mono.Options": "4.4.0" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { }, - "ubuntu.14.04": { }, - "osx.10.10": { } - } -} \ No newline at end of file diff --git a/src/Test/Perf/StackDepthTest/StackDepthTest.csproj b/src/Test/Perf/StackDepthTest/StackDepthTest.csproj index 6e4065a7f89..310be384d28 100644 --- a/src/Test/Perf/StackDepthTest/StackDepthTest.csproj +++ b/src/Test/Perf/StackDepthTest/StackDepthTest.csproj @@ -9,6 +9,7 @@ StackDepthTest StackDepthTest v4.6 + win7 true @@ -22,12 +23,17 @@ + + $(SystemIOFileSystemVersion) + + + $(SystemCollectionsImmutableVersion) + - diff --git a/src/Test/Perf/StackDepthTest/project.json b/src/Test/Perf/StackDepthTest/project.json deleted file mode 100644 index c7676e8f5a7..00000000000 --- a/src/Test/Perf/StackDepthTest/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.IO.FileSystem": "4.3.0", - "System.Collections.Immutable": "1.3.1" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Test/Perf/tests/Perf.Tests.csproj b/src/Test/Perf/tests/Perf.Tests.csproj index dfca6b5c6fe..28018275342 100644 --- a/src/Test/Perf/tests/Perf.Tests.csproj +++ b/src/Test/Perf/tests/Perf.Tests.csproj @@ -36,4 +36,4 @@ - + \ No newline at end of file diff --git a/src/Test/Utilities/CoreClr/TestUtilities.CoreClr.csproj b/src/Test/Utilities/CoreClr/TestUtilities.CoreClr.csproj index 3038d7c05b0..c6a95ca6234 100644 --- a/src/Test/Utilities/CoreClr/TestUtilities.CoreClr.csproj +++ b/src/Test/Utilities/CoreClr/TestUtilities.CoreClr.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,8 @@ Roslyn.Test.Utilities.CoreClr true true - v5.0 - .NETPortable + netstandard1.6 + portable-net452 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -47,7 +47,6 @@ - @@ -77,6 +76,27 @@ false + + + + + + + + + + + + + + + + + + + + + .NETStandard,Version=v1.6 diff --git a/src/Test/Utilities/CoreClr/project.json b/src/Test/Utilities/CoreClr/project.json deleted file mode 100644 index a370c64051b..00000000000 --- a/src/Test/Utilities/CoreClr/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "dependencies": { - "Microsoft.CSharp": "4.3.0", - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "2.0.0-beta-25123-01", - "System.AppContext": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.TraceSource": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.Loader": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "netstandard1.6": { - "imports": "portable-net452" - } - } -} diff --git a/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj b/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj index aff8d27d839..711f600c82e 100644 --- a/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj +++ b/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj @@ -11,6 +11,7 @@ Roslyn.Test.Utilities Roslyn.Test.Utilities.Desktop v4.6 + win7;ubuntu.14.04;osx.10.10 true @@ -47,6 +48,24 @@ + + $(MicrosoftCodeAnalysisTestResourcesProprietaryVersion) + + + $(MicrosoftDiaSymReaderNativeVersion) + + + $(MicrosoftDiaSymReaderVersion) + + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -110,8 +129,5 @@ - - - \ No newline at end of file diff --git a/src/Test/Utilities/Desktop/project.json b/src/Test/Utilities/Desktop/project.json deleted file mode 100644 index e8308bad196..00000000000 --- a/src/Test/Utilities/Desktop/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "2.0.0-pre-20160714", - "Microsoft.DiaSymReader.Native": "1.5.0", - "Microsoft.DiaSymReader": "1.1.0", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {}, - "ubuntu.14.04": {}, - "osx.10.10": {} - } -} \ No newline at end of file diff --git a/src/Test/Utilities/Portable/TestUtilities.csproj b/src/Test/Utilities/Portable/TestUtilities.csproj index 281a0f58875..e3878ae8dbb 100644 --- a/src/Test/Utilities/Portable/TestUtilities.csproj +++ b/src/Test/Utilities/Portable/TestUtilities.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,8 @@ Roslyn.Test.Utilities true true - v5.0 - .NETPortable + netstandard1.3 + portable-net452 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(DefineConstants);DNX true @@ -83,9 +83,6 @@ - - - Assert\CoreClrShim.cs @@ -213,6 +210,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/src/Test/Utilities/Portable/project.json b/src/Test/Utilities/Portable/project.json deleted file mode 100644 index 4d3cbef7233..00000000000 --- a/src/Test/Utilities/Portable/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "dependencies": { - "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "2.0.0-pre-20160714", - "Microsoft.CSharp": "4.3.0", - "Microsoft.DiaSymReader.Converter.Xml": "1.0.0-beta1-61618-01", - "Microsoft.Metadata.Visualizer": "1.0.0-beta1-61531-03", - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "System.AppContext": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.TraceSource": "4.3.0", - "System.Diagnostics.Process": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Thread": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "netstandard1.3": { - "imports": "portable-net452" - } - } -} diff --git a/src/Tools/BuildBoss/BuildBoss.csproj b/src/Tools/BuildBoss/BuildBoss.csproj index c66eca546fe..0659e22acc2 100644 --- a/src/Tools/BuildBoss/BuildBoss.csproj +++ b/src/Tools/BuildBoss/BuildBoss.csproj @@ -11,6 +11,7 @@ BuildBoss BuildBoss v4.6 + win7 false @@ -22,6 +23,12 @@ + + $(NewtonsoftJsonVersion) + + + $(SystemCollectionsImmutableVersion) + @@ -42,7 +49,6 @@ - diff --git a/src/Tools/BuildBoss/project.json b/src/Tools/BuildBoss/project.json deleted file mode 100644 index 92203de3da8..00000000000 --- a/src/Tools/BuildBoss/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "supports": { }, - "dependencies": { - "Newtonsoft.Json": "8.0.3", - "System.Collections.Immutable": "1.3.1" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj b/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj index 7989ce07ea2..814ee917e64 100644 --- a/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj +++ b/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj @@ -11,6 +11,7 @@ ProcessWatchdog ProcessWatchdog v4.6 + win7 true false @@ -25,6 +26,15 @@ + + $(CommandLineParserVersion) + + + $(SystemCollectionsImmutableVersion) + + + $(SystemReflectionMetadataVersion) + @@ -41,9 +51,6 @@ - - - ResXFileCodeGenerator diff --git a/src/Tools/ProcessWatchdog/project.json b/src/Tools/ProcessWatchdog/project.json deleted file mode 100644 index ce49c1f5a16..00000000000 --- a/src/Tools/ProcessWatchdog/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "CommandLineParser": "2.0.273-beta", - "System.Collections.Immutable": "1.3.1", - "System.Reflection.Metadata": "1.4.2", - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/Tools/RepoUtil/RepoUtil.csproj b/src/Tools/RepoUtil/RepoUtil.csproj index 4a86933f4b9..ed3c8ad002a 100644 --- a/src/Tools/RepoUtil/RepoUtil.csproj +++ b/src/Tools/RepoUtil/RepoUtil.csproj @@ -11,6 +11,7 @@ RepoUtil RepoUtil v4.6 + win7 false publish\ @@ -37,6 +38,12 @@ + + $(NewtonsoftJsonVersion) + + + $(SystemCollectionsImmutableVersion) + @@ -64,7 +71,6 @@ - diff --git a/src/Tools/RepoUtil/project.json b/src/Tools/RepoUtil/project.json deleted file mode 100644 index 92203de3da8..00000000000 --- a/src/Tools/RepoUtil/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "supports": { }, - "dependencies": { - "Newtonsoft.Json": "8.0.3", - "System.Collections.Immutable": "1.3.1" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/DeployCompilerGeneratorToolsRuntime.csproj b/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/DeployCompilerGeneratorToolsRuntime.csproj index a51c3326c8d..6c1d5daffb4 100644 --- a/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/DeployCompilerGeneratorToolsRuntime.csproj +++ b/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/DeployCompilerGeneratorToolsRuntime.csproj @@ -1,14 +1,11 @@  - + 14.0 x64 x64 - - x64 - $(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier) {6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B} Exe DeployCompilerGeneratorToolsRuntime @@ -16,16 +13,14 @@ en-US True {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netcoreapp1.1 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 + portable-net452 true true - - - @@ -51,5 +46,10 @@ VisualBasicSyntaxGenerator + + + + + \ No newline at end of file diff --git a/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json b/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json deleted file mode 100644 index 8bbf7277b99..00000000000 --- a/src/Tools/Source/CompilerGeneratorTools/DeployCompilerGeneratorToolsRuntime/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.1.0", - "Microsoft.NETCore.TestHost": "1.1.0" - }, - "frameworks": { - "NETCoreApp1.0": { - "imports": "portable-net452" - } - }, - "runtimes": { - "win7-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.16.04-x64": { }, - "osx.10.12-x64": { } - } -} diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj index ba8b3be6cd8..105962d92b2 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj +++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj @@ -1,22 +1,19 @@  - + True x64 x64 - - x64 - $(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier) {02459936-CD2C-4F61-B671-5C518F2A3DDC} Exe Roslyn.Compilers.Internal.BoundTreeGenerator BoundTreeGenerator True {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netcoreapp1.1 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 true @@ -28,10 +25,12 @@ - + + + - + \ No newline at end of file diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json deleted file mode 100644 index 290cad7bc42..00000000000 --- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.1", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XmlSerializer": "4.3.0" - }, - "frameworks": { - "NETCoreApp1.0": { } - }, - "runtimes": { - "win7-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.16.04-x64": { }, - "osx.10.12-x64": { } - } -} diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj index f23832de1bf..d588982d9cd 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj +++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj @@ -1,13 +1,10 @@  - + x64 x64 - - x64 - $(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier) {288089C5-8721-458E-BE3E-78990DAB5E2E} Exe Roslyn.Compilers.CSharp.Internal.CSharpErrorFactsGenerator @@ -15,8 +12,8 @@ true True {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netcoreapp1.1 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 true @@ -24,11 +21,9 @@ - - - + - + \ No newline at end of file diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json deleted file mode 100644 index f4692ad8363..00000000000 --- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.1", - }, - "frameworks": { - "NETCoreApp1.0": { } - }, - "runtimes": { - "win7-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.16.04-x64": { }, - "osx.10.12-x64": { } - } -} diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj index 0bc8f72e781..de57ab661a9 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj @@ -1,13 +1,10 @@  - + x64 x64 - - x64 - $(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier) {288089C5-8721-458E-BE3E-78990DAB5E2D} Exe Roslyn.Compilers.CSharp.Internal.CSharpSyntaxGenerator @@ -15,8 +12,8 @@ true True {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - .NETPortable - v5.0 + netcoreapp1.1 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 true @@ -36,9 +33,6 @@ - - - Syntax.xml @@ -46,6 +40,9 @@ + + + - + \ No newline at end of file diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json deleted file mode 100644 index 290cad7bc42..00000000000 --- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.1", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XmlSerializer": "4.3.0" - }, - "frameworks": { - "NETCoreApp1.0": { } - }, - "runtimes": { - "win7-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.16.04-x64": { }, - "osx.10.12-x64": { } - } -} diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj index 92d39d2ee8e..a929be41b1b 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj +++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj @@ -1,14 +1,11 @@  - + true x64 x64 - - x64 - $(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier) {909B656F-6095-4AC2-A5AB-C3F032315C45} Exe @@ -16,8 +13,8 @@ VBErrorFactsGenerator True {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} - .NETPortable - v5.0 + netcoreapp1.1 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 true @@ -26,11 +23,11 @@ - + - + \ No newline at end of file diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json deleted file mode 100644 index 743a0a1cc23..00000000000 --- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.1" - }, - "frameworks": { - "NETCoreApp1.0": { } - }, - "runtimes": { - "win7-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.16.04-x64": { }, - "osx.10.12-x64": { } - } -} diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj index ed5fd80175b..f1aff858a9b 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj +++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj @@ -1,14 +1,11 @@  - + true x64 x64 - - x64 - $(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier) {6AA96934-D6B7-4CC8-990D-DB6B9DD56E34} Exe Microsoft.CodeAnalysis.VisualBasic.Internal.VBSyntaxGenerator.Program @@ -17,8 +14,8 @@ Off True {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} - .NETPortable - v5.0 + netcoreapp1.1 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 true @@ -55,10 +52,12 @@ VBSyntaxModelSchema.xsd - + + + - + \ No newline at end of file diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json deleted file mode 100644 index a3a99e6d3cc..00000000000 --- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Portable.Compatibility": "1.0.1", - "NETStandard.Library": "1.6.1", - "System.Console": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0" - }, - "frameworks": { - "NETCoreApp1.0": { } - }, - "runtimes": { - "win7-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.16.04-x64": { }, - "osx.10.12-x64": { } - } -} diff --git a/src/Tools/Source/RunTests/RunTests.csproj b/src/Tools/Source/RunTests/RunTests.csproj index f902482a4f0..9e39acddc42 100644 --- a/src/Tools/Source/RunTests/RunTests.csproj +++ b/src/Tools/Source/RunTests/RunTests.csproj @@ -11,6 +11,7 @@ RunTests RunTests v4.6 + win7 true false @@ -21,6 +22,21 @@ + + $(NewtonsoftJsonVersion) + + + $(RestSharpVersion) + + + $(SystemCollectionsImmutableVersion) + + + $(SystemReflectionMetadataVersion) + + + $(SystemValueTupleVersion) + @@ -47,7 +63,6 @@ - - + \ No newline at end of file diff --git a/src/Tools/Source/RunTests/project.json b/src/Tools/Source/RunTests/project.json deleted file mode 100644 index 73e1bdd8f75..00000000000 --- a/src/Tools/Source/RunTests/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Newtonsoft.Json": "8.0.3", - "RestSharp": "105.2.3", - "System.Collections.Immutable": "1.3.1", - "System.Reflection.Metadata": "1.4.2", - "System.ValueTuple": "4.3.0" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/SyntaxVisualizerControl.csproj b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/SyntaxVisualizerControl.csproj index a38315053d3..582038dcaac 100644 --- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/SyntaxVisualizerControl.csproj +++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/SyntaxVisualizerControl.csproj @@ -12,6 +12,7 @@ Roslyn.SyntaxVisualizer.Control false v4.6 + win7 @@ -27,6 +28,27 @@ + + $(MicrosoftCompositionVersion) + + + $(MicrosoftCodeAnalysisAnalyzersVersion) + + + $(MicrosoftCodeAnalysisCommonVersion) + + + $(MicrosoftCodeAnalysisCSharpVersion) + + + $(MicrosoftCodeAnalysisVisualBasicVersion) + + + $(SystemCollectionsImmutableFixedVersion) + + + $(SystemReflectionMetadataFixedVersion) + @@ -42,8 +64,5 @@ - - - \ No newline at end of file diff --git a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/project.json b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/project.json deleted file mode 100644 index 14bfcdef7d4..00000000000 --- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerControl/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "Microsoft.Composition": "1.0.27", - "Microsoft.CodeAnalysis.Analyzers": "1.1.0", - "Microsoft.CodeAnalysis.Common": "1.0.1", - "Microsoft.CodeAnalysis.CSharp": "1.0.1", - "Microsoft.CodeAnalysis.VisualBasic": "1.0.1", - "System.Collections.Immutable": "1.1.36", - "System.Reflection.Metadata": "1.0.21" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/SyntaxVisualizerDgmlHelper.vbproj b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/SyntaxVisualizerDgmlHelper.vbproj index 505afa0caa6..db33ea0c3da 100644 --- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/SyntaxVisualizerDgmlHelper.vbproj +++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/SyntaxVisualizerDgmlHelper.vbproj @@ -11,6 +11,7 @@ Roslyn.SyntaxVisualizer.DgmlHelper false v4.6 + win7 @@ -19,14 +20,32 @@ + + $(MicrosoftCompositionVersion) + + + $(MicrosoftCodeAnalysisAnalyzersVersion) + + + $(MicrosoftCodeAnalysisCommonVersion) + + + $(MicrosoftCodeAnalysisVisualBasicVersion) + + + $(MicrosoftCodeAnalysisCSharpVersion) + + + $(SystemCollectionsImmutableFixedVersion) + + + $(SystemReflectionMetadataFixedVersion) + - - - \ No newline at end of file diff --git a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/project.json b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/project.json deleted file mode 100644 index 6c35576c2af..00000000000 --- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerDgmlHelper/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "Microsoft.Composition": "1.0.27", - "Microsoft.CodeAnalysis.Analyzers": "1.1.0", - "Microsoft.CodeAnalysis.Common": "1.0.1", - "Microsoft.CodeAnalysis.VisualBasic": "1.0.1", - "Microsoft.CodeAnalysis.CSharp": "1.0.1", - "System.Collections.Immutable": "1.1.36", - "System.Reflection.Metadata": "1.0.21" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/SyntaxVisualizerExtension.csproj b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/SyntaxVisualizerExtension.csproj index 5871bb58547..9c1fe4f4a4c 100644 --- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/SyntaxVisualizerExtension.csproj +++ b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/SyntaxVisualizerExtension.csproj @@ -26,6 +26,7 @@ false $(VisualStudioVersion) v4.6 + win7 @@ -39,6 +40,78 @@ + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(MicrosoftCodeAnalysisAnalyzersVersion) + + + $(MicrosoftCodeAnalysisCommonVersion) + + + $(MicrosoftCodeAnalysisEditorFeaturesTextVersion) + + + $(MicrosoftCodeAnalysisWorkspacesCommonVersion) + + + $(MicrosoftCompositionVersion) + + + $(MicrosoftVisualStudioCoreUtilityFixedVersion) + + + $(MicrosoftVisualStudioEditorFixedVersion) + + + $(MicrosoftVisualStudioOLEInteropVersion) + + + $(MicrosoftVisualStudioShell140FixedVersion) + + + $(MicrosoftVisualStudioShellInteropVersion) + + + $(MicrosoftVisualStudioShellInterop100Version) + + + $(MicrosoftVisualStudioShellInterop80Version) + + + $(MicrosoftVisualStudioShellInterop90Version) + + + $(MicrosoftVisualStudioTextDataFixedVersion) + + + $(MicrosoftVisualStudioTextLogicFixedVersion) + + + $(MicrosoftVisualStudioTextUIFixedVersion) + + + $(MicrosoftVisualStudioTextUIWpfFixedVersion) + + + $(MicrosoftVisualStudioTextManagerInteropVersion) + + + $(MicrosoftVisualStudioUtilitiesFixedVersion) + + + $(SystemCollectionsImmutableFixedVersion) + + + $(SystemReflectionMetadataFixedVersion) + + + $(VSSDKComponentModelHostVersion) + @@ -107,7 +180,6 @@ ThirdPartyNotices.rtf true - Designer diff --git a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/project.json b/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/project.json deleted file mode 100644 index 4dab1ad98b5..00000000000 --- a/src/Tools/Source/SyntaxVisualizer/SyntaxVisualizerExtension/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "Microsoft.CodeAnalysis.Analyzers": "1.1.0", - "Microsoft.CodeAnalysis.Common": "1.0.1", - "Microsoft.CodeAnalysis.EditorFeatures.Text": "1.0.1", - "Microsoft.CodeAnalysis.Workspaces.Common": "1.0.1", - "Microsoft.Composition": "1.0.27", - "Microsoft.VisualStudio.CoreUtility": "[14.0.23205]", - "Microsoft.VisualStudio.Editor": "[14.0.23205]", - "Microsoft.VisualStudio.OLE.Interop": "7.10.6070", - "Microsoft.VisualStudio.Shell.14.0": "[14.0.23205]", - "Microsoft.VisualStudio.Shell.Interop": "7.10.6071", - "Microsoft.VisualStudio.Shell.Interop.10.0": "10.0.30319", - "Microsoft.VisualStudio.Shell.Interop.8.0": "8.0.50727", - "Microsoft.VisualStudio.Shell.Interop.9.0": "9.0.30729", - "Microsoft.VisualStudio.Text.Data": "[14.0.23205]", - "Microsoft.VisualStudio.Text.Logic": "[14.0.23205]", - "Microsoft.VisualStudio.Text.UI": "[14.0.23205]", - "Microsoft.VisualStudio.Text.UI.Wpf": "[14.0.23205]", - "Microsoft.VisualStudio.TextManager.Interop": "7.10.6070", - "Microsoft.VisualStudio.Utilities": "[14.0.23205]", - "System.Collections.Immutable": "1.1.36", - "System.Reflection.Metadata": "1.0.21", - "VSSDK.ComponentModelHost": "[12.0.4]" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/CSharp/Impl/CSharpVisualStudio.csproj b/src/VisualStudio/CSharp/Impl/CSharpVisualStudio.csproj index a91cb4f8e26..42ecd4ee396 100644 --- a/src/VisualStudio/CSharp/Impl/CSharpVisualStudio.csproj +++ b/src/VisualStudio/CSharp/Impl/CSharpVisualStudio.csproj @@ -86,6 +86,39 @@ + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioShellInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioGraphModelVersion) + + + $(MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + + + $(MicrosoftVisualStudioShellDesignVersion) + @@ -242,9 +275,6 @@ MSBuild:Compile - - - diff --git a/src/VisualStudio/CSharp/Impl/project.json b/src/VisualStudio/CSharp/Impl/project.json deleted file mode 100644 index 205c6298959..00000000000 --- a/src/VisualStudio/CSharp/Impl/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.VisualStudio.GraphModel": "15.0.26201-alpha", - "Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407-alpha", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Design": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/CSharp/Repl/CSharpVisualStudioRepl.csproj b/src/VisualStudio/CSharp/Repl/CSharpVisualStudioRepl.csproj index f9a9d0403ac..b2feda2ce8e 100644 --- a/src/VisualStudio/CSharp/Repl/CSharpVisualStudioRepl.csproj +++ b/src/VisualStudio/CSharp/Repl/CSharpVisualStudioRepl.csproj @@ -65,6 +65,15 @@ + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(MicrosoftVisualStudioEditorVersion) + @@ -97,9 +106,8 @@ - - + \ No newline at end of file diff --git a/src/VisualStudio/CSharp/Repl/project.json b/src/VisualStudio/CSharp/Repl/project.json deleted file mode 100644 index 8c2dc16fc1b..00000000000 --- a/src/VisualStudio/CSharp/Repl/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj b/src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj index 5260350d203..f036c9fa5b0 100644 --- a/src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj +++ b/src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj @@ -11,6 +11,7 @@ Roslyn.VisualStudio.CSharp.UnitTests Roslyn.VisualStudio.CSharp.UnitTests v4.6 + win7 UnitTest @@ -178,16 +179,40 @@ + + $(BasicUndoVersion) + + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + + + $(MicrosoftVisualStudioLanguageStandardClassificationVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + - - x86\e_sqlite3.dll - PreserveNewest - - - x64\e_sqlite3.dll - PreserveNewest - + + x86\e_sqlite3.dll + PreserveNewest + + + x64\e_sqlite3.dll + PreserveNewest + @@ -254,9 +279,5 @@ - - - - \ No newline at end of file diff --git a/src/VisualStudio/CSharp/Test/project.json b/src/VisualStudio/CSharp/Test/project.json deleted file mode 100644 index 1924cf2b73f..00000000000 --- a/src/VisualStudio/CSharp/Test/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "BasicUndo": "0.9.3", - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.StandardClassification": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj index e688d411d92..3dced3f8239 100644 --- a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj +++ b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj @@ -311,6 +311,147 @@ + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(ManagedEsentVersion) + + + $(MicrosoftCodeAnalysisElfieVersion) + + + $(MicrosoftVisualStudioTelemetryVersion) + + + $(MicrosoftVisualStudioRemoteControlVersion) + + + $(MicrosoftVisualStudioOLEInteropVersion) + + + $(MicrosoftVisualStudioShellInterop90Version) + + + $(MicrosoftVisualStudioShellInterop100Version) + + + $(MicrosoftVisualStudioShellInterop110Version) + + + $(MicrosoftVisualStudioShellInterop121DesignTimeVersion) + + + $(MicrosoftVisualStudioShellInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioShellInterop150DesignTimeVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioShellFrameworkVersion) + + + $(MicrosoftVisualStudioShellImmutable100Version) + + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioLanguageStandardClassificationVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion) + + + $(MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion) + + + $(MicrosoftVisualStudioProgressionCodeSchemaVersion) + + + $(MicrosoftVisualStudioProgressionCommonVersion) + + + $(MicrosoftVisualStudioProgressionInterfacesVersion) + + + $(MicrosoftVisualStudioGraphModelVersion) + + + $(MicrosoftVisualStudioImageCatalogVersion) + + + $(MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion) + + + $(MicrosoftVisualStudioLanguageCallHierarchyVersion) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + + + $(MicrosoftVisualStudioShellDesignVersion) + + + $(MicrosoftVisualStudioLanguageNavigateToInterfacesVersion) + + + $(MicrosoftVisualStudioTextManagerInterop100Version) + + + $(MicrosoftVisualStudioTextManagerInterop120Version) + + + $(MicrosoftVisualStudioTextManagerInterop121DesignTimeVersion) + + + $(MicrosoftVisualStudioDesignerInterfacesVersion) + + + $(MicrosoftDiaSymReaderVersion) + + + $(MicrosoftMSXMLVersion) + + + $(MicrosoftBuildVersion) + + + $(VSLangProjVersion) + + + $(VSLangProj2Version) + + + $(VSLangProj80Version) + + + $(VSLangProj140Version) + + + $(VsWebsiteInteropVersion) + + + $(NuGetVisualStudioVersion) + + + $(NewtonsoftJsonVersion) + @@ -651,7 +792,6 @@ - @@ -661,7 +801,6 @@ Designer - \ No newline at end of file diff --git a/src/VisualStudio/Core/Def/project.json b/src/VisualStudio/Core/Def/project.json deleted file mode 100644 index fad1873af2e..00000000000 --- a/src/VisualStudio/Core/Def/project.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "ManagedEsent": "1.9.4", - "Microsoft.CodeAnalysis.Elfie": "0.10.6-rc2", - "Microsoft.VisualStudio.Telemetry": "15.0.26201-alpha", - "Microsoft.VisualStudio.RemoteControl": "14.0.249-master2E2DC10C", - "Microsoft.VisualStudio.OLE.Interop": "7.10.6070", - "Microsoft.VisualStudio.Shell.Interop.9.0": "9.0.30729", - "Microsoft.VisualStudio.Shell.Interop.10.0": "10.0.30319", - "Microsoft.VisualStudio.Shell.Interop.11.0": "11.0.61030", - "Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime": "12.1.30328", - "Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Framework": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Immutable.10.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.StandardClassification": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407-alpha", - "Microsoft.Internal.Performance.CodeMarkers.DesignTime": "15.0.26201-alpha", - "Microsoft.VisualStudio.Progression.CodeSchema": "15.0.26201-alpha", - "Microsoft.VisualStudio.Progression.Common": "15.0.26201-alpha", - "Microsoft.VisualStudio.Progression.Interfaces": "15.0.26201-alpha", - "Microsoft.VisualStudio.GraphModel": "15.0.26201-alpha", - "Microsoft.VisualStudio.ImageCatalog": "15.0.26201-alpha", - "Microsoft.VisualStudio.CallHierarchy.Package.Definitions": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26201-alpha", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Design": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26201-alpha", - "Microsoft.VisualStudio.TextManager.Interop.10.0": "10.0.30319", - "Microsoft.VisualStudio.TextManager.Interop.12.0": "12.0.30110", - "Microsoft.VisualStudio.TextManager.Interop.12.1.DesignTime": "12.1.30328", - "Microsoft.VisualStudio.Designer.Interfaces": "1.1.4322", - "Microsoft.DiaSymReader": "1.1.0", - "Microsoft.MSXML": "8.0.0.0-alpha", - "Microsoft.Build": "15.1.0-preview-000458-02", - "VSLangProj": "7.0.3300", - "VSLangProj2": "7.0.5000", - "VSLangProj80": "8.0.0.0-alpha", - "VSLangProj140": "14.3.25407-alpha", - "VsWebsite.Interop": "8.0.0.0-alpha", - "NuGet.VisualStudio": "4.0.0-rc-2048", - "Newtonsoft.Json": "8.0.3" - }, - "frameworks": { - "net46": {} - } -} diff --git a/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj b/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj index 8555ff20ffd..79c35e01e24 100644 --- a/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj +++ b/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj @@ -88,9 +88,39 @@ - - - + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(MicrosoftBuildVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioShellInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioCompositionVersion) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + + + $(MicrosoftVisualStudioImageCatalogVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + @@ -287,6 +317,5 @@ Designer - \ No newline at end of file diff --git a/src/VisualStudio/Core/Impl/project.json b/src/VisualStudio/Core/Impl/project.json deleted file mode 100644 index a75c152c01e..00000000000 --- a/src/VisualStudio/Core/Impl/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "Microsoft.Build": "15.1.0-preview-000458-02", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.VisualStudio.Composition": "15.0.66-rc", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha", - "Microsoft.VisualStudio.ImageCatalog": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} diff --git a/src/VisualStudio/Core/Next/ServicesVisualStudio.Next.csproj b/src/VisualStudio/Core/Next/ServicesVisualStudio.Next.csproj index d9ae8c0a7b6..226aa9490b0 100644 --- a/src/VisualStudio/Core/Next/ServicesVisualStudio.Next.csproj +++ b/src/VisualStudio/Core/Next/ServicesVisualStudio.Next.csproj @@ -60,9 +60,74 @@ + + $(MicrosoftVisualStudioImagingVersion) + + + $(MicrosoftVisualStudioUtilitiesVersion) + + + $(MicrosoftVisualStudioImageCatalogVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioCoreUtilityVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextDataVersion) + + + $(MicrosoftVisualStudioTextLogicVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioShellFrameworkVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioLanguageNavigateToInterfacesVersion) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(NuGetVisualStudioVersion) + + + $(MicrosoftVisualStudioImagingInterop140DesignTimeVersion) + + + $(MicrosoftServiceHubClientVersion) + + + $(NewtonsoftJsonVersion) + + + $(RoslynDependenciesMicrosoftVisualStudioWorkspaceVersion) + + + $(SystemCollectionsImmutableVersion) + + + $(MicrosoftTplDataflowVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + - @@ -127,6 +192,5 @@ - \ No newline at end of file diff --git a/src/VisualStudio/Core/Next/project.json b/src/VisualStudio/Core/Next/project.json deleted file mode 100644 index 1c1d790fc29..00000000000 --- a/src/VisualStudio/Core/Next/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Imaging": "15.0.26201-alpha", - "Microsoft.VisualStudio.Utilities": "15.0.26201-alpha", - "Microsoft.VisualStudio.ImageCatalog": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.CoreUtility": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Data": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Logic": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Framework": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26201-alpha", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "NuGet.VisualStudio": "4.0.0-rc-2048", - "Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.ServiceHub.Client": "1.0.177-rc-g56d40a8a02", - "Newtonsoft.Json": "8.0.3", - "RoslynDependencies.Microsoft.VisualStudio.Workspace": "14.0.983-pre-ge167e81694", - "System.Collections.Immutable": "1.3.1", - "Microsoft.Tpl.Dataflow": "4.5.24", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/Core/SolutionExplorerShim/SolutionExplorerShim.csproj b/src/VisualStudio/Core/SolutionExplorerShim/SolutionExplorerShim.csproj index 124e8e3acc6..6956b8ac507 100644 --- a/src/VisualStudio/Core/SolutionExplorerShim/SolutionExplorerShim.csproj +++ b/src/VisualStudio/Core/SolutionExplorerShim/SolutionExplorerShim.csproj @@ -57,6 +57,27 @@ + + $(EnvDTEVersion) + + + $(MicrosoftVisualStudioCodeAnalysisSdkUIVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + + + $(MicrosoftVisualStudioImageCatalogVersion) + + + $(MicrosoftBuildFrameworkVersion) + @@ -114,8 +135,5 @@ SolutionExplorerShim.Designer.cs - - - \ No newline at end of file diff --git a/src/VisualStudio/Core/SolutionExplorerShim/project.json b/src/VisualStudio/Core/SolutionExplorerShim/project.json deleted file mode 100644 index d87e84e244b..00000000000 --- a/src/VisualStudio/Core/SolutionExplorerShim/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "Microsoft.VisualStudio.CodeAnalysis.Sdk.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha", - "Microsoft.VisualStudio.ImageCatalog": "15.0.26201-alpha", - "Microsoft.Build.Framework": "15.1.0-preview-000458-02" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj b/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj index 95c14c55209..81da8745064 100644 --- a/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj +++ b/src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj @@ -11,6 +11,7 @@ Roslyn.VisualStudio.Next.UnitTests Roslyn.VisualStudio.Next.UnitTests v4.6 + win7 true UnitTest @@ -168,14 +169,88 @@ + + $(MicrosoftTplDataflowVersion) + + + $(NewtonsoftJsonVersion) + + + $(MoqVersion) + + + $(MicrosoftVisualStudioCompositionVersion) + + + $(MicrosoftVisualStudioImagingVersion) + + + $(MicrosoftVisualStudioUtilitiesVersion) + + + $(MicrosoftVisualStudioImageCatalogVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioCoreUtilityVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextDataVersion) + + + $(MicrosoftVisualStudioTextLogicVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioShellFrameworkVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioLanguageNavigateToInterfacesVersion) + + + $(BasicUndoVersion) + + + $(MicrosoftVisualStudioLanguageStandardClassificationVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorInteropVersion) + + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + + + $(MicrosoftVisualStudioValidationVersion) + + + $(MicrosoftVisualStudioThreadingVersion) + - - - - diff --git a/src/VisualStudio/Core/Test.Next/project.json b/src/VisualStudio/Core/Test.Next/project.json deleted file mode 100644 index 9aedea6061f..00000000000 --- a/src/VisualStudio/Core/Test.Next/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "dependencies": { - "Microsoft.Tpl.Dataflow": "4.5.24", - "Newtonsoft.Json": "8.0.3", - "Moq": "4.2.1402.2112", - "Microsoft.VisualStudio.Composition": "15.0.66-rc", - "Microsoft.VisualStudio.Imaging": "15.0.26201-alpha", - "Microsoft.VisualStudio.Utilities": "15.0.26201-alpha", - "Microsoft.VisualStudio.ImageCatalog": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.CoreUtility": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Data": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Logic": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Framework": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.26201-alpha", - "BasicUndo": "0.9.3", - "Microsoft.VisualStudio.Language.StandardClassification": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "Microsoft.VisualStudio.Platform.VSEditor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26201-alpha", - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha", - "Microsoft.VisualStudio.Validation": "15.0.26201-alpha", - "Microsoft.VisualStudio.Threading": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj b/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj index c633ca10a69..ada8ce72e8e 100644 --- a/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj +++ b/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj @@ -10,6 +10,7 @@ Library Roslyn.VisualStudio.Services.UnitTests v4.6 + win7 true UnitTest @@ -185,6 +186,57 @@ + + $(BasicUndoVersion) + + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioRemoteControlVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioShellInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioProgressionCodeSchemaVersion) + + + $(MicrosoftVisualStudioProgressionCommonVersion) + + + $(MicrosoftVisualStudioProgressionInterfacesVersion) + + + $(MicrosoftVisualStudioGraphModelVersion) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + @@ -407,8 +459,5 @@ - - - \ No newline at end of file diff --git a/src/VisualStudio/Core/Test/project.json b/src/VisualStudio/Core/Test/project.json deleted file mode 100644 index d6f1887335a..00000000000 --- a/src/VisualStudio/Core/Test/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "dependencies": { - "BasicUndo": "0.9.3", - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.RemoteControl": "14.0.249-master2E2DC10C", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407-alpha", - "Microsoft.VisualStudio.Progression.CodeSchema": "15.0.26201-alpha", - "Microsoft.VisualStudio.Progression.Common": "15.0.26201-alpha", - "Microsoft.VisualStudio.Progression.Interfaces": "15.0.26201-alpha", - "Microsoft.VisualStudio.GraphModel": "15.0.26201-alpha", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj index d88892cdc71..258b08061d7 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualStudioIntegrationTests.csproj @@ -10,14 +10,12 @@ Roslyn.VisualStudio.IntegrationTests Roslyn.VisualStudio.IntegrationTests v4.6 + win7-x86 true UnitTest - - - @@ -259,7 +257,24 @@ + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(SystemCollectionsImmutableVersion) + + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + - \ No newline at end of file diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/project.json b/src/VisualStudio/IntegrationTest/IntegrationTests/project.json deleted file mode 100644 index c256e412111..00000000000 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "System.Collections.Immutable": "1.3.1", - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7-x86": { } - } -} \ No newline at end of file diff --git a/src/VisualStudio/IntegrationTest/TestSetup/VisualStudioIntegrationTestSetup.csproj b/src/VisualStudio/IntegrationTest/TestSetup/VisualStudioIntegrationTestSetup.csproj index ae6f4674204..c88f1b11047 100644 --- a/src/VisualStudio/IntegrationTest/TestSetup/VisualStudioIntegrationTestSetup.csproj +++ b/src/VisualStudio/IntegrationTest/TestSetup/VisualStudioIntegrationTestSetup.csproj @@ -10,6 +10,7 @@ Microsoft.VisualStudio.IntegrationTest.Setup Microsoft.VisualStudio.IntegrationTest.Setup v4.6 + win7-x86 true Vsix {82B43B9B-A64C-4715-B499-D71E9CA2BD60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -27,7 +28,6 @@ - Designer @@ -62,6 +62,12 @@ true + + $(MicrosoftDiagnosticsRuntimeVersion) + + + $(VSExternalAPIsCodingConventionsVersion) + diff --git a/src/VisualStudio/IntegrationTest/TestSetup/project.json b/src/VisualStudio/IntegrationTest/TestSetup/project.json deleted file mode 100644 index a3e89341d81..00000000000 --- a/src/VisualStudio/IntegrationTest/TestSetup/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "Microsoft.Diagnostics.Runtime": "0.8.31-beta", - "VS.ExternalAPIs.CodingConventions": "1.0.60704.2" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7-x86": { } - } -} \ No newline at end of file diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj index 4f5b7eb96d0..14769b8476d 100644 --- a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj +++ b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioIntegrationTestUtilities.csproj @@ -10,13 +10,13 @@ Microsoft.VisualStudio.IntegrationTest.Utilities Microsoft.VisualStudio.IntegrationTest.Utilities v4.6 + win7-x86 true - SettingsSingleFileGenerator Settings.Designer.cs @@ -104,6 +104,63 @@ + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(MicrosoftVisualStudioCoreUtilityVersion) + + + $(MicrosoftVisualStudioInteractiveWindowVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioOLEInteropVersion) + + + $(MicrosoftVisualStudioSetupConfigurationInteropVersion) + + + $(MicrosoftVisualStudioSetupConfigurationNativex86Version) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioShellInteropVersion) + + + $(MicrosoftVisualStudioShellInterop80Version) + + + $(MicrosoftVisualStudioTextDataVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + + + $(MicrosoftVisualStudioTextManagerInteropVersion) + + + $(MicrosoftVisualStudioVsInteractiveWindowVersion) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(SystemCollectionsImmutableVersion) + diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/project.json b/src/VisualStudio/IntegrationTest/TestUtilities/project.json deleted file mode 100644 index cd2b140ce1e..00000000000 --- a/src/VisualStudio/IntegrationTest/TestUtilities/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "Microsoft.VisualStudio.CoreUtility": "15.0.26201-alpha", - "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.OLE.Interop": "7.10.6070", - "Microsoft.VisualStudio.Setup.Configuration.Interop": "1.3.269-rc", - "Microsoft.VisualStudio.Setup.Configuration.Native.x86": "1.3.269-rc", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Interop": "7.10.6071", - "Microsoft.VisualStudio.Shell.Interop.8.0": "8.0.50727", - "Microsoft.VisualStudio.Text.Data": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha", - "Microsoft.VisualStudio.TextManager.Interop": "7.10.6070", - "Microsoft.VisualStudio.VsInteractiveWindow": "2.0.0-rc3-61304-01", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "System.Collections.Immutable": "1.3.1" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7-x86": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/InteractiveServices/VisualStudioInteractiveServices.csproj b/src/VisualStudio/InteractiveServices/VisualStudioInteractiveServices.csproj index 28d68fac524..a66ed3d1e8f 100644 --- a/src/VisualStudio/InteractiveServices/VisualStudioInteractiveServices.csproj +++ b/src/VisualStudio/InteractiveServices/VisualStudioInteractiveServices.csproj @@ -91,6 +91,27 @@ + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioVsInteractiveWindowVersion) + + + $(SystemValueTupleVersion) + @@ -103,9 +124,8 @@ - - + \ No newline at end of file diff --git a/src/VisualStudio/InteractiveServices/project.json b/src/VisualStudio/InteractiveServices/project.json deleted file mode 100644 index 95e2dd8fc69..00000000000 --- a/src/VisualStudio/InteractiveServices/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.VsInteractiveWindow": "2.0.0-rc3-61304-01", - "System.ValueTuple": "4.3.0" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/Razor/RazorVisualStudio.csproj b/src/VisualStudio/Razor/RazorVisualStudio.csproj index 85eceaa8c9e..a0f9dbdfdbb 100644 --- a/src/VisualStudio/Razor/RazorVisualStudio.csproj +++ b/src/VisualStudio/Razor/RazorVisualStudio.csproj @@ -33,8 +33,5 @@ - - - \ No newline at end of file diff --git a/src/VisualStudio/Razor/project.json b/src/VisualStudio/Razor/project.json deleted file mode 100644 index a6cf30aa9a9..00000000000 --- a/src/VisualStudio/Razor/project.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "net46": { } - } -} diff --git a/src/VisualStudio/RemoteHostClientMock/RemoteHostClientMock.csproj b/src/VisualStudio/RemoteHostClientMock/RemoteHostClientMock.csproj index 5c12f2ccb92..410e27820de 100644 --- a/src/VisualStudio/RemoteHostClientMock/RemoteHostClientMock.csproj +++ b/src/VisualStudio/RemoteHostClientMock/RemoteHostClientMock.csproj @@ -23,6 +23,7 @@ $(VisualStudioVersion) Roslyn.VisualStudio.RemoteHostClientMock.vsix v4.6 + win7 Vsix @@ -68,13 +69,21 @@ + + $(NewtonsoftJsonVersion) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + - Designer diff --git a/src/VisualStudio/RemoteHostClientMock/project.json b/src/VisualStudio/RemoteHostClientMock/project.json deleted file mode 100644 index f0cdeb9b73f..00000000000 --- a/src/VisualStudio/RemoteHostClientMock/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "Newtonsoft.Json": "8.0.3", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/Setup.Dependencies/VisualStudioSetup.Dependencies.csproj b/src/VisualStudio/Setup.Dependencies/VisualStudioSetup.Dependencies.csproj index 91e2a9212e7..3523b6926e4 100644 --- a/src/VisualStudio/Setup.Dependencies/VisualStudioSetup.Dependencies.csproj +++ b/src/VisualStudio/Setup.Dependencies/VisualStudioSetup.Dependencies.csproj @@ -18,6 +18,7 @@ $(VisualStudioVersion) true v4.6 + win7 Vsix true CommonExtensions @@ -73,7 +74,6 @@ - Designer @@ -82,5 +82,109 @@ + + + $(MicrosoftVisualStudioShellFrameworkVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftDiaSymReaderVersion) + + + $(MicrosoftDiaSymReaderPortablePdbVersion) + + + $(SystemCollectionsImmutableVersion) + + + $(SystemCollectionsVersion) + + + $(SystemCollectionsConcurrentVersion) + + + $(SystemDiagnosticsContractsVersion) + + + $(SystemDiagnosticsToolsVersion) + + + $(SystemDiagnosticsFileVersionInfoVersion) + + + $(SystemIOVersion) + + + $(SystemIOCompressionVersion) + + + $(SystemIOFileSystemVersion) + + + $(SystemIOFileSystemPrimitivesVersion) + + + $(SystemLinqExpressionsVersion) + + + $(SystemLinqParallelVersion) + + + $(SystemObjectModelVersion) + + + $(SystemReflectionMetadataVersion) + + + $(SystemRuntimeInteropServicesRuntimeInformationVersion) + + + $(SystemRuntimeNumericsVersion) + + + $(SystemSecurityCryptographyAlgorithmsVersion) + + + $(SystemSecurityCryptographyEncodingVersion) + + + $(SystemSecurityCryptographyPrimitivesVersion) + + + $(SystemSecurityCryptographyX509CertificatesVersion) + + + $(SystemTextEncodingVersion) + + + $(SystemTextEncodingCodePagesVersion) + + + $(SystemTextEncodingExtensionsVersion) + + + $(SystemTextRegularExpressionsVersion) + + + $(SystemThreadingTasksParallelVersion) + + + $(SystemValueTupleVersion) + + + $(SystemXmlReaderWriterVersion) + + + $(SystemXmlXDocumentVersion) + + + $(SystemXmlXmlDocumentVersion) + + + $(SystemXmlXPathXDocumentVersion) + + \ No newline at end of file diff --git a/src/VisualStudio/Setup.Dependencies/project.json b/src/VisualStudio/Setup.Dependencies/project.json deleted file mode 100644 index 0d36d8bea7e..00000000000 --- a/src/VisualStudio/Setup.Dependencies/project.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Shell.Framework": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.DiaSymReader": "1.1.0", - "Microsoft.DiaSymReader.PortablePdb": "1.2.0", - "System.Collections.Immutable": "1.3.1", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.FileVersionInfo": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Linq.Parallel": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection.Metadata": "1.4.2", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.CodePages": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks.Parallel": "4.3.0", - "System.ValueTuple": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0", - "System.Xml.XmlDocument": "4.3.0", - "System.Xml.XPath.XDocument": "4.3.0" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj b/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj index 1261e7fe112..eb4da33f460 100644 --- a/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj +++ b/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj @@ -22,6 +22,7 @@ for Dev14 do not build this as a VSIX. --> true v4.6 + win7 false Vsix true @@ -104,7 +105,6 @@ PreserveNewest true - PreserveNewest true @@ -127,5 +127,25 @@ + + + $(MicrosoftVisualStudioShellFrameworkVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioShellImmutable100Version) + + + $(MicrosoftVisualStudioShellImmutable110Version) + + + $(MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + + \ No newline at end of file diff --git a/src/VisualStudio/Setup.Next/project.json b/src/VisualStudio/Setup.Next/project.json deleted file mode 100644 index f2bccbee210..00000000000 --- a/src/VisualStudio/Setup.Next/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Shell.Framework": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Immutable.10.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Immutable.11.0": "15.0.25413-Preview5", - "Microsoft.VisualStudio.CallHierarchy.Package.Definitions": "15.0.26201-alpha", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/Setup/VisualStudioSetup.csproj b/src/VisualStudio/Setup/VisualStudioSetup.csproj index 2b25b62b8c8..84ddaf5ee79 100644 --- a/src/VisualStudio/Setup/VisualStudioSetup.csproj +++ b/src/VisualStudio/Setup/VisualStudioSetup.csproj @@ -18,6 +18,7 @@ $(VisualStudioVersion) true v4.6 + win7 Vsix true CommonExtensions @@ -201,8 +202,7 @@ {1688e1e5-d510-4e06-86f3-f8db10b1393d} VisualStudioSetup.Dependencies - - + false @@ -214,20 +214,20 @@ - - - - - - x86\e_sqlite3.dll - PreserveNewest - true - - - x64\e_sqlite3.dll - PreserveNewest - true - + + + + + + x86\e_sqlite3.dll + PreserveNewest + true + + + x64\e_sqlite3.dll + PreserveNewest + true + @@ -237,13 +237,18 @@ /rootsuffix RoslynDev /log - Designer + + $(MicrosoftDiaSymReaderPortablePdbVersion) + + + $(ManagedEsentVersion) + diff --git a/src/VisualStudio/Setup/project.json b/src/VisualStudio/Setup/project.json deleted file mode 100644 index de2039f8d36..00000000000 --- a/src/VisualStudio/Setup/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "Microsoft.DiaSymReader.PortablePdb": "1.2.0", - "ManagedEsent": "1.9.4" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/VisualStudio/TestUtilities2/VisualStudioTestUtilities2.vbproj b/src/VisualStudio/TestUtilities2/VisualStudioTestUtilities2.vbproj index 048271ef11c..10334cc03f2 100644 --- a/src/VisualStudio/TestUtilities2/VisualStudioTestUtilities2.vbproj +++ b/src/VisualStudio/TestUtilities2/VisualStudioTestUtilities2.vbproj @@ -10,6 +10,7 @@ Library Roslyn.VisualStudio.Test.Utilities2 v4.6 + win7 true @@ -176,6 +177,81 @@ + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(MicrosoftVisualStudioPlatformVSEditorVersion) + + + $(MicrosoftVisualStudioPlatformVSEditorInteropVersion) + + + $(MicrosoftVisualStudioCompositionVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioRemoteControlVersion) + + + $(MicrosoftVisualStudioShellInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioTextInternalVersion) + + + $(MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioProgressionCodeSchemaVersion) + + + $(MicrosoftVisualStudioProgressionCommonVersion) + + + $(MicrosoftVisualStudioProgressionInterfacesVersion) + + + $(MicrosoftVisualStudioGraphModelVersion) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + + + $(MicrosoftVisualStudioLanguageCallHierarchyVersion) + + + $(MicrosoftVisualStudioImagingVersion) + + + $(MicrosoftVisualStudioTextDataVersion) + + + $(MicrosoftVisualStudioTextLogicVersion) + + + $(MicrosoftVisualStudioImagingInterop140DesignTimeVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + @@ -205,10 +281,9 @@ - - + \ No newline at end of file diff --git a/src/VisualStudio/TestUtilities2/project.json b/src/VisualStudio/TestUtilities2/project.json deleted file mode 100644 index 292605a5122..00000000000 --- a/src/VisualStudio/TestUtilities2/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "Microsoft.VisualStudio.Platform.VSEditor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Platform.VSEditor.Interop": "15.0.26201-alpha", - "Microsoft.VisualStudio.Composition": "15.0.66-rc", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.RemoteControl": "14.0.249-master2E2DC10C", - "Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Internal": "15.0.26201-alpha", - "Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime": "14.3.25407-alpha", - "Microsoft.VisualStudio.Progression.CodeSchema": "15.0.26201-alpha", - "Microsoft.VisualStudio.Progression.Common": "15.0.26201-alpha", - "Microsoft.VisualStudio.Progression.Interfaces": "15.0.26201-alpha", - "Microsoft.VisualStudio.GraphModel": "15.0.26201-alpha", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.CallHierarchy": "15.0.26201-alpha", - "Microsoft.VisualStudio.Imaging": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Data": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.Logic": "15.0.26201-alpha", - "Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/BasicVisualStudio.vbproj b/src/VisualStudio/VisualBasic/Impl/BasicVisualStudio.vbproj index af5790efab5..570b073fde0 100644 --- a/src/VisualStudio/VisualBasic/Impl/BasicVisualStudio.vbproj +++ b/src/VisualStudio/VisualBasic/Impl/BasicVisualStudio.vbproj @@ -179,6 +179,30 @@ + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioLanguageIntellisenseVersion) + + + $(MicrosoftVisualStudioGraphModelVersion) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + + + $(MicrosoftVisualStudioShellDesignVersion) + @@ -215,9 +239,6 @@ - - - diff --git a/src/VisualStudio/VisualBasic/Impl/project.json b/src/VisualStudio/VisualBasic/Impl/project.json deleted file mode 100644 index 1145a70feb8..00000000000 --- a/src/VisualStudio/VisualBasic/Impl/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.Language.Intellisense": "15.0.26201-alpha", - "Microsoft.VisualStudio.GraphModel": "15.0.26201-alpha", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Design": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Repl/BasicVisualStudioRepl.vbproj b/src/VisualStudio/VisualBasic/Repl/BasicVisualStudioRepl.vbproj index 09b273d3f4f..6ef08908d17 100644 --- a/src/VisualStudio/VisualBasic/Repl/BasicVisualStudioRepl.vbproj +++ b/src/VisualStudio/VisualBasic/Repl/BasicVisualStudioRepl.vbproj @@ -67,6 +67,12 @@ + + $(EnvDTEVersion) + + + $(MicrosoftVisualStudioEditorVersion) + @@ -96,9 +102,8 @@ - - + \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Repl/project.json b/src/VisualStudio/VisualBasic/Repl/project.json deleted file mode 100644 index 389b69e66d5..00000000000 --- a/src/VisualStudio/VisualBasic/Repl/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj index 90ca913b0f6..4808fa061cc 100644 --- a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj +++ b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/VisualStudioDiagnosticsWindow.csproj @@ -23,6 +23,7 @@ $(VisualStudioVersion) Roslyn.VisualStudio.DiagnosticsWindow.vsix v4.6 + win7 Vsix @@ -84,6 +85,24 @@ + + $(EnvDTEVersion) + + + $(EnvDTE80Version) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + + + $(MicrosoftVisualStudioTextUIVersion) + + + $(MicrosoftVisualStudioTextUIWpfVersion) + @@ -135,7 +154,6 @@ - Designer diff --git a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/project.json b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/project.json deleted file mode 100644 index 6bb9d8df794..00000000000 --- a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "EnvDTE": "8.0.1", - "EnvDTE80": "8.0.0", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI": "15.0.26201-alpha", - "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.26201-alpha" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7": {} - } -} \ No newline at end of file diff --git a/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj b/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj index f29880f955b..c89e7e6e2de 100644 --- a/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj +++ b/src/VisualStudio/VisualStudioInteractiveComponents/VisualStudioInteractiveComponents.csproj @@ -19,6 +19,7 @@ $(VisualStudioVersion) true v4.6 + win7 Vsix true CommonExtensions @@ -208,7 +209,6 @@ - Designer diff --git a/src/VisualStudio/VisualStudioInteractiveComponents/project.json b/src/VisualStudio/VisualStudioInteractiveComponents/project.json deleted file mode 100644 index 9f25b41ded4..00000000000 --- a/src/VisualStudio/VisualStudioInteractiveComponents/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/VisualStudio/Xaml/Impl/XamlVisualStudio.csproj b/src/VisualStudio/Xaml/Impl/XamlVisualStudio.csproj index dc48f5fe408..6c77b15c81d 100644 --- a/src/VisualStudio/Xaml/Impl/XamlVisualStudio.csproj +++ b/src/VisualStudio/Xaml/Impl/XamlVisualStudio.csproj @@ -77,11 +77,29 @@ - - - + + $(MicrosoftVisualStudioEditorVersion) + + + $(MicrosoftVisualStudioImageCatalogVersion) + + + $(MicrosoftVisualStudioShell150Version) + + + $(MicrosoftVisualStudioShellFrameworkVersion) + + + $(MicrosoftVisualStudioComponentModelHostVersion) + + + $(MicrosoftVisualStudioDiagnosticsPerformanceProviderVersion) + + + $(NewtonsoftJsonVersion) + diff --git a/src/VisualStudio/Xaml/Impl/project.json b/src/VisualStudio/Xaml/Impl/project.json deleted file mode 100644 index d7c271da4bb..00000000000 --- a/src/VisualStudio/Xaml/Impl/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "Microsoft.VisualStudio.Editor": "15.0.26201-alpha", - "Microsoft.VisualStudio.ImageCatalog": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.15.0": "15.0.26201-alpha", - "Microsoft.VisualStudio.Shell.Framework": "15.0.26201-alpha", - "Microsoft.VisualStudio.ComponentModelHost": "15.0.26201-alpha", - "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.26201-alpha", - "Newtonsoft.Json": "8.0.3" - }, - "frameworks": { - "net46": {} - } -} \ No newline at end of file diff --git a/src/Workspaces/CSharp/Portable/CSharpWorkspace.csproj b/src/Workspaces/CSharp/Portable/CSharpWorkspace.csproj index 2f65b502395..2e41f200b17 100644 --- a/src/Workspaces/CSharp/Portable/CSharpWorkspace.csproj +++ b/src/Workspaces/CSharp/Portable/CSharpWorkspace.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,8 @@ Microsoft.CodeAnalysis.CSharp Microsoft.CodeAnalysis.CSharp.Workspaces true - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -251,7 +251,6 @@ - diff --git a/src/Workspaces/CSharp/Portable/project.json b/src/Workspaces/CSharp/Portable/project.json deleted file mode 100644 index a5bfa3b918f..00000000000 --- a/src/Workspaces/CSharp/Portable/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/Workspaces/CSharpTest/CSharpServicesTest.csproj b/src/Workspaces/CSharpTest/CSharpServicesTest.csproj index a5d778c1399..da29ffc1b57 100644 --- a/src/Workspaces/CSharpTest/CSharpServicesTest.csproj +++ b/src/Workspaces/CSharpTest/CSharpServicesTest.csproj @@ -11,6 +11,7 @@ Microsoft.CodeAnalysis.CSharp.UnitTests Roslyn.Services.CSharp.UnitTests v4.6 + win7 UnitTest @@ -72,9 +73,15 @@ - - - + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -96,4 +103,4 @@ - + \ No newline at end of file diff --git a/src/Workspaces/CSharpTest/project.json b/src/Workspaces/CSharpTest/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/Workspaces/CSharpTest/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Workspaces/Core/Desktop/Workspaces.Desktop.csproj b/src/Workspaces/Core/Desktop/Workspaces.Desktop.csproj index 40b494a473c..7429d730ff8 100644 --- a/src/Workspaces/Core/Desktop/Workspaces.Desktop.csproj +++ b/src/Workspaces/Core/Desktop/Workspaces.Desktop.csproj @@ -22,6 +22,18 @@ + + $(ManagedEsentVersion) + + + $(SQLitePCLRawbundle_greenVersion) + + + $(MicrosoftBuildVersion) + + + $(MicrosoftBuildTasksCoreVersion) + @@ -187,7 +199,6 @@ - diff --git a/src/Workspaces/Core/Desktop/project.json b/src/Workspaces/Core/Desktop/project.json deleted file mode 100644 index 693f97b2064..00000000000 --- a/src/Workspaces/Core/Desktop/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "ManagedEsent": "1.9.4", - "SQLitePCLRaw.bundle_green": "1.1.2", - "Microsoft.Build": "15.1.0-preview-000458-02", - "Microsoft.Build.Tasks.Core": "15.1.0-preview-000458-02" - }, - "frameworks": { - "net46": { } - } -} diff --git a/src/Workspaces/Core/Portable/Workspaces.csproj b/src/Workspaces/Core/Portable/Workspaces.csproj index 851d6ac76e9..784e5d5cf9d 100644 --- a/src/Workspaces/Core/Portable/Workspaces.csproj +++ b/src/Workspaces/Core/Portable/Workspaces.csproj @@ -1,7 +1,7 @@  - + AnyCPU AnyCPU @@ -10,8 +10,8 @@ Microsoft.CodeAnalysis Microsoft.CodeAnalysis.Workspaces true - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -1140,15 +1140,20 @@ - - - - + + + + + + + + + - + \ No newline at end of file diff --git a/src/Workspaces/Core/Portable/project.json b/src/Workspaces/Core/Portable/project.json deleted file mode 100644 index 3b79bea7ff7..00000000000 --- a/src/Workspaces/Core/Portable/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Diagnostics.Contracts": "4.3.0", - "System.Linq.Parallel": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks.Parallel": "4.3.0", - "System.Threading.Thread": "4.3.0" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/Workspaces/CoreTest/ServicesTest.csproj b/src/Workspaces/CoreTest/ServicesTest.csproj index a365ad8360d..db824df8ea2 100644 --- a/src/Workspaces/CoreTest/ServicesTest.csproj +++ b/src/Workspaces/CoreTest/ServicesTest.csproj @@ -11,6 +11,7 @@ Microsoft.CodeAnalysis.UnitTests Roslyn.Services.UnitTests v4.6 + win7 UnitTest @@ -141,6 +142,21 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + + + $(MicrosoftTplDataflowVersion) + + + $(MicrosoftBuildRuntimeVersion) + @@ -149,7 +165,6 @@ - PreserveNewest diff --git a/src/Workspaces/CoreTest/project.json b/src/Workspaces/CoreTest/project.json deleted file mode 100644 index e3f302924e7..00000000000 --- a/src/Workspaces/CoreTest/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194", - "Microsoft.Tpl.Dataflow": "4.5.24", - "Microsoft.Build.Runtime": "15.1.0-preview-000458-02", - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} diff --git a/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj b/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj index b1fe1d48b58..f68d293558e 100644 --- a/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj +++ b/src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj @@ -11,6 +11,7 @@ Microsoft.CodeAnalysis.UnitTests Roslyn.Services.UnitTests.Utilities v4.6 + win7 @@ -76,7 +77,6 @@ - @@ -91,6 +91,15 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -344,4 +353,4 @@ - + \ No newline at end of file diff --git a/src/Workspaces/CoreTestUtilities/project.json b/src/Workspaces/CoreTestUtilities/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/Workspaces/CoreTestUtilities/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file diff --git a/src/Workspaces/Remote/Core/RemoteWorkspaces.csproj b/src/Workspaces/Remote/Core/RemoteWorkspaces.csproj index 7493d87d3a1..4f6971b6f9a 100644 --- a/src/Workspaces/Remote/Core/RemoteWorkspaces.csproj +++ b/src/Workspaces/Remote/Core/RemoteWorkspaces.csproj @@ -47,13 +47,14 @@ + + $(SystemCollectionsImmutableVersion) + - - diff --git a/src/Workspaces/Remote/Core/project.json b/src/Workspaces/Remote/Core/project.json deleted file mode 100644 index cf3cf5c11cb..00000000000 --- a/src/Workspaces/Remote/Core/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "System.Collections.Immutable": "1.3.1" - }, - "frameworks": { - "net46": { } - } -} diff --git a/src/Workspaces/Remote/Razor/RazorServiceHub.csproj b/src/Workspaces/Remote/Razor/RazorServiceHub.csproj index 4351aeb3493..baa07b79468 100644 --- a/src/Workspaces/Remote/Razor/RazorServiceHub.csproj +++ b/src/Workspaces/Remote/Razor/RazorServiceHub.csproj @@ -33,16 +33,17 @@ + + $(StreamJsonRpcVersion) + - - Shared\JsonRpcMessageHandler.cs diff --git a/src/Workspaces/Remote/Razor/project.json b/src/Workspaces/Remote/Razor/project.json deleted file mode 100644 index 80e0c9517d5..00000000000 --- a/src/Workspaces/Remote/Razor/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "StreamJsonRpc": "1.0.2-rc" - }, - "frameworks": { - "net46": {} - } -} diff --git a/src/Workspaces/Remote/ServiceHub/ServiceHub.csproj b/src/Workspaces/Remote/ServiceHub/ServiceHub.csproj index 1ab54a50d29..1d5b8a99024 100644 --- a/src/Workspaces/Remote/ServiceHub/ServiceHub.csproj +++ b/src/Workspaces/Remote/ServiceHub/ServiceHub.csproj @@ -47,9 +47,17 @@ + + $(StreamJsonRpcVersion) + + + $(NewtonsoftJsonVersion) + + + $(MicrosoftVisualStudioTelemetryVersion) + - @@ -89,6 +97,5 @@ - \ No newline at end of file diff --git a/src/Workspaces/Remote/ServiceHub/project.json b/src/Workspaces/Remote/ServiceHub/project.json deleted file mode 100644 index ef6c3c6ebe5..00000000000 --- a/src/Workspaces/Remote/ServiceHub/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "StreamJsonRpc": "1.0.2-rc", - "Newtonsoft.Json": "8.0.3", - "Microsoft.VisualStudio.Telemetry": "15.0.26201-alpha" - }, - "frameworks": { - "net46": { } - } -} diff --git a/src/Workspaces/VisualBasic/Portable/BasicWorkspace.vbproj b/src/Workspaces/VisualBasic/Portable/BasicWorkspace.vbproj index 1ebbafe3f0d..796bd52bc5d 100644 --- a/src/Workspaces/VisualBasic/Portable/BasicWorkspace.vbproj +++ b/src/Workspaces/VisualBasic/Portable/BasicWorkspace.vbproj @@ -1,15 +1,15 @@  - + AnyCPU AnyCPU {57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C} Library Microsoft.CodeAnalysis.VisualBasic.Workspaces - .NETPortable - v5.0 + netstandard1.3 + portable-net45+win8;dotnet {14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F} true @@ -260,9 +260,6 @@ - - - diff --git a/src/Workspaces/VisualBasic/Portable/project.json b/src/Workspaces/VisualBasic/Portable/project.json deleted file mode 100644 index a5bfa3b918f..00000000000 --- a/src/Workspaces/VisualBasic/Portable/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "netstandard1.3": { - "imports": [ "portable-net45+win8", "dotnet" ] - } - } -} diff --git a/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj b/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj index 285a2f7518e..ed69a34b4b7 100644 --- a/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj +++ b/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj @@ -12,6 +12,7 @@ Off Default v4.6 + win7 UnitTest @@ -71,6 +72,15 @@ + + $(xunitVersion) + + + $(xunitrunnerconsoleVersion) + + + $(xunitrunnervisualstudioVersion) + @@ -93,9 +103,6 @@ - - - @@ -108,4 +115,4 @@ - + \ No newline at end of file diff --git a/src/Workspaces/VisualBasicTest/project.json b/src/Workspaces/VisualBasicTest/project.json deleted file mode 100644 index a25f46c9e7d..00000000000 --- a/src/Workspaces/VisualBasicTest/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta4-build3444", - "xunit.runner.console": "2.2.0-beta4-build3444", - "xunit.runner.visualstudio": "2.2.0-beta4-build1194" - }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win7": { } - } -} \ No newline at end of file -- GitLab