From b00224e7e5e86d617aec1744c7974ea88d0b961b Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Thu, 5 Nov 2015 15:48:02 -0800 Subject: [PATCH] Moved to a shared source project --- Compilers.sln | 29 +--- .../CommandLine/CSharpCommandLineTest.csproj | 4 - src/Compilers/Server/Core/ServerCore.csproj | 63 -------- src/Compilers/Server/Core/project.json | 12 -- src/Compilers/Server/Core/project.lock.json | 145 ------------------ .../PortableServer/PortableServer.csproj | 10 +- .../BuildProtocolUtil.cs | 0 .../CSharpCompilerServer.cs | 0 .../CompilerRunHandler.cs | 0 .../ICompilerServerHost.cs | 0 .../{Core => ServerShared}/MetadataCache.cs | 0 .../ServerShared/ServerShared.projitems | 19 +++ .../Server/ServerShared/ServerShared.shproj | 21 +++ .../VisualBasicCompilerServer.cs | 0 .../Server/VBCSCompiler/VBCSCompiler.csproj | 10 +- .../CommandLine/BasicCommandLineTest.vbproj | 4 - 16 files changed, 54 insertions(+), 263 deletions(-) delete mode 100644 src/Compilers/Server/Core/ServerCore.csproj delete mode 100644 src/Compilers/Server/Core/project.json delete mode 100644 src/Compilers/Server/Core/project.lock.json rename src/Compilers/Server/{Shared => ServerShared}/BuildProtocolUtil.cs (100%) rename src/Compilers/Server/{Core => ServerShared}/CSharpCompilerServer.cs (100%) rename src/Compilers/Server/{Core => ServerShared}/CompilerRunHandler.cs (100%) rename src/Compilers/Server/{Core => ServerShared}/ICompilerServerHost.cs (100%) rename src/Compilers/Server/{Core => ServerShared}/MetadataCache.cs (100%) create mode 100644 src/Compilers/Server/ServerShared/ServerShared.projitems create mode 100644 src/Compilers/Server/ServerShared/ServerShared.shproj rename src/Compilers/Server/{Core => ServerShared}/VisualBasicCompilerServer.cs (100%) diff --git a/Compilers.sln b/Compilers.sln index 041107504055c..8b4d2a49d4de9 100644 --- a/Compilers.sln +++ b/Compilers.sln @@ -107,21 +107,24 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CommandLine", "src\Compiler EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortableServer", "src\Compilers\Server\PortableServer\PortableServer.csproj", "{06B26DCB-7A12-48EF-AE50-708593ABD05F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerCore", "src\Compilers\Server\Core\ServerCore.csproj", "{9929E5AE-85CA-46A8-A500-3BE7BC634D87}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ServerShared", "src\Compilers\Server\ServerShared\ServerShared.shproj", "{32691768-AF9C-4CAE-9D0F-10721091B9AA}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4 + src\Compilers\Server\ServerShared\ServerShared.projitems*{32691768-af9c-4cae-9d0f-10721091b9aa}*SharedItemsImports = 13 src\Compilers\Core\CommandLine\CommandLine.projitems*{8ce3a581-2969-4864-a803-013e9d977c3a}*SharedItemsImports = 4 src\Test\Utilities\Shared\TestUtilities.projitems*{6ff42825-5464-4151-ac55-ed828168c192}*SharedItemsImports = 13 src\Compilers\Core\CommandLine\CommandLine.projitems*{ad6f474e-e6d4-4217-91f3-b7af1be31ccc}*SharedItemsImports = 13 src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13 src\Compilers\Core\CommandLine\CommandLine.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4 + src\Compilers\Server\ServerShared\ServerShared.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4 src\Compilers\Core\CommandLine\CommandLine.projitems*{e58ee9d7-1239-4961-a0c1-f9ec3952c4c1}*SharedItemsImports = 4 src\Compilers\Core\CommandLine\CommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 4 + src\Compilers\Server\ServerShared\ServerShared.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 4 src\Compilers\Core\SharedCollections\SharedCollections.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*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\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*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 @@ -899,26 +902,6 @@ Global {06B26DCB-7A12-48EF-AE50-708593ABD05F}.Release|x64.ActiveCfg = Release|x64 {06B26DCB-7A12-48EF-AE50-708593ABD05F}.Release|x64.Build.0 = Release|x64 {06B26DCB-7A12-48EF-AE50-708593ABD05F}.Release|x86.ActiveCfg = Release|x64 - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Debug|ARM.ActiveCfg = Debug|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Debug|ARM.Build.0 = Debug|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Debug|x64.ActiveCfg = Debug|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Debug|x64.Build.0 = Debug|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Debug|x86.ActiveCfg = Debug|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Debug|x86.Build.0 = Debug|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Release|Any CPU.Build.0 = Release|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Release|ARM.ActiveCfg = Release|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Release|ARM.Build.0 = Release|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Release|x64.ActiveCfg = Release|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Release|x64.Build.0 = Release|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Release|x86.ActiveCfg = Release|Any CPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -967,6 +950,6 @@ Global {0835A7FB-C472-4F7D-A500-F9FD072CFF21} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37} {AD6F474E-E6D4-4217-91F3-B7AF1BE31CCC} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9} {06B26DCB-7A12-48EF-AE50-708593ABD05F} = {E35DA3D1-16C0-4318-9187-6B664F12A870} - {9929E5AE-85CA-46A8-A500-3BE7BC634D87} = {E35DA3D1-16C0-4318-9187-6B664F12A870} + {32691768-AF9C-4CAE-9D0F-10721091B9AA} = {E35DA3D1-16C0-4318-9187-6B664F12A870} EndGlobalSection EndGlobal diff --git a/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj b/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj index 50c9f8159d5c8..9bdd45232b0b1 100644 --- a/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj +++ b/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj @@ -17,10 +17,6 @@ v4.5 - - {9929e5ae-85ca-46a8-a500-3be7bc634d87} - ServerCore - {4B45CA0C-03A0-400F-B454-3D4BCB16AF38} csc diff --git a/src/Compilers/Server/Core/ServerCore.csproj b/src/Compilers/Server/Core/ServerCore.csproj deleted file mode 100644 index 5a58b66c9f224..0000000000000 --- a/src/Compilers/Server/Core/ServerCore.csproj +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - Debug - AnyCPU - {9929E5AE-85CA-46A8-A500-3BE7BC634D87} - Library - Microsoft.CodeAnalysis.CompilerServer - Microsoft.CodeAnalysis.CompilerServer - ..\..\..\..\ - v4.5 - Profile7 - .NETPortable - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - true - - - false - AnyCPU - false - - - false - AnyCPU - false - - - - - - - - - - - - {1ee8cad3-55f9-4d91-96b2-084641da9a6c} - CodeAnalysis - - - {b501a547-c911-4a05-ac6e-274a50dff30e} - CSharpCodeAnalysis - - - {2523d0e6-df32-4a3e-8ae0-a19bffae2ef6} - BasicCodeAnalysis - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Compilers/Server/Core/project.json b/src/Compilers/Server/Core/project.json deleted file mode 100644 index 197cec5410f63..0000000000000 --- a/src/Compilers/Server/Core/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - ".NETPortable,Version=v4.5,Profile=Profile7": {} - }, - "runtimes": { - "win7": { }, - "win7-anycpu": { }, - "ubuntu.14.04": { }, - "ubuntu.14.04-anycpu": { } - } -} diff --git a/src/Compilers/Server/Core/project.lock.json b/src/Compilers/Server/Core/project.lock.json deleted file mode 100644 index cf4cf88048d6b..0000000000000 --- a/src/Compilers/Server/Core/project.lock.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "locked": false, - "version": 1, - "targets": { - ".NETPortable,Version=v4.5,Profile=Profile7": { - "System.Collections.Immutable/1.1.37": { - "compile": { - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} - } - }, - "System.Reflection.Metadata/1.1.0": { - "dependencies": { - "System.Collections.Immutable": "[1.1.37, )" - }, - "compile": { - "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} - }, - "runtime": { - "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} - } - } - }, - ".NETPortable,Version=v4.5,Profile=Profile7/ubuntu.14.04": { - "System.Collections.Immutable/1.1.37": { - "compile": { - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} - } - }, - "System.Reflection.Metadata/1.1.0": { - "dependencies": { - "System.Collections.Immutable": "[1.1.37, )" - }, - "compile": { - "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} - }, - "runtime": { - "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} - } - } - }, - ".NETPortable,Version=v4.5,Profile=Profile7/ubuntu.14.04-anycpu": { - "System.Collections.Immutable/1.1.37": { - "compile": { - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} - } - }, - "System.Reflection.Metadata/1.1.0": { - "dependencies": { - "System.Collections.Immutable": "[1.1.37, )" - }, - "compile": { - "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} - }, - "runtime": { - "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} - } - } - }, - ".NETPortable,Version=v4.5,Profile=Profile7/win7": { - "System.Collections.Immutable/1.1.37": { - "compile": { - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} - } - }, - "System.Reflection.Metadata/1.1.0": { - "dependencies": { - "System.Collections.Immutable": "[1.1.37, )" - }, - "compile": { - "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} - }, - "runtime": { - "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} - } - } - }, - ".NETPortable,Version=v4.5,Profile=Profile7/win7-anycpu": { - "System.Collections.Immutable/1.1.37": { - "compile": { - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} - }, - "runtime": { - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll": {} - } - }, - "System.Reflection.Metadata/1.1.0": { - "dependencies": { - "System.Collections.Immutable": "[1.1.37, )" - }, - "compile": { - "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} - }, - "runtime": { - "lib/portable-net45+win8/System.Reflection.Metadata.dll": {} - } - } - } - }, - "libraries": { - "System.Collections.Immutable/1.1.37": { - "sha512": "fTpqwZYBzoklTT+XjTRK8KxvmrGkYHzBiylCcKyQcxiOM8k+QvhNBxRvFHDWzy4OEP5f8/9n+xQ9mEgEXY+muA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet/System.Collections.Immutable.dll", - "lib/dotnet/System.Collections.Immutable.xml", - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll", - "lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.xml", - "package/services/metadata/core-properties/a02fdeabe1114a24bba55860b8703852.psmdcp", - "System.Collections.Immutable.nuspec" - ] - }, - "System.Reflection.Metadata/1.1.0": { - "sha512": "a8VsRm/B0Ik1o5FumSMWmpwbG7cvIIajAYhzTTy9VB9XItByJDQHGZkQTIAdsvVJ6MI5O3uH/lb0izgQDlDIWA==", - "type": "Package", - "files": [ - "[Content_Types].xml", - "_rels/.rels", - "lib/dotnet5.2/System.Reflection.Metadata.dll", - "lib/dotnet5.2/System.Reflection.Metadata.xml", - "lib/portable-net45+win8/System.Reflection.Metadata.dll", - "lib/portable-net45+win8/System.Reflection.Metadata.xml", - "package/services/metadata/core-properties/644d6c945e3d43e2806bf6892201a6ef.psmdcp", - "System.Reflection.Metadata.nuspec" - ] - } - }, - "projectFileDependencyGroups": { - "": [], - ".NETPortable,Version=v4.5,Profile=Profile7": [] - } -} diff --git a/src/Compilers/Server/PortableServer/PortableServer.csproj b/src/Compilers/Server/PortableServer/PortableServer.csproj index 3cd25f1ac70f5..edba323cf7005 100644 --- a/src/Compilers/Server/PortableServer/PortableServer.csproj +++ b/src/Compilers/Server/PortableServer/PortableServer.csproj @@ -35,6 +35,10 @@ {B501A547-C911-4A05-AC6E-274A50DFF30E} CSharpCodeAnalysis + + {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6} + BasicCodeAnalysis + true @@ -65,16 +69,14 @@ AnalyzerAssemblyLoadUtils.cs - - BuildProtocolUtil.cs - + - \ No newline at end of file + diff --git a/src/Compilers/Server/Shared/BuildProtocolUtil.cs b/src/Compilers/Server/ServerShared/BuildProtocolUtil.cs similarity index 100% rename from src/Compilers/Server/Shared/BuildProtocolUtil.cs rename to src/Compilers/Server/ServerShared/BuildProtocolUtil.cs diff --git a/src/Compilers/Server/Core/CSharpCompilerServer.cs b/src/Compilers/Server/ServerShared/CSharpCompilerServer.cs similarity index 100% rename from src/Compilers/Server/Core/CSharpCompilerServer.cs rename to src/Compilers/Server/ServerShared/CSharpCompilerServer.cs diff --git a/src/Compilers/Server/Core/CompilerRunHandler.cs b/src/Compilers/Server/ServerShared/CompilerRunHandler.cs similarity index 100% rename from src/Compilers/Server/Core/CompilerRunHandler.cs rename to src/Compilers/Server/ServerShared/CompilerRunHandler.cs diff --git a/src/Compilers/Server/Core/ICompilerServerHost.cs b/src/Compilers/Server/ServerShared/ICompilerServerHost.cs similarity index 100% rename from src/Compilers/Server/Core/ICompilerServerHost.cs rename to src/Compilers/Server/ServerShared/ICompilerServerHost.cs diff --git a/src/Compilers/Server/Core/MetadataCache.cs b/src/Compilers/Server/ServerShared/MetadataCache.cs similarity index 100% rename from src/Compilers/Server/Core/MetadataCache.cs rename to src/Compilers/Server/ServerShared/MetadataCache.cs diff --git a/src/Compilers/Server/ServerShared/ServerShared.projitems b/src/Compilers/Server/ServerShared/ServerShared.projitems new file mode 100644 index 0000000000000..fd8d23b008154 --- /dev/null +++ b/src/Compilers/Server/ServerShared/ServerShared.projitems @@ -0,0 +1,19 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 32691768-af9c-4cae-9d0f-10721091b9aa + + + CommandLine + + + + + + + + + + \ No newline at end of file diff --git a/src/Compilers/Server/ServerShared/ServerShared.shproj b/src/Compilers/Server/ServerShared/ServerShared.shproj new file mode 100644 index 0000000000000..2cb7402c081db --- /dev/null +++ b/src/Compilers/Server/ServerShared/ServerShared.shproj @@ -0,0 +1,21 @@ + + + + 32691768-af9c-4cae-9d0f-10721091b9aa + 14.0 + + + + + + + + diff --git a/src/Compilers/Server/Core/VisualBasicCompilerServer.cs b/src/Compilers/Server/ServerShared/VisualBasicCompilerServer.cs similarity index 100% rename from src/Compilers/Server/Core/VisualBasicCompilerServer.cs rename to src/Compilers/Server/ServerShared/VisualBasicCompilerServer.cs diff --git a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj index c674273ab7a96..daab5f08f12e4 100644 --- a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj +++ b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj @@ -31,10 +31,6 @@ {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C} CodeAnalysis - - {9929e5ae-85ca-46a8-a500-3be7bc634d87} - ServerCore - false @@ -61,9 +57,6 @@ ShadowCopyAnalyzerAssemblyLoader.cs - - BuildProtocolUtil.cs - @@ -87,7 +80,8 @@ + - \ No newline at end of file + diff --git a/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj b/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj index 18a09d7ebf9f0..d3238b18f626f 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj +++ b/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj @@ -22,10 +22,6 @@ {76C6F005-C89D-4348-BB4A-391898DBEB52} TestUtilities.Desktop - - {9929e5ae-85ca-46a8-a500-3be7bc634d87} - ServerCore - {9508F118-F62E-4C16-A6F4-7C3B56E166AD} VBCSCompiler