From 4aef0b061cac6875dd8741d62e88f2ada72d3341 Mon Sep 17 00:00:00 2001 From: David Kean Date: Wed, 13 Apr 2016 14:46:07 -0700 Subject: [PATCH] Unify NuGet dependencies across the tree To prevent projects across the tree from having different dependencies, we unify external package dependencies by creating empty C# projects that represent them. We then make use of project.json package inheritance (where a project inherits all packages dependencies from their dependencies) to unify it across the tree. No projects outside of this tree, should be directly referencing versions of these dependencies manually. For this check-in I've tackled Metadata, Reflection, and DiaSymReader. Will tackle the rest in future commits. --- Roslyn.sln | 80 ++++++++++++++++++- .../Targets/ProducesNoOutput.Imports.targets | 15 ++++ .../Targets/ProducesNoOutput.Settings.targets | 16 ++++ .../Test/Emit/CSharpCompilerEmitTest.csproj | 4 + src/Compilers/CSharp/Test/Emit/project.json | 1 - .../Core/MSBuildTaskTests/project.json | 2 - .../Core/Portable/CodeAnalysis.csproj | 10 +++ src/Compilers/Core/Portable/project.json | 2 - .../Server/VBCSCompiler/VBCSCompiler.csproj | 2 +- .../Server/VBCSCompiler/project.json | 2 - .../VBCSCompilerTests.csproj | 6 +- .../Server/VBCSCompilerTests/project.json | 1 - .../Test/Emit/BasicCompilerEmitTest.vbproj | 6 +- .../VisualBasic/Test/Emit/project.json | 1 - .../Microsoft.DiaSymReader.PortablePdb.csproj | 14 ++++ .../project.json | 3 - .../DiaSymReader/DiaSymReader.csproj | 16 ++++ src/Dependencies/DiaSymReader/project.json | 9 +++ src/Dependencies/Immutable/Immutable.csproj | 16 ++++ src/Dependencies/Immutable/project.json | 9 +++ src/Dependencies/Metadata/Metadata.csproj | 16 ++++ src/Dependencies/Metadata/project.json | 9 +++ src/Dependencies/ReadMe.txt | 7 ++ src/EditorFeatures/Core/EditorFeatures.csproj | 4 + src/EditorFeatures/Core/project.json | 1 - .../CSharpExpressionCompilerTest.csproj | 4 + .../Test/ExpressionCompiler/project.json | 1 - .../CSharp/Test/ResultProvider/project.json | 1 - .../ExpressionCompiler.csproj | 4 + .../Source/ExpressionCompiler/project.json | 1 - .../ExpressionCompilerTestUtilities.csproj | 4 + .../Core/Test/ExpressionCompiler/project.json | 1 - .../ResultProviderTestUtilities.csproj | 4 + .../Core/Test/ResultProvider/project.json | 1 - .../BasicExpressionCompilerTest.vbproj | 4 + .../Test/ExpressionCompiler/project.json | 1 - .../CSharp/APISampleUnitTests/project.json | 2 - .../CSharpAnalyzers.Test/project.json | 4 +- .../CSharpAnalyzers/project.json | 4 +- .../CSharp/ConsoleClassifier/project.json | 2 - .../CSharp/ConvertToAutoProperty/project.json | 4 +- .../ConvertToConditional/Impl/project.json | 4 +- .../ConvertToConditional/Test/project.json | 2 - .../CSharp/CopyPasteWithUsing/project.json | 4 +- .../CSharp/FormatSolution/project.json | 4 +- .../Impl/project.json | 4 +- .../Test/project.json | 2 - .../CSharp/MakeConst/Impl/project.json | 4 +- .../CSharp/RefOutModifier/project.json | 4 +- .../CSharp/TreeTransforms/project.json | 2 - src/Samples/Samples.sln | 37 ++++++++- .../Shared/UnitTestFramework/project.json | 1 - .../APISampleUnitTests/project.json | 2 - .../BasicAnalyzers.Test/project.json | 4 +- .../BasicAnalyzers/project.json | 14 ++-- .../ConsoleClassifier/project.json | 2 - .../ConvertToAutoProperty/Impl/project.json | 4 +- .../ConvertToAutoProperty/Test/project.json | 1 - .../VisualBasic/FormatSolution/project.json | 2 - .../Impl/project.json | 4 +- .../Test/project.json | 2 - .../VisualBasic/MakeConst/Impl/project.json | 4 +- .../VisualBasic/RemoveByVal/Impl/project.json | 4 +- .../VisualBasic/RemoveByVal/Test/project.json | 2 - .../VisualBasic/TreeTransforms/project.json | 4 +- src/Scripting/Core/project.json | 1 - src/Test/PdbUtilities/PdbUtilities.csproj | 12 +++ src/Test/PdbUtilities/project.json | 5 +- .../Desktop/TestUtilities.Desktop.csproj | 4 + src/Test/Utilities/Desktop/project.json | 5 +- .../Portable.FX45/TestUtilities.FX45.csproj | 6 +- src/Test/Utilities/Portable.FX45/project.json | 3 - src/Test/Utilities/Portable/project.json | 3 +- src/Tools/BuildUtil/BuildUtil.sln | 13 ++- .../BuildUtil/BuildUtil/BuildUtil.csproj | 6 ++ src/Tools/BuildUtil/BuildUtil/project.json | 3 +- .../ProcessWatchdog/ProcessWatchdog.csproj | 10 +++ src/Tools/ProcessWatchdog/project.json | 4 +- src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj | 4 + src/Tools/Source/Pdb2Xml/project.json | 1 - src/Tools/Source/RunTests/RunTests.csproj | 10 +++ src/Tools/Source/RunTests/project.json | 4 +- .../Core/Def/ServicesVisualStudio.csproj | 6 +- src/VisualStudio/Core/Def/project.json | 1 - 84 files changed, 384 insertions(+), 128 deletions(-) create mode 100644 build/Targets/ProducesNoOutput.Imports.targets create mode 100644 build/Targets/ProducesNoOutput.Settings.targets create mode 100644 src/Dependencies/DiaSymReader/DiaSymReader.csproj create mode 100644 src/Dependencies/DiaSymReader/project.json create mode 100644 src/Dependencies/Immutable/Immutable.csproj create mode 100644 src/Dependencies/Immutable/project.json create mode 100644 src/Dependencies/Metadata/Metadata.csproj create mode 100644 src/Dependencies/Metadata/project.json create mode 100644 src/Dependencies/ReadMe.txt diff --git a/Roslyn.sln b/Roslyn.sln index 88eb486a6a4..80ce8dfcdbd 100644 --- a/Roslyn.sln +++ b/Roslyn.sln @@ -334,6 +334,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployCompilerGeneratorTool EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonCoreClrRuntime", "src\Tools\CommonCoreClrRuntime\CommonCoreClrRuntime.csproj", "{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{C2D1346B-9665-4150-B644-075CF1636BAA}" + ProjectSection(SolutionItems) = preProject + src\Dependencies\ReadMe.txt = src\Dependencies\ReadMe.txt + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiaSymReader", "src\Dependencies\DiaSymReader\DiaSymReader.csproj", "{D2B8B03E-A85D-48A2-818F-9177D89586A9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Immutable", "src\Dependencies\Immutable\Immutable.csproj", "{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Metadata", "src\Dependencies\Metadata\Metadata.csproj", "{E6796B97-D5C6-45B2-AE46-351D15DCFC71}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4 @@ -366,18 +377,18 @@ Global src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d3}*SharedItemsImports = 4 src\Compilers\Core\SharedCollections\SharedCollections.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4 src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{fa0e905d-ec46-466d-b7b2-3b5557f9428c}*SharedItemsImports = 4 - src\Compilers\Core\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4 src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4 - src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4 + src\Compilers\Core\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4 src\Compilers\Core\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4 + src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4 src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{3973b09a-4fbf-44a5-8359-3d22ceb71f71}*SharedItemsImports = 4 src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{bedc5a4a-809e-4017-9cfd-6c8d4e1847f0}*SharedItemsImports = 4 src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 4 src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 4 src\Compilers\Core\CommandLine\CommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 4 src\Compilers\Core\SharedCollections\SharedCollections.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13 - src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4 src\Compilers\Core\CommandLine\CommandLine.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4 + src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4 src\Compilers\Core\CommandLine\CommandLine.projitems*{e3cd2895-76a8-4d11-a316-ea67cb5ea42c}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -2861,6 +2872,66 @@ Global {1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|x64.ActiveCfg = Release|x64 {1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|x64.Build.0 = Release|x64 {1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|x86.ActiveCfg = Release|x64 + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|ARM.ActiveCfg = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|ARM.Build.0 = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|x64.ActiveCfg = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|x64.Build.0 = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|x86.ActiveCfg = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Debug|x86.Build.0 = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|Any CPU.Build.0 = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|ARM.ActiveCfg = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|ARM.Build.0 = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|Mixed Platforms.Build.0 = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|x64.ActiveCfg = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|x64.Build.0 = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|x86.ActiveCfg = Debug|Any CPU + {D2B8B03E-A85D-48A2-818F-9177D89586A9}.Release|x86.Build.0 = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|ARM.ActiveCfg = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|ARM.Build.0 = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|x64.ActiveCfg = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|x64.Build.0 = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|x86.ActiveCfg = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Debug|x86.Build.0 = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|Any CPU.Build.0 = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|ARM.ActiveCfg = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|ARM.Build.0 = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|Mixed Platforms.Build.0 = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|x64.ActiveCfg = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|x64.Build.0 = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|x86.ActiveCfg = Debug|Any CPU + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}.Release|x86.Build.0 = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|ARM.ActiveCfg = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|ARM.Build.0 = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|x64.ActiveCfg = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|x64.Build.0 = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|x86.ActiveCfg = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Debug|x86.Build.0 = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|Any CPU.Build.0 = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|ARM.ActiveCfg = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|ARM.Build.0 = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|Mixed Platforms.Build.0 = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|x64.ActiveCfg = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|x64.Build.0 = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|x86.ActiveCfg = Debug|Any CPU + {E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3016,5 +3087,8 @@ Global {1553DE60-A2B0-4FAF-B1B8-C0A7313781CC} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} {6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} {1B665337-9D6A-451A-AEAC-F7BF1AF95FFB} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} + {D2B8B03E-A85D-48A2-818F-9177D89586A9} = {C2D1346B-9665-4150-B644-075CF1636BAA} + {DCDA908D-EF5E-494B-ADDC-C26F5FD610CA} = {C2D1346B-9665-4150-B644-075CF1636BAA} + {E6796B97-D5C6-45B2-AE46-351D15DCFC71} = {C2D1346B-9665-4150-B644-075CF1636BAA} EndGlobalSection EndGlobal diff --git a/build/Targets/ProducesNoOutput.Imports.targets b/build/Targets/ProducesNoOutput.Imports.targets new file mode 100644 index 00000000000..bd0cddc5188 --- /dev/null +++ b/build/Targets/ProducesNoOutput.Imports.targets @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/Targets/ProducesNoOutput.Settings.targets b/build/Targets/ProducesNoOutput.Settings.targets new file mode 100644 index 00000000000..48007fde226 --- /dev/null +++ b/build/Targets/ProducesNoOutput.Settings.targets @@ -0,0 +1,16 @@ + + + + + + + false + true + bin + Library + .NETPortable + v4.5 + Profile7 + + + \ 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 7fa442933af..8415e82bd26 100644 --- a/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj +++ b/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj @@ -16,6 +16,10 @@ v4.5 + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + {AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED} PdbUtilities diff --git a/src/Compilers/CSharp/Test/Emit/project.json b/src/Compilers/CSharp/Test/Emit/project.json index 516576678f2..d93c8240d40 100644 --- a/src/Compilers/CSharp/Test/Emit/project.json +++ b/src/Compilers/CSharp/Test/Emit/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "Microsoft.DiaSymReader": "1.0.7", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" }, diff --git a/src/Compilers/Core/MSBuildTaskTests/project.json b/src/Compilers/Core/MSBuildTaskTests/project.json index 16d0c09f797..6afc22c9481 100644 --- a/src/Compilers/Core/MSBuildTaskTests/project.json +++ b/src/Compilers/Core/MSBuildTaskTests/project.json @@ -1,7 +1,5 @@ { "dependencies": { - - "Microsoft.DiaSymReader": "1.0.7", "Moq": "4.2.1402.2112", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" diff --git a/src/Compilers/Core/Portable/CodeAnalysis.csproj b/src/Compilers/Core/Portable/CodeAnalysis.csproj index c69d0156c03..51693be713c 100644 --- a/src/Compilers/Core/Portable/CodeAnalysis.csproj +++ b/src/Compilers/Core/Portable/CodeAnalysis.csproj @@ -785,6 +785,16 @@ + + + {030f8ab1-d06d-4526-adec-8e6010899c71} + Immutable + + + {b36c94c7-f34c-43bc-8834-0b9eea6dd4df} + Metadata + + diff --git a/src/Compilers/Core/Portable/project.json b/src/Compilers/Core/Portable/project.json index eef1946998e..c303717d1e1 100644 --- a/src/Compilers/Core/Portable/project.json +++ b/src/Compilers/Core/Portable/project.json @@ -1,8 +1,6 @@ { "supports": {}, "dependencies": { - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" }, "frameworks": { ".NETPortable,Version=v4.5,Profile=Profile7": {} diff --git a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj index f2edff107c7..b3da87443b8 100644 --- a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj +++ b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj @@ -83,4 +83,4 @@ - + \ No newline at end of file diff --git a/src/Compilers/Server/VBCSCompiler/project.json b/src/Compilers/Server/VBCSCompiler/project.json index e71fca7af24..6c600d15d7b 100644 --- a/src/Compilers/Server/VBCSCompiler/project.json +++ b/src/Compilers/Server/VBCSCompiler/project.json @@ -1,7 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0", }, "frameworks": { "net45": { } diff --git a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj index d54d650cae3..93366482ba8 100644 --- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj +++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj @@ -19,6 +19,10 @@ + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + {4b45ca0c-03a0-400f-b454-3d4bcb16af38} csc @@ -127,4 +131,4 @@ - + \ No newline at end of file diff --git a/src/Compilers/Server/VBCSCompilerTests/project.json b/src/Compilers/Server/VBCSCompilerTests/project.json index a0df76ffa4f..f2b89f621fc 100644 --- a/src/Compilers/Server/VBCSCompilerTests/project.json +++ b/src/Compilers/Server/VBCSCompilerTests/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "Microsoft.DiaSymReader": "1.0.7", "Moq": "4.2.1402.2112", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" diff --git a/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj b/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj index 923f595a129..468af0f0693 100644 --- a/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj +++ b/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj @@ -14,6 +14,10 @@ v4.5 + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + {AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED} PdbUtilities @@ -260,4 +264,4 @@ - + \ No newline at end of file diff --git a/src/Compilers/VisualBasic/Test/Emit/project.json b/src/Compilers/VisualBasic/Test/Emit/project.json index 516576678f2..d93c8240d40 100644 --- a/src/Compilers/VisualBasic/Test/Emit/project.json +++ b/src/Compilers/VisualBasic/Test/Emit/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "Microsoft.DiaSymReader": "1.0.7", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" }, diff --git a/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.csproj b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.csproj index 2bdc81205cd..ec32f0f9d58 100644 --- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.csproj +++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/Microsoft.DiaSymReader.PortablePdb.csproj @@ -94,6 +94,20 @@ + + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + + + {030f8ab1-d06d-4526-adec-8e6010899c71} + Immutable + + + {b36c94c7-f34c-43bc-8834-0b9eea6dd4df} + Metadata + + diff --git a/src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.json b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.json index 7c529c56f63..65b29938ab3 100644 --- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.json +++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.json @@ -1,8 +1,5 @@ { "dependencies": { - "Microsoft.DiaSymReader": "1.0.7", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" }, "frameworks": { ".NETPortable,Version=v4.5,Profile=Profile7": {} diff --git a/src/Dependencies/DiaSymReader/DiaSymReader.csproj b/src/Dependencies/DiaSymReader/DiaSymReader.csproj new file mode 100644 index 00000000000..1bfa502721b --- /dev/null +++ b/src/Dependencies/DiaSymReader/DiaSymReader.csproj @@ -0,0 +1,16 @@ + + + + + + + D2B8B03E-A85D-48A2-818F-9177D89586A9 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + + + + + + \ No newline at end of file diff --git a/src/Dependencies/DiaSymReader/project.json b/src/Dependencies/DiaSymReader/project.json new file mode 100644 index 00000000000..a73b7100a80 --- /dev/null +++ b/src/Dependencies/DiaSymReader/project.json @@ -0,0 +1,9 @@ +{ + "supports": {}, + "dependencies": { + "Microsoft.DiaSymReader": "1.0.7" + }, + "frameworks": { + ".NETPortable,Version=v4.5,Profile=Profile7": {} + } +} \ No newline at end of file diff --git a/src/Dependencies/Immutable/Immutable.csproj b/src/Dependencies/Immutable/Immutable.csproj new file mode 100644 index 00000000000..cb94fce1c95 --- /dev/null +++ b/src/Dependencies/Immutable/Immutable.csproj @@ -0,0 +1,16 @@ + + + + + + + DCDA908D-EF5E-494B-ADDC-C26F5FD610CA + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + + + + + + \ No newline at end of file diff --git a/src/Dependencies/Immutable/project.json b/src/Dependencies/Immutable/project.json new file mode 100644 index 00000000000..4f5ac80bab8 --- /dev/null +++ b/src/Dependencies/Immutable/project.json @@ -0,0 +1,9 @@ +{ + "supports": {}, + "dependencies": { + "System.Collections.Immutable": "1.1.37" + }, + "frameworks": { + ".NETPortable,Version=v4.5,Profile=Profile7": {} + } +} \ No newline at end of file diff --git a/src/Dependencies/Metadata/Metadata.csproj b/src/Dependencies/Metadata/Metadata.csproj new file mode 100644 index 00000000000..df720bf9be2 --- /dev/null +++ b/src/Dependencies/Metadata/Metadata.csproj @@ -0,0 +1,16 @@ + + + + + + + E6796B97-D5C6-45B2-AE46-351D15DCFC71 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + + + + + + \ No newline at end of file diff --git a/src/Dependencies/Metadata/project.json b/src/Dependencies/Metadata/project.json new file mode 100644 index 00000000000..72adad018eb --- /dev/null +++ b/src/Dependencies/Metadata/project.json @@ -0,0 +1,9 @@ +{ + "supports": {}, + "dependencies": { + "System.Reflection.Metadata": "1.2.0" + }, + "frameworks": { + ".NETPortable,Version=v4.5,Profile=Profile7": {} + } +} \ No newline at end of file diff --git a/src/Dependencies/ReadMe.txt b/src/Dependencies/ReadMe.txt new file mode 100644 index 00000000000..a808ea7418f --- /dev/null +++ b/src/Dependencies/ReadMe.txt @@ -0,0 +1,7 @@ +To prevent projects across the tree from having different dependencies, we unify +external package dependencies by creating empty C# projects that represent them. +We then make use of project.json package inheritance (where a project inherits +all packages dependencies from their dependencies) to unify it across the tree. + +No projects outside of this tree should be directly referencing versions of +these dependencies manually. \ No newline at end of file diff --git a/src/EditorFeatures/Core/EditorFeatures.csproj b/src/EditorFeatures/Core/EditorFeatures.csproj index 00ec2d39cc8..f1465719caa 100644 --- a/src/EditorFeatures/Core/EditorFeatures.csproj +++ b/src/EditorFeatures/Core/EditorFeatures.csproj @@ -22,6 +22,10 @@ {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C} CodeAnalysis + + {030f8ab1-d06d-4526-adec-8e6010899c71} + Immutable + {2e87fa96-50bb-4607-8676-46521599f998} Workspaces.Desktop diff --git a/src/EditorFeatures/Core/project.json b/src/EditorFeatures/Core/project.json index fc80438addd..645f90a7fa2 100644 --- a/src/EditorFeatures/Core/project.json +++ b/src/EditorFeatures/Core/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37" }, "frameworks": { "net46": {} diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj index 78972b28e46..d5d115d4be5 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj @@ -20,6 +20,10 @@ {7a4b2176-7bfd-4b75-a61a-e25a1fdd0a1e} CSharpCompilerTestUtilities.Desktop + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + {f7712928-1175-47b3-8819-ee086753dee2} TestUtilities.FX45 diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json index 516576678f2..d93c8240d40 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "Microsoft.DiaSymReader": "1.0.7", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" }, diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json index e1b7a1f9b2e..d93c8240d40 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" }, diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj index 55f605f92be..74d76522683 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj @@ -70,6 +70,10 @@ + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + {5002636a-fe8d-40bf-8818-ab513a2194fa} Concord diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json index e10b5dd6970..65b29938ab3 100644 --- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json +++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "Microsoft.DiaSymReader": "1.0.7" }, "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 07fbb9acf99..ca9c21243a0 100644 --- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj +++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj @@ -22,6 +22,10 @@ + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + {f7712928-1175-47b3-8819-ee086753dee2} TestUtilities.FX45 diff --git a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json index c4bf42440ed..113b464461a 100644 --- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json +++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "Microsoft.DiaSymReader": "1.0.7", "xunit": "2.1.0" }, "frameworks": { diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj index 921030cb73f..d8a431fd679 100644 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj +++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj @@ -22,6 +22,10 @@ + + {030f8ab1-d06d-4526-adec-8e6010899c71} + Immutable + {76c6f005-c89d-4348-bb4a-391898dbeb52} TestUtilities.Desktop diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json b/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json index 855ee153c56..113b464461a 100644 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json +++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", "xunit": "2.1.0" }, "frameworks": { diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj index 149d86de859..fb25ec508f2 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj @@ -17,6 +17,10 @@ + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + {f7712928-1175-47b3-8819-ee086753dee2} TestUtilities.FX45 diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json index 516576678f2..d93c8240d40 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "Microsoft.DiaSymReader": "1.0.7", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" }, diff --git a/src/Samples/CSharp/APISampleUnitTests/project.json b/src/Samples/CSharp/APISampleUnitTests/project.json index 6585037c5ed..80e1448698c 100644 --- a/src/Samples/CSharp/APISampleUnitTests/project.json +++ b/src/Samples/CSharp/APISampleUnitTests/project.json @@ -1,7 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0", "xunit": "2.1.0" }, "frameworks": { diff --git a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json index 2d955c53d9e..a223e44f868 100644 --- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json +++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net452": {} diff --git a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json index 99bbe9be9c0..12f82b9ef31 100644 --- a/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json +++ b/src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" + "Microsoft.Composition": "1.0.27" }, "frameworks": { ".NETPortable,Version=v4.5,Profile=Profile7": {} diff --git a/src/Samples/CSharp/ConsoleClassifier/project.json b/src/Samples/CSharp/ConsoleClassifier/project.json index 7933a7dad6a..083665e4277 100644 --- a/src/Samples/CSharp/ConsoleClassifier/project.json +++ b/src/Samples/CSharp/ConsoleClassifier/project.json @@ -1,7 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0", "Microsoft.Composition": "1.0.27" }, "frameworks": { diff --git a/src/Samples/CSharp/ConvertToAutoProperty/project.json b/src/Samples/CSharp/ConvertToAutoProperty/project.json index 7d01885baa3..083665e4277 100644 --- a/src/Samples/CSharp/ConvertToAutoProperty/project.json +++ b/src/Samples/CSharp/ConvertToAutoProperty/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Reflection.Metadata": "1.2.0", - "System.Collections.Immutable": "1.1.37" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net452": {} diff --git a/src/Samples/CSharp/ConvertToConditional/Impl/project.json b/src/Samples/CSharp/ConvertToConditional/Impl/project.json index 75444879df1..4d48194c5b6 100644 --- a/src/Samples/CSharp/ConvertToConditional/Impl/project.json +++ b/src/Samples/CSharp/ConvertToConditional/Impl/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Reflection.Metadata": "1.2.0", - "System.Collections.Immutable": "1.1.37" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net46": {} diff --git a/src/Samples/CSharp/ConvertToConditional/Test/project.json b/src/Samples/CSharp/ConvertToConditional/Test/project.json index 26f5725b71c..29866250a36 100644 --- a/src/Samples/CSharp/ConvertToConditional/Test/project.json +++ b/src/Samples/CSharp/ConvertToConditional/Test/project.json @@ -1,8 +1,6 @@ { "dependencies": { "Microsoft.Composition": "1.0.27", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" }, diff --git a/src/Samples/CSharp/CopyPasteWithUsing/project.json b/src/Samples/CSharp/CopyPasteWithUsing/project.json index 75444879df1..4d48194c5b6 100644 --- a/src/Samples/CSharp/CopyPasteWithUsing/project.json +++ b/src/Samples/CSharp/CopyPasteWithUsing/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Reflection.Metadata": "1.2.0", - "System.Collections.Immutable": "1.1.37" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net46": {} diff --git a/src/Samples/CSharp/FormatSolution/project.json b/src/Samples/CSharp/FormatSolution/project.json index 7d01885baa3..083665e4277 100644 --- a/src/Samples/CSharp/FormatSolution/project.json +++ b/src/Samples/CSharp/FormatSolution/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Reflection.Metadata": "1.2.0", - "System.Collections.Immutable": "1.1.37" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net452": {} diff --git a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.json b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.json index 7d01885baa3..083665e4277 100644 --- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.json +++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Reflection.Metadata": "1.2.0", - "System.Collections.Immutable": "1.1.37" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net452": {} diff --git a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json index 2515feed1b0..a219438d99b 100644 --- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json +++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json @@ -1,7 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" }, diff --git a/src/Samples/CSharp/MakeConst/Impl/project.json b/src/Samples/CSharp/MakeConst/Impl/project.json index 7d01885baa3..083665e4277 100644 --- a/src/Samples/CSharp/MakeConst/Impl/project.json +++ b/src/Samples/CSharp/MakeConst/Impl/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Reflection.Metadata": "1.2.0", - "System.Collections.Immutable": "1.1.37" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net452": {} diff --git a/src/Samples/CSharp/RefOutModifier/project.json b/src/Samples/CSharp/RefOutModifier/project.json index 3b6a5623376..bccf738b017 100644 --- a/src/Samples/CSharp/RefOutModifier/project.json +++ b/src/Samples/CSharp/RefOutModifier/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Reflection.Metadata": "1.2.0", - "System.Collections.Immutable": "1.1.37" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net46": {} diff --git a/src/Samples/CSharp/TreeTransforms/project.json b/src/Samples/CSharp/TreeTransforms/project.json index 7fdfe3a1099..efa5cdb9a4c 100644 --- a/src/Samples/CSharp/TreeTransforms/project.json +++ b/src/Samples/CSharp/TreeTransforms/project.json @@ -1,7 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" }, "frameworks": { "net452": {} diff --git a/src/Samples/Samples.sln b/src/Samples/Samples.sln index e0a199cf459..10860bdff97 100644 --- a/src/Samples/Samples.sln +++ b/src/Samples/Samples.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "APISampleUnitTestsCS", "CSharp\APISampleUnitTests\APISampleUnitTestsCS.csproj", "{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}" EndProject @@ -115,6 +115,15 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RemoveByValVB.UnitTests", " EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TreeTransformsVB", "VisualBasic\TreeTransforms\TreeTransformsVB.vbproj", "{D89124D4-FB1D-4D08-BD95-F60BD24D5965}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{D14160E0-ACA0-4D2D-A670-CB72A57225F2}" + ProjectSection(SolutionItems) = preProject + ..\Dependencies\ReadMe.txt = ..\Dependencies\ReadMe.txt + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Immutable", "..\Dependencies\Immutable\Immutable.csproj", "{030F8AB1-D06D-4526-ADEC-8E6010899C71}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Metadata", "..\Dependencies\Metadata\Metadata.csproj", "{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -481,6 +490,30 @@ Global {D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Release|Mixed Platforms.Build.0 = Release|x86 {D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Release|x86.ActiveCfg = Release|x86 {D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Release|x86.Build.0 = Release|x86 + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Debug|Any CPU.Build.0 = Debug|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Debug|x86.ActiveCfg = Debug|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Debug|x86.Build.0 = Debug|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Any CPU.ActiveCfg = Release|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Any CPU.Build.0 = Release|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|x86.ActiveCfg = Release|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|x86.Build.0 = Release|Any CPU + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Debug|x86.ActiveCfg = Debug|Any CPU + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Debug|x86.Build.0 = Debug|Any CPU + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|Any CPU.Build.0 = Release|Any CPU + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|x86.ActiveCfg = Release|Any CPU + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -536,5 +569,7 @@ Global {4900921D-C548-4FBB-9681-BAF88E09DB3C} = {B4EA92BD-CB82-465D-864C-0630A50CD40B} {D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD} = {B4EA92BD-CB82-465D-864C-0630A50CD40B} {D89124D4-FB1D-4D08-BD95-F60BD24D5965} = {87DABD98-F9EB-4723-A466-9B7AF11E390D} + {030F8AB1-D06D-4526-ADEC-8E6010899C71} = {D14160E0-ACA0-4D2D-A670-CB72A57225F2} + {B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF} = {D14160E0-ACA0-4D2D-A670-CB72A57225F2} EndGlobalSection EndGlobal diff --git a/src/Samples/Shared/UnitTestFramework/project.json b/src/Samples/Shared/UnitTestFramework/project.json index f7f0706a4c8..48a98a84f33 100644 --- a/src/Samples/Shared/UnitTestFramework/project.json +++ b/src/Samples/Shared/UnitTestFramework/project.json @@ -1,7 +1,6 @@ { "dependencies": { "Moq": "4.2.1402.2112", - "System.Collections.Immutable": "1.1.37", "xunit": "2.1.0" }, "frameworks": { diff --git a/src/Samples/VisualBasic/APISampleUnitTests/project.json b/src/Samples/VisualBasic/APISampleUnitTests/project.json index 2515feed1b0..a219438d99b 100644 --- a/src/Samples/VisualBasic/APISampleUnitTests/project.json +++ b/src/Samples/VisualBasic/APISampleUnitTests/project.json @@ -1,7 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" }, diff --git a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.json b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.json index 07a8a3d3b53..d5c7ffdc1d2 100644 --- a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.json +++ b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net452": {} diff --git a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json index 38df0f6c326..ab20f0a5fd9 100644 --- a/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json +++ b/src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.json @@ -1,11 +1,9 @@ { - "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" + "dependencies": { + "Microsoft.Composition": "1.0.27" - }, - "frameworks": { - ".NETPortable,Version=v4.5,Profile=Profile7": {} - } + }, + "frameworks": { + ".NETPortable,Version=v4.5,Profile=Profile7": { } + } } \ No newline at end of file diff --git a/src/Samples/VisualBasic/ConsoleClassifier/project.json b/src/Samples/VisualBasic/ConsoleClassifier/project.json index 060ccaa9bb3..68473754356 100644 --- a/src/Samples/VisualBasic/ConsoleClassifier/project.json +++ b/src/Samples/VisualBasic/ConsoleClassifier/project.json @@ -1,7 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" }, "frameworks": { "net452": {} diff --git a/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.json b/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.json index 3f5aa604a43..083665e4277 100644 --- a/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.json +++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net452": {} diff --git a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json index 2ae001bf50e..a219438d99b 100644 --- a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json +++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" }, diff --git a/src/Samples/VisualBasic/FormatSolution/project.json b/src/Samples/VisualBasic/FormatSolution/project.json index 060ccaa9bb3..68473754356 100644 --- a/src/Samples/VisualBasic/FormatSolution/project.json +++ b/src/Samples/VisualBasic/FormatSolution/project.json @@ -1,7 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" }, "frameworks": { "net452": {} diff --git a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.json b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.json index 3f5aa604a43..083665e4277 100644 --- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.json +++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net452": {} diff --git a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json index 2515feed1b0..a219438d99b 100644 --- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json +++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json @@ -1,7 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" }, diff --git a/src/Samples/VisualBasic/MakeConst/Impl/project.json b/src/Samples/VisualBasic/MakeConst/Impl/project.json index 3f5aa604a43..083665e4277 100644 --- a/src/Samples/VisualBasic/MakeConst/Impl/project.json +++ b/src/Samples/VisualBasic/MakeConst/Impl/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net452": {} diff --git a/src/Samples/VisualBasic/RemoveByVal/Impl/project.json b/src/Samples/VisualBasic/RemoveByVal/Impl/project.json index b703ac3e3fe..bccf738b017 100644 --- a/src/Samples/VisualBasic/RemoveByVal/Impl/project.json +++ b/src/Samples/VisualBasic/RemoveByVal/Impl/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net46": {} diff --git a/src/Samples/VisualBasic/RemoveByVal/Test/project.json b/src/Samples/VisualBasic/RemoveByVal/Test/project.json index 874b88d72f6..21d0de3a5c4 100644 --- a/src/Samples/VisualBasic/RemoveByVal/Test/project.json +++ b/src/Samples/VisualBasic/RemoveByVal/Test/project.json @@ -1,7 +1,5 @@ { "dependencies": { - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0", "xunit": "2.1.0", "xunit.runner.console": "2.1.0" }, diff --git a/src/Samples/VisualBasic/TreeTransforms/project.json b/src/Samples/VisualBasic/TreeTransforms/project.json index 0f19a1cebce..2cc458a3428 100644 --- a/src/Samples/VisualBasic/TreeTransforms/project.json +++ b/src/Samples/VisualBasic/TreeTransforms/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "Microsoft.Composition": "1.0.27", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" + "Microsoft.Composition": "1.0.27" }, "frameworks": { "net452": {} diff --git a/src/Scripting/Core/project.json b/src/Scripting/Core/project.json index 62eea8522a9..94c1316e314 100644 --- a/src/Scripting/Core/project.json +++ b/src/Scripting/Core/project.json @@ -3,7 +3,6 @@ "Microsoft.NETCore.Portable.Compatibility": "1.0.0", "System.AppContext": "4.0.0", "System.Collections": "4.0.10", - "System.Collections.Immutable": "1.1.37", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.StackTrace": "4.0.0", "System.Diagnostics.Tools": "4.0.0", diff --git a/src/Test/PdbUtilities/PdbUtilities.csproj b/src/Test/PdbUtilities/PdbUtilities.csproj index 95efc59822a..9f18b42bbe2 100644 --- a/src/Test/PdbUtilities/PdbUtilities.csproj +++ b/src/Test/PdbUtilities/PdbUtilities.csproj @@ -139,6 +139,18 @@ {f83343ba-b4ea-451c-b6db-5d645e6171bc} Microsoft.DiaSymReader.PortablePdb + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + + + {030f8ab1-d06d-4526-adec-8e6010899c71} + Immutable + + + {b36c94c7-f34c-43bc-8834-0b9eea6dd4df} + Metadata + diff --git a/src/Test/PdbUtilities/project.json b/src/Test/PdbUtilities/project.json index 272910e1062..6ca5022ac1d 100644 --- a/src/Test/PdbUtilities/project.json +++ b/src/Test/PdbUtilities/project.json @@ -1,10 +1,7 @@ { "supports": {}, "dependencies": { - "Microsoft.DiaSymReader": "1.0.7", - "Microsoft.DiaSymReader.Native": "1.3.3", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" + "Microsoft.DiaSymReader.Native": "1.3.3" }, "frameworks": { ".NETPortable,Version=v4.5,Profile=Profile7": {} diff --git a/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj b/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj index 0a8e7a710ac..59a2b8f3145 100644 --- a/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj +++ b/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj @@ -30,6 +30,10 @@ {7FE6B002-89D8-4298-9B1B-0B5C247DD1FD} CompilerTestResources + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + {F7712928-1175-47B3-8819-EE086753DEE2} TestUtilities.FX45 diff --git a/src/Test/Utilities/Desktop/project.json b/src/Test/Utilities/Desktop/project.json index 45400319a73..31439123834 100644 --- a/src/Test/Utilities/Desktop/project.json +++ b/src/Test/Utilities/Desktop/project.json @@ -1,10 +1,7 @@ { "dependencies": { "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04", - "Microsoft.DiaSymReader": "1.0.7", - "Microsoft.DiaSymReader.Native": "1.3.3", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0", + "Microsoft.DiaSymReader.Native": "1.3.3", "xunit": "2.1.0" }, "frameworks": { diff --git a/src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj b/src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj index 3a39a04f81f..358a34394df 100644 --- a/src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj +++ b/src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj @@ -19,6 +19,10 @@ true + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} PdbUtilities @@ -125,4 +129,4 @@ - + \ No newline at end of file diff --git a/src/Test/Utilities/Portable.FX45/project.json b/src/Test/Utilities/Portable.FX45/project.json index 14959e3c6dd..c5b44aa554d 100644 --- a/src/Test/Utilities/Portable.FX45/project.json +++ b/src/Test/Utilities/Portable.FX45/project.json @@ -1,9 +1,6 @@ { "dependencies": { "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04", - "Microsoft.DiaSymReader": "1.0.7", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0", "xunit": "2.1.0" }, "frameworks": { diff --git a/src/Test/Utilities/Portable/project.json b/src/Test/Utilities/Portable/project.json index 9d29b3c13ce..930cb5c57f5 100644 --- a/src/Test/Utilities/Portable/project.json +++ b/src/Test/Utilities/Portable/project.json @@ -3,8 +3,7 @@ "Microsoft.CSharp": "4.0.0", "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931", "Microsoft.NETCore.Portable.Compatibility": "1.0.0", - "System.Collections.Concurrent": "4.0.10", - "System.Collections.Immutable": "1.1.37", + "System.Collections.Concurrent": "4.0.10", "System.Console": "4.0.0-rc2-23931", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", diff --git a/src/Tools/BuildUtil/BuildUtil.sln b/src/Tools/BuildUtil/BuildUtil.sln index 0ff0fbe222a..c1e077a393c 100644 --- a/src/Tools/BuildUtil/BuildUtil.sln +++ b/src/Tools/BuildUtil/BuildUtil.sln @@ -1,10 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildUtil", "BuildUtil\BuildUtil.csproj", "{0792DC0A-6F5A-44E8-BB08-0A8241083E38}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{EC7D1C78-30D7-43E5-AED4-1F58D15366D3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Immutable", "..\..\Dependencies\Immutable\Immutable.csproj", "{030F8AB1-D06D-4526-ADEC-8E6010899C71}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,8 +19,15 @@ Global {0792DC0A-6F5A-44E8-BB08-0A8241083E38}.Debug|Any CPU.Build.0 = Debug|Any CPU {0792DC0A-6F5A-44E8-BB08-0A8241083E38}.Release|Any CPU.ActiveCfg = Release|Any CPU {0792DC0A-6F5A-44E8-BB08-0A8241083E38}.Release|Any CPU.Build.0 = Release|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Debug|Any CPU.Build.0 = Debug|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Any CPU.ActiveCfg = Release|Any CPU + {030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {030F8AB1-D06D-4526-ADEC-8E6010899C71} = {EC7D1C78-30D7-43E5-AED4-1F58D15366D3} + EndGlobalSection EndGlobal diff --git a/src/Tools/BuildUtil/BuildUtil/BuildUtil.csproj b/src/Tools/BuildUtil/BuildUtil/BuildUtil.csproj index ab0720d1c1a..a65215e3c90 100644 --- a/src/Tools/BuildUtil/BuildUtil/BuildUtil.csproj +++ b/src/Tools/BuildUtil/BuildUtil/BuildUtil.csproj @@ -56,5 +56,11 @@ + + + {030f8ab1-d06d-4526-adec-8e6010899c71} + Immutable + + \ No newline at end of file diff --git a/src/Tools/BuildUtil/BuildUtil/project.json b/src/Tools/BuildUtil/BuildUtil/project.json index 7930d2cb3ba..1d686900ce1 100644 --- a/src/Tools/BuildUtil/BuildUtil/project.json +++ b/src/Tools/BuildUtil/BuildUtil/project.json @@ -9,8 +9,7 @@ "Microsoft.Build.Utilities.Core": "0.1.0-preview-00005", "Microsoft.NETCore": "5.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.0", - "NuSpec.ReferenceGenerator": "1.4.2", - "System.Collections.Immutable": "1.1.37" + "NuSpec.ReferenceGenerator": "1.4.2" }, "frameworks": { "dotnet": {} diff --git a/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj b/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj index a8f6f29ae9b..2f9046090c8 100644 --- a/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj +++ b/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj @@ -52,6 +52,16 @@ Resources.Designer.cs + + + {030f8ab1-d06d-4526-adec-8e6010899c71} + Immutable + + + {b36c94c7-f34c-43bc-8834-0b9eea6dd4df} + Metadata + + diff --git a/src/Tools/ProcessWatchdog/project.json b/src/Tools/ProcessWatchdog/project.json index db17ffb6fbd..96ad4a337d7 100644 --- a/src/Tools/ProcessWatchdog/project.json +++ b/src/Tools/ProcessWatchdog/project.json @@ -1,8 +1,6 @@ { "dependencies": { - "CommandLineParser": "2.0.273-beta", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0-rc2-23826" + "CommandLineParser": "2.0.273-beta" }, "frameworks": { "net45": {} diff --git a/src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj b/src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj index be15756eb38..126713df639 100644 --- a/src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj +++ b/src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj @@ -27,6 +27,10 @@ + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + {afde6bea-5038-4a4a-a88e-dbd2e4088eed} PdbUtilities diff --git a/src/Tools/Source/Pdb2Xml/project.json b/src/Tools/Source/Pdb2Xml/project.json index 7d5e4365488..5af945ff510 100644 --- a/src/Tools/Source/Pdb2Xml/project.json +++ b/src/Tools/Source/Pdb2Xml/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "Microsoft.DiaSymReader": "1.0.7" }, "frameworks": { "net45": {} diff --git a/src/Tools/Source/RunTests/RunTests.csproj b/src/Tools/Source/RunTests/RunTests.csproj index 4af7597be15..e12db352f92 100644 --- a/src/Tools/Source/RunTests/RunTests.csproj +++ b/src/Tools/Source/RunTests/RunTests.csproj @@ -50,6 +50,16 @@ + + + {030f8ab1-d06d-4526-adec-8e6010899c71} + Immutable + + + {b36c94c7-f34c-43bc-8834-0b9eea6dd4df} + Metadata + + diff --git a/src/Tools/Source/RunTests/project.json b/src/Tools/Source/RunTests/project.json index 028b8f438a0..2afc539b6d8 100644 --- a/src/Tools/Source/RunTests/project.json +++ b/src/Tools/Source/RunTests/project.json @@ -1,9 +1,7 @@ { "dependencies": { "Newtonsoft.Json": "8.0.2", - "RestSharp": "105.2.3", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" + "RestSharp": "105.2.3" }, "frameworks": { "net45": { } diff --git a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj index 963a6a1fd1a..b299d58acba 100644 --- a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj +++ b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj @@ -206,6 +206,10 @@ {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C} CodeAnalysis + + {27b7a354-80cc-4bac-abf5-d4081056cea9} + DiaSymReader + {2e87fa96-50bb-4607-8676-46521599f998} Workspaces.Desktop @@ -826,4 +830,4 @@ - + \ No newline at end of file diff --git a/src/VisualStudio/Core/Def/project.json b/src/VisualStudio/Core/Def/project.json index b5d4e89fc51..6c29aa7036c 100644 --- a/src/VisualStudio/Core/Def/project.json +++ b/src/VisualStudio/Core/Def/project.json @@ -2,7 +2,6 @@ "dependencies": { "ManagedEsent": "1.9.2.0", "Microsoft.Composition": "1.0.27", - "Microsoft.DiaSymReader": "1.0.7-beta1-51221", "Microsoft.CodeAnalysis.Elfie": "0.10.6-rc2", "Microsoft.VisualStudio.Shell.Immutable.14.0": "14.1.24720", "NuGet.VisualStudio": { "version": "3.3.0", "suppressParent": "all" }, -- GitLab