提交 4aef0b06 编写于 作者: D David Kean

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.
上级 bddb4827
...@@ -334,6 +334,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployCompilerGeneratorTool ...@@ -334,6 +334,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployCompilerGeneratorTool
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonCoreClrRuntime", "src\Tools\CommonCoreClrRuntime\CommonCoreClrRuntime.csproj", "{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonCoreClrRuntime", "src\Tools\CommonCoreClrRuntime\CommonCoreClrRuntime.csproj", "{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}"
EndProject 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 Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4 src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4
...@@ -366,18 +377,18 @@ Global ...@@ -366,18 +377,18 @@ Global
src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d3}*SharedItemsImports = 4 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\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\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\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\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\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\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\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\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\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\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\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 src\Compilers\Core\CommandLine\CommandLine.projitems*{e3cd2895-76a8-4d11-a316-ea67cb5ea42c}*SharedItemsImports = 4
EndGlobalSection EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
...@@ -2861,6 +2872,66 @@ Global ...@@ -2861,6 +2872,66 @@ Global
{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|x64.ActiveCfg = Release|x64 {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|x64.Build.0 = Release|x64
{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|x86.ActiveCfg = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -3016,5 +3087,8 @@ Global ...@@ -3016,5 +3087,8 @@ Global
{1553DE60-A2B0-4FAF-B1B8-C0A7313781CC} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} {1553DE60-A2B0-4FAF-B1B8-C0A7313781CC} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B} = {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} {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 EndGlobalSection
EndGlobal EndGlobal
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<PropertyGroup>
<TargetPath></TargetPath> <!-- Prevent projects referencing this from trying to pass us to the compiler -->
</PropertyGroup>
<Target Name="CoreCompile" /> <!-- Prevent Csc from being called -->
<Target Name="CopyFilesToOutputDirectory" /> <!-- Prevent non-existent output from being copied -->
<Target Name="GenerateTargetFrameworkMonikerAttribute" /> <!-- Don't generate TFM attribute -->
<Target Name="RuntimeImplementationProjectOutputGroup" /> <!-- Group always attempts resolve runtime, regardless of <CopyNuGetImplementations>-->
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<CopyNuGetImplementations>false</CopyNuGetImplementations>
<UseCommonOutputDirectory>true</UseCommonOutputDirectory>
<OutputPath>bin</OutputPath>
<OutputType>Library</OutputType>
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
</PropertyGroup>
</Project>
\ No newline at end of file
...@@ -16,6 +16,10 @@ ...@@ -16,6 +16,10 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\PdbUtilities\PdbUtilities.csproj"> <ProjectReference Include="..\..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
<Project>{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}</Project> <Project>{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}</Project>
<Name>PdbUtilities</Name> <Name>PdbUtilities</Name>
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"Moq": "4.2.1402.2112", "Moq": "4.2.1402.2112",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
......
...@@ -785,6 +785,16 @@ ...@@ -785,6 +785,16 @@
<PublicAPI Include="PublicAPI.Shipped.txt" /> <PublicAPI Include="PublicAPI.Shipped.txt" />
<PublicAPI Include="PublicAPI.Unshipped.txt" /> <PublicAPI Include="PublicAPI.Unshipped.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Dependencies\Immutable\Immutable.csproj">
<Project>{030f8ab1-d06d-4526-adec-8e6010899c71}</Project>
<Name>Immutable</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Dependencies\Metadata\Metadata.csproj">
<Project>{b36c94c7-f34c-43bc-8834-0b9eea6dd4df}</Project>
<Name>Metadata</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\AnalyzerDriver\AnalyzerDriver.projitems" Label="Shared" /> <Import Project="..\AnalyzerDriver\AnalyzerDriver.projitems" Label="Shared" />
<Import Project="..\SharedCollections\SharedCollections.projitems" Label="Shared" /> <Import Project="..\SharedCollections\SharedCollections.projitems" Label="Shared" />
<ImportGroup Label="Targets"> <ImportGroup Label="Targets">
......
{ {
"supports": {}, "supports": {},
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {} ".NETPortable,Version=v4.5,Profile=Profile7": {}
......
...@@ -83,4 +83,4 @@ ...@@ -83,4 +83,4 @@
<ImportGroup Label="Targets"> <ImportGroup Label="Targets">
<Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
</ImportGroup> </ImportGroup>
</Project> </Project>
\ No newline at end of file
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0",
}, },
"frameworks": { "frameworks": {
"net45": { } "net45": { }
......
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\..\CSharp\csc\csc.csproj"> <ProjectReference Include="..\..\CSharp\csc\csc.csproj">
<Project>{4b45ca0c-03a0-400f-b454-3d4bcb16af38}</Project> <Project>{4b45ca0c-03a0-400f-b454-3d4bcb16af38}</Project>
<Name>csc</Name> <Name>csc</Name>
...@@ -127,4 +131,4 @@ ...@@ -127,4 +131,4 @@
<Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
<Import Project="..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" /> <Import Project="..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
</ImportGroup> </ImportGroup>
</Project> </Project>
\ No newline at end of file
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"Moq": "4.2.1402.2112", "Moq": "4.2.1402.2112",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
......
...@@ -14,6 +14,10 @@ ...@@ -14,6 +14,10 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\PdbUtilities\PdbUtilities.csproj"> <ProjectReference Include="..\..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
<Project>{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}</Project> <Project>{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}</Project>
<Name>PdbUtilities</Name> <Name>PdbUtilities</Name>
...@@ -260,4 +264,4 @@ ...@@ -260,4 +264,4 @@
<Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
<Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" /> <Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
</ImportGroup> </ImportGroup>
</Project> </Project>
\ No newline at end of file
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
...@@ -94,6 +94,20 @@ ...@@ -94,6 +94,20 @@
<ItemGroup> <ItemGroup>
<InternalsVisibleToTest Include="Microsoft.DiaSymReader.PortablePdb.UnitTests" /> <InternalsVisibleToTest Include="Microsoft.DiaSymReader.PortablePdb.UnitTests" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\..\Dependencies\Immutable\Immutable.csproj">
<Project>{030f8ab1-d06d-4526-adec-8e6010899c71}</Project>
<Name>Immutable</Name>
</ProjectReference>
<ProjectReference Include="..\..\Dependencies\Metadata\Metadata.csproj">
<Project>{b36c94c7-f34c-43bc-8834-0b9eea6dd4df}</Project>
<Name>Metadata</Name>
</ProjectReference>
</ItemGroup>
<ImportGroup Label="Targets"> <ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
</ImportGroup> </ImportGroup>
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {} ".NETPortable,Version=v4.5,Profile=Profile7": {}
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\build\Targets\ProducesNoOutput.Settings.targets" />
<PropertyGroup>
<ProjectGuid>D2B8B03E-A85D-48A2-818F-9177D89586A9</ProjectGuid>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
<ItemGroup>
<Content Include="project.json" />
</ItemGroup>
<Import Project="..\..\..\build\Targets\ProducesNoOutput.Imports.targets" />
</Project>
\ No newline at end of file
{
"supports": {},
"dependencies": {
"Microsoft.DiaSymReader": "1.0.7"
},
"frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {}
}
}
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\build\Targets\ProducesNoOutput.Settings.targets" />
<PropertyGroup>
<ProjectGuid>DCDA908D-EF5E-494B-ADDC-C26F5FD610CA</ProjectGuid>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
<ItemGroup>
<Content Include="project.json" />
</ItemGroup>
<Import Project="..\..\..\build\Targets\ProducesNoOutput.Imports.targets" />
</Project>
\ No newline at end of file
{
"supports": {},
"dependencies": {
"System.Collections.Immutable": "1.1.37"
},
"frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {}
}
}
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\build\Targets\ProducesNoOutput.Settings.targets" />
<PropertyGroup>
<ProjectGuid>E6796B97-D5C6-45B2-AE46-351D15DCFC71</ProjectGuid>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
<ItemGroup>
<Content Include="project.json" />
</ItemGroup>
<Import Project="..\..\..\build\Targets\ProducesNoOutput.Imports.targets" />
</Project>
\ No newline at end of file
{
"supports": {},
"dependencies": {
"System.Reflection.Metadata": "1.2.0"
},
"frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {}
}
}
\ No newline at end of file
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
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
<Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project> <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
<Name>CodeAnalysis</Name> <Name>CodeAnalysis</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Dependencies\Immutable\Immutable.csproj">
<Project>{030f8ab1-d06d-4526-adec-8e6010899c71}</Project>
<Name>Immutable</Name>
</ProjectReference>
<ProjectReference Include="..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj"> <ProjectReference Include="..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
<Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project> <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
<Name>Workspaces.Desktop</Name> <Name>Workspaces.Desktop</Name>
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37"
}, },
"frameworks": { "frameworks": {
"net46": {} "net46": {}
......
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
<Project>{7a4b2176-7bfd-4b75-a61a-e25a1fdd0a1e}</Project> <Project>{7a4b2176-7bfd-4b75-a61a-e25a1fdd0a1e}</Project>
<Name>CSharpCompilerTestUtilities.Desktop</Name> <Name>CSharpCompilerTestUtilities.Desktop</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj"> <ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project> <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name> <Name>TestUtilities.FX45</Name>
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
...@@ -70,6 +70,10 @@ ...@@ -70,6 +70,10 @@
<Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" /> <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\Concord\Concord.csproj"> <ProjectReference Include="..\Concord\Concord.csproj">
<Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project> <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
<Name>Concord</Name> <Name>Concord</Name>
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7"
}, },
"frameworks": { "frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {} ".NETPortable,Version=v4.5,Profile=Profile7": {}
......
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
<Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" /> <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj"> <ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project> <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name> <Name>TestUtilities.FX45</Name>
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\..\Dependencies\Immutable\Immutable.csproj">
<Project>{030f8ab1-d06d-4526-adec-8e6010899c71}</Project>
<Name>Immutable</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj"> <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
<Project>{76c6f005-c89d-4348-bb4a-391898dbeb52}</Project> <Project>{76c6f005-c89d-4348-bb4a-391898dbeb52}</Project>
<Name>TestUtilities.Desktop</Name> <Name>TestUtilities.Desktop</Name>
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj"> <ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project> <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
<Name>TestUtilities.FX45</Name> <Name>TestUtilities.FX45</Name>
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {} ".NETPortable,Version=v4.5,Profile=Profile7": {}
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0",
"Microsoft.Composition": "1.0.27" "Microsoft.Composition": "1.0.27"
}, },
"frameworks": { "frameworks": {
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Reflection.Metadata": "1.2.0",
"System.Collections.Immutable": "1.1.37"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Reflection.Metadata": "1.2.0",
"System.Collections.Immutable": "1.1.37"
}, },
"frameworks": { "frameworks": {
"net46": {} "net46": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Reflection.Metadata": "1.2.0",
"System.Collections.Immutable": "1.1.37"
}, },
"frameworks": { "frameworks": {
"net46": {} "net46": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Reflection.Metadata": "1.2.0",
"System.Collections.Immutable": "1.1.37"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Reflection.Metadata": "1.2.0",
"System.Collections.Immutable": "1.1.37"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Reflection.Metadata": "1.2.0",
"System.Collections.Immutable": "1.1.37"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Reflection.Metadata": "1.2.0",
"System.Collections.Immutable": "1.1.37"
}, },
"frameworks": { "frameworks": {
"net46": {} "net46": {}
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.24720.0 VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "APISampleUnitTestsCS", "CSharp\APISampleUnitTests\APISampleUnitTestsCS.csproj", "{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "APISampleUnitTestsCS", "CSharp\APISampleUnitTests\APISampleUnitTestsCS.csproj", "{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}"
EndProject EndProject
...@@ -115,6 +115,15 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RemoveByValVB.UnitTests", " ...@@ -115,6 +115,15 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RemoveByValVB.UnitTests", "
EndProject EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TreeTransformsVB", "VisualBasic\TreeTransforms\TreeTransformsVB.vbproj", "{D89124D4-FB1D-4D08-BD95-F60BD24D5965}" Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TreeTransformsVB", "VisualBasic\TreeTransforms\TreeTransformsVB.vbproj", "{D89124D4-FB1D-4D08-BD95-F60BD24D5965}"
EndProject 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 Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -481,6 +490,30 @@ Global ...@@ -481,6 +490,30 @@ Global
{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Release|Mixed Platforms.Build.0 = Release|x86 {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.ActiveCfg = Release|x86
{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Release|x86.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -536,5 +569,7 @@ Global ...@@ -536,5 +569,7 @@ Global
{4900921D-C548-4FBB-9681-BAF88E09DB3C} = {B4EA92BD-CB82-465D-864C-0630A50CD40B} {4900921D-C548-4FBB-9681-BAF88E09DB3C} = {B4EA92BD-CB82-465D-864C-0630A50CD40B}
{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD} = {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} {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 EndGlobalSection
EndGlobal EndGlobal
{ {
"dependencies": { "dependencies": {
"Moq": "4.2.1402.2112", "Moq": "4.2.1402.2112",
"System.Collections.Immutable": "1.1.37",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {} ".NETPortable,Version=v4.5,Profile=Profile7": { }
} }
} }
\ No newline at end of file
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
"net46": {} "net46": {}
......
{ {
"dependencies": { "dependencies": {
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27"
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
"net452": {} "net452": {}
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"System.AppContext": "4.0.0", "System.AppContext": "4.0.0",
"System.Collections": "4.0.10", "System.Collections": "4.0.10",
"System.Collections.Immutable": "1.1.37",
"System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Debug": "4.0.10",
"System.Diagnostics.StackTrace": "4.0.0", "System.Diagnostics.StackTrace": "4.0.0",
"System.Diagnostics.Tools": "4.0.0", "System.Diagnostics.Tools": "4.0.0",
......
...@@ -139,6 +139,18 @@ ...@@ -139,6 +139,18 @@
<Project>{f83343ba-b4ea-451c-b6db-5d645e6171bc}</Project> <Project>{f83343ba-b4ea-451c-b6db-5d645e6171bc}</Project>
<Name>Microsoft.DiaSymReader.PortablePdb</Name> <Name>Microsoft.DiaSymReader.PortablePdb</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\..\Dependencies\Immutable\Immutable.csproj">
<Project>{030f8ab1-d06d-4526-adec-8e6010899c71}</Project>
<Name>Immutable</Name>
</ProjectReference>
<ProjectReference Include="..\..\Dependencies\Metadata\Metadata.csproj">
<Project>{b36c94c7-f34c-43bc-8834-0b9eea6dd4df}</Project>
<Name>Metadata</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="..\..\Compilers\Core\SharedCollections\SharedCollections.projitems" Label="Shared" /> <Import Project="..\..\Compilers\Core\SharedCollections\SharedCollections.projitems" Label="Shared" />
<ImportGroup Label="Targets"> <ImportGroup Label="Targets">
......
{ {
"supports": {}, "supports": {},
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7", "Microsoft.DiaSymReader.Native": "1.3.3"
"Microsoft.DiaSymReader.Native": "1.3.3",
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
".NETPortable,Version=v4.5,Profile=Profile7": {} ".NETPortable,Version=v4.5,Profile=Profile7": {}
......
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
<Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project> <Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
<Name>CompilerTestResources</Name> <Name>CompilerTestResources</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\Portable.FX45\TestUtilities.FX45.csproj"> <ProjectReference Include="..\Portable.FX45\TestUtilities.FX45.csproj">
<Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project> <Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
<Name>TestUtilities.FX45</Name> <Name>TestUtilities.FX45</Name>
......
{ {
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04", "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04",
"Microsoft.DiaSymReader": "1.0.7", "Microsoft.DiaSymReader.Native": "1.3.3",
"Microsoft.DiaSymReader.Native": "1.3.3",
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
<CopyNuGetImplementations>true</CopyNuGetImplementations> <CopyNuGetImplementations>true</CopyNuGetImplementations>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Project References"> <ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\..\PdbUtilities\PdbUtilities.csproj"> <ProjectReference Include="..\..\PdbUtilities\PdbUtilities.csproj">
<Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project> <Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
<Name>PdbUtilities</Name> <Name>PdbUtilities</Name>
...@@ -125,4 +129,4 @@ ...@@ -125,4 +129,4 @@
<Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
<Import Project="..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" /> <Import Project="..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
</ImportGroup> </ImportGroup>
</Project> </Project>
\ No newline at end of file
{ {
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04", "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" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
......
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
"Microsoft.CSharp": "4.0.0", "Microsoft.CSharp": "4.0.0",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23931", "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931",
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"System.Collections.Concurrent": "4.0.10", "System.Collections.Concurrent": "4.0.10",
"System.Collections.Immutable": "1.1.37",
"System.Console": "4.0.0-rc2-23931", "System.Console": "4.0.0-rc2-23931",
"System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Debug": "4.0.10",
"System.Diagnostics.Tools": "4.0.0", "System.Diagnostics.Tools": "4.0.0",
......
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.23107.0 VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildUtil", "BuildUtil\BuildUtil.csproj", "{0792DC0A-6F5A-44E8-BB08-0A8241083E38}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildUtil", "BuildUtil\BuildUtil.csproj", "{0792DC0A-6F5A-44E8-BB08-0A8241083E38}"
EndProject 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 Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -15,8 +19,15 @@ Global ...@@ -15,8 +19,15 @@ Global
{0792DC0A-6F5A-44E8-BB08-0A8241083E38}.Debug|Any CPU.Build.0 = Debug|Any CPU {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.ActiveCfg = Release|Any CPU
{0792DC0A-6F5A-44E8-BB08-0A8241083E38}.Release|Any CPU.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{030F8AB1-D06D-4526-ADEC-8E6010899C71} = {EC7D1C78-30D7-43E5-AED4-1F58D15366D3}
EndGlobalSection
EndGlobal EndGlobal
...@@ -56,5 +56,11 @@ ...@@ -56,5 +56,11 @@
<ItemGroup> <ItemGroup>
<Folder Include="Properties\" /> <Folder Include="Properties\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Dependencies\Immutable\Immutable.csproj">
<Project>{030f8ab1-d06d-4526-adec-8e6010899c71}</Project>
<Name>Immutable</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00005", "Microsoft.Build.Utilities.Core": "0.1.0-preview-00005",
"Microsoft.NETCore": "5.0.0", "Microsoft.NETCore": "5.0.0",
"Microsoft.NETCore.Portable.Compatibility": "1.0.0", "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
"NuSpec.ReferenceGenerator": "1.4.2", "NuSpec.ReferenceGenerator": "1.4.2"
"System.Collections.Immutable": "1.1.37"
}, },
"frameworks": { "frameworks": {
"dotnet": {} "dotnet": {}
......
...@@ -52,6 +52,16 @@ ...@@ -52,6 +52,16 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Dependencies\Immutable\Immutable.csproj">
<Project>{030f8ab1-d06d-4526-adec-8e6010899c71}</Project>
<Name>Immutable</Name>
</ProjectReference>
<ProjectReference Include="..\..\Dependencies\Metadata\Metadata.csproj">
<Project>{b36c94c7-f34c-43bc-8834-0b9eea6dd4df}</Project>
<Name>Metadata</Name>
</ProjectReference>
</ItemGroup>
<ImportGroup Label="Targets"> <ImportGroup Label="Targets">
<Import Project="..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
</ImportGroup> </ImportGroup>
......
{ {
"dependencies": { "dependencies": {
"CommandLineParser": "2.0.273-beta", "CommandLineParser": "2.0.273-beta"
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0-rc2-23826"
}, },
"frameworks": { "frameworks": {
"net45": {} "net45": {}
......
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
<Compile Include="PdbToXmlApp.cs" /> <Compile Include="PdbToXmlApp.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Test\PdbUtilities\PdbUtilities.csproj"> <ProjectReference Include="..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
<Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project> <Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
<Name>PdbUtilities</Name> <Name>PdbUtilities</Name>
......
{ {
"dependencies": { "dependencies": {
"Microsoft.DiaSymReader": "1.0.7"
}, },
"frameworks": { "frameworks": {
"net45": {} "net45": {}
......
...@@ -50,6 +50,16 @@ ...@@ -50,6 +50,16 @@
<ItemGroup> <ItemGroup>
<None Include="project.json" /> <None Include="project.json" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Dependencies\Immutable\Immutable.csproj">
<Project>{030f8ab1-d06d-4526-adec-8e6010899c71}</Project>
<Name>Immutable</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Dependencies\Metadata\Metadata.csproj">
<Project>{b36c94c7-f34c-43bc-8834-0b9eea6dd4df}</Project>
<Name>Metadata</Name>
</ProjectReference>
</ItemGroup>
<ImportGroup Label="Targets"> <ImportGroup Label="Targets">
<Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
</ImportGroup> </ImportGroup>
......
{ {
"dependencies": { "dependencies": {
"Newtonsoft.Json": "8.0.2", "Newtonsoft.Json": "8.0.2",
"RestSharp": "105.2.3", "RestSharp": "105.2.3"
"System.Collections.Immutable": "1.1.37",
"System.Reflection.Metadata": "1.2.0"
}, },
"frameworks": { "frameworks": {
"net45": { } "net45": { }
......
...@@ -206,6 +206,10 @@ ...@@ -206,6 +206,10 @@
<Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project> <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
<Name>CodeAnalysis</Name> <Name>CodeAnalysis</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
<Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
<Name>DiaSymReader</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj"> <ProjectReference Include="..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
<Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project> <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
<Name>Workspaces.Desktop</Name> <Name>Workspaces.Desktop</Name>
...@@ -826,4 +830,4 @@ ...@@ -826,4 +830,4 @@
<ImportGroup Label="Targets"> <ImportGroup Label="Targets">
<Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" /> <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
</ImportGroup> </ImportGroup>
</Project> </Project>
\ No newline at end of file
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"dependencies": { "dependencies": {
"ManagedEsent": "1.9.2.0", "ManagedEsent": "1.9.2.0",
"Microsoft.Composition": "1.0.27", "Microsoft.Composition": "1.0.27",
"Microsoft.DiaSymReader": "1.0.7-beta1-51221",
"Microsoft.CodeAnalysis.Elfie": "0.10.6-rc2", "Microsoft.CodeAnalysis.Elfie": "0.10.6-rc2",
"Microsoft.VisualStudio.Shell.Immutable.14.0": "14.1.24720", "Microsoft.VisualStudio.Shell.Immutable.14.0": "14.1.24720",
"NuGet.VisualStudio": { "version": "3.3.0", "suppressParent": "all" }, "NuGet.VisualStudio": { "version": "3.3.0", "suppressParent": "all" },
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册