From 43fbd9b5646653cc8edd65d4fba0556e13ea2808 Mon Sep 17 00:00:00 2001 From: Ashley Hauck Date: Wed, 13 Sep 2017 13:15:45 -0700 Subject: [PATCH] Multitarget csc vbc csi vbi, remove *Core projects --- Compilers.sln | 14 ---- CrossPlatform.sln | 28 ------- Roslyn.sln | 28 ------- build/Targets/Packages.props | 2 +- build/config/SignToolData.json | 16 ++-- build/scripts/build.ps1 | 11 +-- cibuild.sh | 8 +- docs/infrastructure/cross-platform.md | 2 +- src/Compilers/CSharp/CscCore/CscCore.csproj | 46 ---------- src/Compilers/CSharp/CscCore/Program.cs | 12 --- src/Compilers/CSharp/csc/Program.cs | 8 +- src/Compilers/CSharp/csc/csc.csproj | 14 +++- .../Extension/CompilerExtension.csproj | 2 + .../VBCSCompilerTests/CompilerServerTests.cs | 2 + .../Server/VBCSCompilerTests/ServerUtil.cs | 4 + .../VBCSCompilerTests.csproj | 8 +- .../Shared/CoreClrAnalyzerAssemblyLoader.cs | 6 +- src/Compilers/Shared/CoreClrBuildClient.cs | 10 ++- .../ShadowCopyAnalyzerAssemblyLoader.cs | 11 +-- src/Compilers/VisualBasic/VbcCore/Program.cs | 14 ---- .../VisualBasic/VbcCore/VbcCore.csproj | 48 ----------- src/Compilers/VisualBasic/vbc/Program.cs | 8 +- src/Compilers/VisualBasic/vbc/vbc.csproj | 14 +++- src/Interactive/CsiCore/CsiCore.csproj | 84 ------------------- src/Interactive/VbiCore/VbiCore.vbproj | 84 ------------------- src/Interactive/{CsiCore => csi}/Csi.cs | 0 .../{CsiCore/csi.rsp => csi/csi.coreclr.rsp} | 0 src/Interactive/csi/csi.csproj | 17 ++-- .../csi/{csi.rsp => csi.desktop.rsp} | 0 src/Interactive/{VbiCore => vbi}/Vbi.vb | 0 .../{VbiCore/vbi.rsp => vbi/vbi.coreclr.rsp} | 0 .../vbi/{vbi.rsp => vbi.desktop.rsp} | 0 src/Interactive/vbi/vbi.vbproj | 16 ++-- src/NuGet/Microsoft.NETCore.Compilers.nuspec | 16 ++-- ...soft.Net.CSharp.Interactive.netcore.nuspec | 2 +- .../Microsoft.Net.Compilers.netcore.nuspec | 4 +- src/NuGet/Microsoft.Net.Compilers.nuspec | 18 ++-- src/NuGet/NuGet.proj | 6 +- .../BuildDevDivInsertionFiles.vb | 10 +-- .../Microsoft.CodeAnalysis.Compilers.swr | 20 ++--- .../Perf/tests/csharp/csharp_compiler.csx | 2 +- .../Perf/tests/helloworld/hello_world.csx | 2 +- .../{Desktop => Portable/Traits}/Traits.cs | 0 43 files changed, 143 insertions(+), 454 deletions(-) delete mode 100644 src/Compilers/CSharp/CscCore/CscCore.csproj delete mode 100644 src/Compilers/CSharp/CscCore/Program.cs delete mode 100644 src/Compilers/VisualBasic/VbcCore/Program.cs delete mode 100644 src/Compilers/VisualBasic/VbcCore/VbcCore.csproj delete mode 100644 src/Interactive/CsiCore/CsiCore.csproj delete mode 100644 src/Interactive/VbiCore/VbiCore.vbproj rename src/Interactive/{CsiCore => csi}/Csi.cs (100%) rename src/Interactive/{CsiCore/csi.rsp => csi/csi.coreclr.rsp} (100%) rename src/Interactive/csi/{csi.rsp => csi.desktop.rsp} (100%) rename src/Interactive/{VbiCore => vbi}/Vbi.vb (100%) rename src/Interactive/{VbiCore/vbi.rsp => vbi/vbi.coreclr.rsp} (100%) rename src/Interactive/vbi/{vbi.rsp => vbi.desktop.rsp} (100%) rename src/Test/Utilities/{Desktop => Portable/Traits}/Traits.cs (100%) diff --git a/Compilers.sln b/Compilers.sln index 602e1a72f80..647b4d894c4 100644 --- a/Compilers.sln +++ b/Compilers.sln @@ -71,10 +71,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpWinRTTest", "src\Comp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vbc", "src\Compilers\VisualBasic\vbc\vbc.csproj", "{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CscCore", "src\Compilers\CSharp\CscCore\CscCore.csproj", "{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VbcCore", "src\Compilers\VisualBasic\VbcCore\VbcCore.csproj", "{8CE3A581-2969-4864-A803-013E9D977C3A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSBuildTaskTests", "src\Compilers\Core\MSBuildTaskTests\MSBuildTaskTests.csproj", "{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{E35DA3D1-16C0-4318-9187-6B664F12A870}" @@ -297,14 +293,6 @@ Global {E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Debug|Any CPU.Build.0 = Debug|Any CPU {E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Release|Any CPU.ActiveCfg = Release|Any CPU {E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Release|Any CPU.Build.0 = Release|Any CPU - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|Any CPU.Build.0 = Release|Any CPU - {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Any CPU.Build.0 = Release|Any CPU {1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -452,8 +440,6 @@ Global {D0BC9BE7-24F6-40CA-8DC6-FCB93BD44B34} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9} {FCFA8808-A1B6-48CC-A1EA-0B8CA8AEDA8E} = {32A48625-F0AD-419D-828B-A50BDABA38EA} {E58EE9D7-1239-4961-A0C1-F9EC3952C4C1} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37} - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C} = {32A48625-F0AD-419D-828B-A50BDABA38EA} - {8CE3A581-2969-4864-A803-013E9D977C3A} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37} {1DFEA9C5-973C-4179-9B1B-0F32288E1EF2} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9} {AD6F474E-E6D4-4217-91F3-B7AF1BE31CCC} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9} {06B26DCB-7A12-48EF-AE50-708593ABD05F} = {E35DA3D1-16C0-4318-9187-6B664F12A870} diff --git a/CrossPlatform.sln b/CrossPlatform.sln index 3c15c9e519d..926ea792672 100644 --- a/CrossPlatform.sln +++ b/CrossPlatform.sln @@ -47,10 +47,6 @@ Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "BasicWorkspace", "src\Works EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "AnalyzerDriver", "src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.shproj", "{D0BC9BE7-24F6-40CA-8DC6-FCB93BD44B34}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CscCore", "src\Compilers\CSharp\CscCore\CscCore.csproj", "{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VbcCore", "src\Compilers\VisualBasic\VbcCore\VbcCore.csproj", "{8CE3A581-2969-4864-A803-013E9D977C3A}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CommandLine", "src\Compilers\Core\CommandLine\CommandLine.shproj", "{AD6F474E-E6D4-4217-91F3-B7AF1BE31CCC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{50509463-6012-4061-99BF-6C5C8262E643}" @@ -83,10 +79,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interactive", "Interactive" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hosts", "Hosts", "{0F0F4F95-0BEC-4623-9B26-DBD662F1193F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CsiCore", "src\Interactive\CsiCore\CsiCore.csproj", "{D1B051A4-F2A1-4E97-9747-C41D13E475FD}" -EndProject -Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "VbiCore", "src\Interactive\VbiCore\VbiCore.vbproj", "{1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities.CoreClr", "src\Test\Utilities\CoreClr\TestUtilities.CoreClr.csproj", "{67CA3EEE-37F1-4EDF-BD9B-C11911748F37}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Features", "Features", "{C1BB2B88-87E2-4AA4-9F82-770873D3F434}" @@ -196,14 +188,6 @@ Global {57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|Any CPU.Build.0 = Release|Any CPU - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|Any CPU.Build.0 = Release|Any CPU - {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Any CPU.Build.0 = Release|Any CPU {CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.Build.0 = Debug|Any CPU {CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -236,14 +220,6 @@ Global {21A01C2D-2501-4619-8144-48977DD22D9C}.Debug|Any CPU.Build.0 = Debug|Any CPU {21A01C2D-2501-4619-8144-48977DD22D9C}.Release|Any CPU.ActiveCfg = Release|Any CPU {21A01C2D-2501-4619-8144-48977DD22D9C}.Release|Any CPU.Build.0 = Release|Any CPU - {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|Any CPU.ActiveCfg = Debug|x64 - {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|Any CPU.Build.0 = Debug|x64 - {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|Any CPU.ActiveCfg = Release|x64 - {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|Any CPU.Build.0 = Release|x64 - {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|Any CPU.ActiveCfg = Debug|x64 - {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|Any CPU.Build.0 = Debug|x64 - {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|Any CPU.ActiveCfg = Release|x64 - {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|Any CPU.Build.0 = Release|x64 {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Debug|Any CPU.Build.0 = Debug|Any CPU {67CA3EEE-37F1-4EDF-BD9B-C11911748F37}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -312,8 +288,6 @@ Global {21B239D0-D144-430F-A394-C066D58EE267} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5} {57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5} {D0BC9BE7-24F6-40CA-8DC6-FCB93BD44B34} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9} - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C} = {32A48625-F0AD-419D-828B-A50BDABA38EA} - {8CE3A581-2969-4864-A803-013E9D977C3A} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37} {AD6F474E-E6D4-4217-91F3-B7AF1BE31CCC} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9} {CCBD3438-3E84-40A9-83AD-533F23BCFCA5} = {50509463-6012-4061-99BF-6C5C8262E643} {2DAE4406-7A89-4B5F-95C3-BC5472CE47CE} = {A6F70573-57FE-49F9-A26C-75B8D202B795} @@ -326,8 +300,6 @@ Global {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9} {21A01C2D-2501-4619-8144-48977DD22D9C} = {A6F70573-57FE-49F9-A26C-75B8D202B795} {0F0F4F95-0BEC-4623-9B26-DBD662F1193F} = {FED79E76-76A7-48A1-B0F1-E5E56B5E7FE4} - {D1B051A4-F2A1-4E97-9747-C41D13E475FD} = {0F0F4F95-0BEC-4623-9B26-DBD662F1193F} - {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD} = {0F0F4F95-0BEC-4623-9B26-DBD662F1193F} {67CA3EEE-37F1-4EDF-BD9B-C11911748F37} = {50509463-6012-4061-99BF-6C5C8262E643} {6B83F334-CB79-47C8-8EA9-5391DA1601F4} = {C1BB2B88-87E2-4AA4-9F82-770873D3F434} {275812EE-DEDB-4232-9439-91C9757D2AE4} = {6B83F334-CB79-47C8-8EA9-5391DA1601F4} diff --git a/Roslyn.sln b/Roslyn.sln index 53a1f102d91..77406367700 100644 --- a/Roslyn.sln +++ b/Roslyn.sln @@ -251,10 +251,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResultProvider.Portable", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vbc", "src\Compilers\VisualBasic\vbc\vbc.csproj", "{E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CscCore", "src\Compilers\CSharp\CscCore\CscCore.csproj", "{E3CD2895-76A8-4D11-A316-EA67CB5EA42C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VbcCore", "src\Compilers\VisualBasic\VbcCore\VbcCore.csproj", "{8CE3A581-2969-4864-A803-013E9D977C3A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "src\Test\Utilities\Portable\TestUtilities.csproj", "{CCBD3438-3E84-40A9-83AD-533F23BCFCA5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScriptingTest.Desktop", "src\Scripting\CoreTest.Desktop\ScriptingTest.Desktop.csproj", "{6FD1CC3E-6A99-4736-9B8D-757992DDE75D}" @@ -267,10 +263,6 @@ Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "BasicScriptingTest", "src\S EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Diagnostics", "src\Test\Diagnostics\Diagnostics.csproj", "{E2E889A5-2489-4546-9194-47C63E49EAEB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CsiCore", "src\Interactive\CsiCore\CsiCore.csproj", "{D1B051A4-F2A1-4E97-9747-C41D13E475FD}" -EndProject -Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "VbiCore", "src\Interactive\VbiCore\VbiCore.vbproj", "{1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BasicAnalyzerDriver", "src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.shproj", "{E8F0BAA5-7327-43D1-9A51-644E81AE55F1}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CSharpAnalyzerDriver", "src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.shproj", "{54E08BF5-F819-404F-A18D-0AB9EA81EA04}" @@ -769,14 +761,6 @@ Global {E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Debug|Any CPU.Build.0 = Debug|Any CPU {E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Release|Any CPU.ActiveCfg = Release|Any CPU {E58EE9D7-1239-4961-A0C1-F9EC3952C4C1}.Release|Any CPU.Build.0 = Release|Any CPU - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|Any CPU.Build.0 = Release|Any CPU - {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|Any CPU.Build.0 = Release|Any CPU {CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Debug|Any CPU.Build.0 = Debug|Any CPU {CCBD3438-3E84-40A9-83AD-533F23BCFCA5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -801,14 +785,6 @@ Global {E2E889A5-2489-4546-9194-47C63E49EAEB}.Debug|Any CPU.Build.0 = Debug|Any CPU {E2E889A5-2489-4546-9194-47C63E49EAEB}.Release|Any CPU.ActiveCfg = Release|Any CPU {E2E889A5-2489-4546-9194-47C63E49EAEB}.Release|Any CPU.Build.0 = Release|Any CPU - {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|Any CPU.ActiveCfg = Debug|x64 - {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|Any CPU.Build.0 = Debug|x64 - {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|Any CPU.ActiveCfg = Release|x64 - {D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Release|Any CPU.Build.0 = Release|x64 - {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|Any CPU.ActiveCfg = Debug|x64 - {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Debug|Any CPU.Build.0 = Debug|x64 - {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|Any CPU.ActiveCfg = Release|x64 - {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}.Release|Any CPU.Build.0 = Release|x64 {06B26DCB-7A12-48EF-AE50-708593ABD05F}.Debug|Any CPU.ActiveCfg = Debug|x64 {06B26DCB-7A12-48EF-AE50-708593ABD05F}.Debug|Any CPU.Build.0 = Debug|x64 {06B26DCB-7A12-48EF-AE50-708593ABD05F}.Release|Any CPU.ActiveCfg = Release|x64 @@ -1094,16 +1070,12 @@ Global {BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6} {FA0E905D-EC46-466D-B7B2-3B5557F9428C} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6} {E58EE9D7-1239-4961-A0C1-F9EC3952C4C1} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37} - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C} = {32A48625-F0AD-419D-828B-A50BDABA38EA} - {8CE3A581-2969-4864-A803-013E9D977C3A} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37} {CCBD3438-3E84-40A9-83AD-533F23BCFCA5} = {CAD2965A-19AB-489F-BE2E-7649957F914A} {6FD1CC3E-6A99-4736-9B8D-757992DDE75D} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05} {286B01F3-811A-40A7-8C1F-10C9BB0597F7} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05} {24973B4C-FD09-4EE1-97F4-EA03E6B12040} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05} {ABC7262E-1053-49F3-B846-E3091BB92E8C} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05} {E2E889A5-2489-4546-9194-47C63E49EAEB} = {8DBA5174-B0AA-4561-82B1-A46607697753} - {D1B051A4-F2A1-4E97-9747-C41D13E475FD} = {5CA5F70E-0FDB-467B-B22C-3CD5994F0087} - {1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD} = {5CA5F70E-0FDB-467B-B22C-3CD5994F0087} {E8F0BAA5-7327-43D1-9A51-644E81AE55F1} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37} {54E08BF5-F819-404F-A18D-0AB9EA81EA04} = {32A48625-F0AD-419D-828B-A50BDABA38EA} {AD6F474E-E6D4-4217-91F3-B7AF1BE31CCC} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9} diff --git a/build/Targets/Packages.props b/build/Targets/Packages.props index 972e3b2865f..dc87aa1b610 100644 --- a/build/Targets/Packages.props +++ b/build/Targets/Packages.props @@ -128,7 +128,7 @@ 4.3.0 0.1.0 4.4.0 - 4.2.1402.2112 + 4.7.99 1.0.1 1.6.1 9.0.1 diff --git a/build/config/SignToolData.json b/build/config/SignToolData.json index 224364c9e2b..5cfc93397f4 100644 --- a/build/config/SignToolData.json +++ b/build/config/SignToolData.json @@ -51,14 +51,14 @@ "Dlls\\XamlVisualStudio\\Microsoft.VisualStudio.LanguageServices.Xaml.dll", "Exes\\InteractiveHost\\InteractiveHost.exe", "Exes\\VBCSCompiler\\net46\\VBCSCompiler.exe", - "Exes\\csc\\csc.exe", - "Exes\\csccore\\csc.dll", - "Exes\\csi\\csi.exe", - "Exes\\csicore\\csi.dll", - "Exes\\vbc\\vbc.exe", - "Exes\\vbccore\\vbc.dll", - "Exes\\vbi\\vbi.exe", - "Exes\\vbicore\\vbi.dll", + "Exes\\csc\\net46\\csc.exe", + "Exes\\csc\\netcoreapp2.0\\csc.dll", + "Exes\\csi\\net46\\csi.exe", + "Exes\\csi\\netcoreapp2.0\\csi.dll", + "Exes\\vbc\\net46\\vbc.exe", + "Exes\\vbc\\netcoreapp2.0\\vbc.dll", + "Exes\\vbi\\net46\\vbi.exe", + "Exes\\vbi\\netcoreapp2.0\\vbi.dll", "Vsix\\CompilerExtension\\Roslyn.Compilers.Extension.dll", "Vsix\\Templates\\Roslyn.Templates.dll", "Vsix\\VisualStudioDiagnosticsWindow\\Roslyn.VisualStudio.DiagnosticsWindow.dll", diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1 index 9299102ff80..5f780bc3dae 100644 --- a/build/scripts/build.ps1 +++ b/build/scripts/build.ps1 @@ -185,10 +185,10 @@ function Build-ExtraSignArtifacts() { Push-Location (Join-Path $repoDir "src\Setup") try { # Publish the CoreClr projects (CscCore and VbcCore) and dependencies for later NuGet packaging. - Write-Host "Publishing CscCore" - Run-MSBuild "..\Compilers\CSharp\CscCore\CscCore.csproj /t:PublishWithoutBuilding" - Write-Host "Publishing VbcCore" - Run-MSBuild "..\Compilers\VisualBasic\VbcCore\VbcCore.csproj /t:PublishWithoutBuilding" + Write-Host "Publishing csc" + Run-MSBuild "..\Compilers\CSharp\csc\csc.csproj /p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding" + Write-Host "Publishing csc" + Run-MSBuild "..\Compilers\VisualBasic\vbc\vbc.csproj /p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding" # No need to build references here as we just built the rest of the source tree. # We build these serially to work around https://github.com/dotnet/roslyn/issues/11856, @@ -298,7 +298,8 @@ function Test-XUnitCoreClr() { # A number of our tests need to be published before they can be executed in order to get some # runtime assets. $needPublish = @( - "src\Compilers\CSharp\Test\Symbol\CSharpCompilerSymbolTest.csproj" + "src\Compilers\CSharp\Test\Symbol\CSharpCompilerSymbolTest.csproj", + "src\Compilers\Server\VBCSCompilerTests\VBCSCompilerTests.csproj" ) foreach ($file in $needPublish) { diff --git a/cibuild.sh b/cibuild.sh index c3ffb59ef14..65e1a5429f9 100755 --- a/cibuild.sh +++ b/cibuild.sh @@ -109,10 +109,10 @@ dotnet restore ${RESTORE_ARGS} ${THIS_DIR}/CrossPlatform.sln BUILD_ARGS="--no-restore -c ${BUILD_CONFIGURATION} -r ${RUNTIME_ID} /nologo /consoleloggerparameters:Verbosity=minimal;summary /filelogger /fileloggerparameters:Verbosity=normal;logFile=${BUILD_LOG_PATH} /maxcpucount:1" -echo "Building bootstrap CscCore" -dotnet publish ${SRC_PATH}/Compilers/CSharp/CscCore -o ${BOOTSTRAP_PATH}/csc ${BUILD_ARGS} -echo "Building bootstrap VbcCore" -dotnet publish ${SRC_PATH}/Compilers/VisualBasic/VbcCore -o ${BOOTSTRAP_PATH}/vbc ${BUILD_ARGS} +echo "Building bootstrap csc" +dotnet publish ${SRC_PATH}/Compilers/csc/csc -o ${BOOTSTRAP_PATH}/csc ${BUILD_ARGS} +echo "Building bootstrap vbc" +dotnet publish ${SRC_PATH}/Compilers/vbc/vbc -o ${BOOTSTRAP_PATH}/vbc ${BUILD_ARGS} rm -rf ${BINARIES_PATH}/${BUILD_CONFIGURATION} BUILD_ARGS+=" /p:CscToolPath=${BOOTSTRAP_PATH}/csc /p:CscToolExe=csc /p:VbcToolPath=${BOOTSTRAP_PATH}/vbc /p:VbcToolExe=vbc" diff --git a/docs/infrastructure/cross-platform.md b/docs/infrastructure/cross-platform.md index c24fbff412a..f2387748ffd 100644 --- a/docs/infrastructure/cross-platform.md +++ b/docs/infrastructure/cross-platform.md @@ -12,7 +12,7 @@ If you do not have a system-wide `dotnet` install, you can obtain one with `./bu ## Using the compiler -After building, there will be a `csc` in the `Binaries/Debug/Exes/CscCore` directory. +After building, there will be a `csc` in the `Binaries/Debug/Exes/csc/netcoreapp2.0` directory. ### Known issues when running `csc.exe` diff --git a/src/Compilers/CSharp/CscCore/CscCore.csproj b/src/Compilers/CSharp/CscCore/CscCore.csproj deleted file mode 100644 index b61e3518979..00000000000 --- a/src/Compilers/CSharp/CscCore/CscCore.csproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - AnyCPU - AnyCPU - Exe - Microsoft.CodeAnalysis.CSharp.CommandLine - csc - true - Microsoft.CodeAnalysis.CSharp.CommandLine.Program - true - True - netcoreapp2.0 - win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 - true - - - - - - - - - - - - BuildClient.cs - - - CoreClrAnalyzerAssemblyLoader.cs - - - CoreClrBuildClient.cs - - - Csc.cs - - - - - - - - diff --git a/src/Compilers/CSharp/CscCore/Program.cs b/src/Compilers/CSharp/CscCore/Program.cs deleted file mode 100644 index ff65f974623..00000000000 --- a/src/Compilers/CSharp/CscCore/Program.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.CodeAnalysis.CommandLine; - -namespace Microsoft.CodeAnalysis.CSharp.CommandLine -{ - public class Program - { - public static int Main(string[] args) - => CoreClrBuildClient.Run(args, RequestLanguage.CSharpCompile, Csc.Run); - } -} diff --git a/src/Compilers/CSharp/csc/Program.cs b/src/Compilers/CSharp/csc/Program.cs index c77a77d0779..5f93296d85d 100644 --- a/src/Compilers/CSharp/csc/Program.cs +++ b/src/Compilers/CSharp/csc/Program.cs @@ -24,7 +24,13 @@ public static int Main(string[] args) } private static int MainCore(string[] args) - => DesktopBuildClient.Run(args, RequestLanguage.CSharpCompile, Csc.Run, new DesktopAnalyzerAssemblyLoader()); + { +#if NET46 + return DesktopBuildClient.Run(args, RequestLanguage.CSharpCompile, Csc.Run, new DesktopAnalyzerAssemblyLoader()); +#else + return CoreClrBuildClient.Run(args, RequestLanguage.CSharpCompile, Csc.Run, new CoreClrAnalyzerAssemblyLoader()); +#endif + } public static int Run(string[] args, string clientDir, string workingDir, string sdkDir, string tempDir, TextWriter textWriter, IAnalyzerAssemblyLoader analyzerLoader) => Csc.Run(args, new BuildPaths(clientDir: clientDir, workingDir: workingDir, sdkDir: sdkDir, tempDir: tempDir), textWriter, analyzerLoader); diff --git a/src/Compilers/CSharp/csc/csc.csproj b/src/Compilers/CSharp/csc/csc.csproj index 6d489b3026b..1d7d5be1ffc 100644 --- a/src/Compilers/CSharp/csc/csc.csproj +++ b/src/Compilers/CSharp/csc/csc.csproj @@ -11,8 +11,9 @@ false true Microsoft.CodeAnalysis.CSharp.CommandLine.Program - net46 - win7 + net46;netcoreapp2.0 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 + false @@ -21,8 +22,8 @@ - + @@ -31,6 +32,12 @@ BuildServerConnection.cs + + CoreClrAnalyzerAssemblyLoader.cs + + + CoreClrBuildClient.cs + DesktopBuildClient.cs @@ -46,6 +53,7 @@ + diff --git a/src/Compilers/Extension/CompilerExtension.csproj b/src/Compilers/Extension/CompilerExtension.csproj index 8f869e1a9c7..cccfdb7899e 100644 --- a/src/Compilers/Extension/CompilerExtension.csproj +++ b/src/Compilers/Extension/CompilerExtension.csproj @@ -109,6 +109,7 @@ BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems DebugSymbolsProjectOutputGroup%3b true + TargetFramework=net46 BuiltProjectOutputGroup @@ -124,6 +125,7 @@ BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems DebugSymbolsProjectOutputGroup%3b true + TargetFramework=net46 diff --git a/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs b/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs index 026604b35d1..029d91a5671 100644 --- a/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs +++ b/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs @@ -38,6 +38,7 @@ static CompilerServerUnitTests() !File.Exists(Path.Combine(basePath, CSharpClientExeName)) || !File.Exists(Path.Combine(basePath, BasicClientExeName))) { +#if false IsRunningAgainstInstallation = true; // VBCSCompiler is used as a DLL in these tests, need to hook the resolve to the installed location. @@ -47,6 +48,7 @@ static CompilerServerUnitTests() { return; } +#endif } CompilerDirectory = basePath; diff --git a/src/Compilers/Server/VBCSCompilerTests/ServerUtil.cs b/src/Compilers/Server/VBCSCompilerTests/ServerUtil.cs index 6c4b846bb32..582be1bde2b 100644 --- a/src/Compilers/Server/VBCSCompilerTests/ServerUtil.cs +++ b/src/Compilers/Server/VBCSCompilerTests/ServerUtil.cs @@ -87,7 +87,11 @@ internal static BuildPaths CreateBuildPaths(string workingDir, string tempDir) IClientConnectionHost clientConnectionHost = null) { pipeName = pipeName ?? Guid.NewGuid().ToString(); +#if NET46 compilerServerHost = compilerServerHost ?? new DesktopCompilerServerHost(DefaultClientDirectory, DefaultSdkDirectory); +#else + compilerServerHost = compilerServerHost ?? new CoreClrCompilerServerHost(DefaultClientDirectory, DefaultSdkDirectory); +#endif var serverStatsSource = new TaskCompletionSource(); var serverListenSource = new TaskCompletionSource(); diff --git a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj index af0d37390ff..bfd00088860 100644 --- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj +++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj @@ -10,9 +10,9 @@ Microsoft.CodeAnalysis.CompilerServer.UnitTests Roslyn.Compilers.CompilerServer.UnitTests true - net46 - win7 - UnitTest + net46;netcoreapp2.0 + win7-x64 + UnitTestPortable @@ -25,7 +25,7 @@ vbc - + diff --git a/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs b/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs index b1600f31204..525a715ceaa 100644 --- a/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs +++ b/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs @@ -8,7 +8,7 @@ namespace Microsoft.CodeAnalysis { - internal sealed class CoreClrAnalyzerAssemblyLoader : AnalyzerAssemblyLoader + internal class CoreClrAnalyzerAssemblyLoader : AnalyzerAssemblyLoader { private AssemblyLoadContext _loadContext; @@ -37,8 +37,10 @@ protected override Assembly LoadFromPathImpl(string fullPath) } } - return _loadContext.LoadFromAssemblyPath(fullPath); + return LoadImpl(fullPath); } + + protected virtual Assembly LoadImpl(string fullPath) => _loadContext.LoadFromAssemblyPath(fullPath); } } diff --git a/src/Compilers/Shared/CoreClrBuildClient.cs b/src/Compilers/Shared/CoreClrBuildClient.cs index 82466eb7e3d..f981cfea233 100644 --- a/src/Compilers/Shared/CoreClrBuildClient.cs +++ b/src/Compilers/Shared/CoreClrBuildClient.cs @@ -17,14 +17,16 @@ internal sealed class CoreClrBuildClient : BuildClient { private readonly RequestLanguage _language; private readonly CompileFunc _compileFunc; + private readonly IAnalyzerAssemblyLoader _analyzerAssemblyLoader; - private CoreClrBuildClient(RequestLanguage language, CompileFunc compileFunc) + private CoreClrBuildClient(RequestLanguage language, CompileFunc compileFunc, IAnalyzerAssemblyLoader analyzerAssemblyLoader) { _language = language; _compileFunc = compileFunc; + _analyzerAssemblyLoader = analyzerAssemblyLoader; } - internal static int Run(IEnumerable arguments, RequestLanguage language, CompileFunc compileFunc) + internal static int Run(IEnumerable arguments, RequestLanguage language, CompileFunc compileFunc, IAnalyzerAssemblyLoader analyzerAssemblyLoader) { // Register encodings for console // https://github.com/dotnet/roslyn/issues/10785 @@ -34,7 +36,7 @@ internal static int Run(IEnumerable arguments, RequestLanguage language, // ends up giving us both CoreRun and the exe file. Need to find a good way to remove the host // as well as the EXE argument. // https://github.com/dotnet/roslyn/issues/6677 - var client = new CoreClrBuildClient(language, compileFunc); + var client = new CoreClrBuildClient(language, compileFunc, analyzerAssemblyLoader); var clientDir = AppContext.BaseDirectory; var workingDir = Directory.GetCurrentDirectory(); var tempDir = Path.GetTempPath(); @@ -44,7 +46,7 @@ internal static int Run(IEnumerable arguments, RequestLanguage language, protected override int RunLocalCompilation(string[] arguments, BuildPaths buildPaths, TextWriter textWriter) { - return _compileFunc(arguments, buildPaths, textWriter, new CoreClrAnalyzerAssemblyLoader()); + return _compileFunc(arguments, buildPaths, textWriter, _analyzerAssemblyLoader); } protected override string GetSessionKey(BuildPaths buildPaths) diff --git a/src/Compilers/Shared/ShadowCopyAnalyzerAssemblyLoader.cs b/src/Compilers/Shared/ShadowCopyAnalyzerAssemblyLoader.cs index 904c1b8a3bb..21461fa727b 100644 --- a/src/Compilers/Shared/ShadowCopyAnalyzerAssemblyLoader.cs +++ b/src/Compilers/Shared/ShadowCopyAnalyzerAssemblyLoader.cs @@ -1,7 +1,5 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -#if NET46 - using System; using System.Collections.Generic; using System.IO; @@ -11,7 +9,12 @@ namespace Microsoft.CodeAnalysis { - internal sealed class ShadowCopyAnalyzerAssemblyLoader : DesktopAnalyzerAssemblyLoader + internal sealed class ShadowCopyAnalyzerAssemblyLoader : +#if NET46 + DesktopAnalyzerAssemblyLoader +#else + CoreClrAnalyzerAssemblyLoader +#endif { /// /// The base directory for shadow copies. Each instance of @@ -195,5 +198,3 @@ private string CreateUniqueDirectoryForProcess() } } } - -#endif diff --git a/src/Compilers/VisualBasic/VbcCore/Program.cs b/src/Compilers/VisualBasic/VbcCore/Program.cs deleted file mode 100644 index 2eca2a94987..00000000000 --- a/src/Compilers/VisualBasic/VbcCore/Program.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using Microsoft.CodeAnalysis.CommandLine; - -namespace Microsoft.CodeAnalysis.VisualBasic.CommandLine -{ - public class Program - { - public static int Main(string[] args) - => CoreClrBuildClient.Run(args, RequestLanguage.VisualBasicCompile, Vbc.Run); - } -} diff --git a/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj b/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj deleted file mode 100644 index bae17ce5c12..00000000000 --- a/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - AnyCPU - AnyCPU - Exe - Microsoft.CodeAnalysis.VisualBasic.CommandLine - vbc - true - Microsoft.CodeAnalysis.VisualBasic.CommandLine.Program - true - True - netcoreapp2.0 - win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 - true - - - - - - - - - - BuildClient.cs - - - CoreClrAnalyzerAssemblyLoader.cs - - - CoreClrBuildClient.cs - - - Vbc.cs - - - - - - - - - - - - diff --git a/src/Compilers/VisualBasic/vbc/Program.cs b/src/Compilers/VisualBasic/vbc/Program.cs index 7aef6f564b9..3fe6e09169b 100644 --- a/src/Compilers/VisualBasic/vbc/Program.cs +++ b/src/Compilers/VisualBasic/vbc/Program.cs @@ -24,7 +24,13 @@ public static int Main(string[] args) } private static int MainCore(string[] args) - => DesktopBuildClient.Run(args, RequestLanguage.VisualBasicCompile, Vbc.Run, new DesktopAnalyzerAssemblyLoader()); + { +#if NET46 + return DesktopBuildClient.Run(args, RequestLanguage.VisualBasicCompile, Vbc.Run, new DesktopAnalyzerAssemblyLoader()); +#else + return CoreClrBuildClient.Run(args, RequestLanguage.VisualBasicCompile, Vbc.Run, new CoreClrAnalyzerAssemblyLoader()); +#endif + } public static int Run(string[] args, string clientDir, string workingDir, string sdkDir, string tempDir, TextWriter textWriter, IAnalyzerAssemblyLoader analyzerLoader) => Vbc.Run(args, new BuildPaths(clientDir: clientDir, workingDir: workingDir, sdkDir: sdkDir, tempDir: tempDir), textWriter, analyzerLoader); diff --git a/src/Compilers/VisualBasic/vbc/vbc.csproj b/src/Compilers/VisualBasic/vbc/vbc.csproj index 1d5a6b19dc1..d71d2aa7469 100644 --- a/src/Compilers/VisualBasic/vbc/vbc.csproj +++ b/src/Compilers/VisualBasic/vbc/vbc.csproj @@ -10,8 +10,9 @@ Microsoft.CodeAnalysis.VisualBasic.CommandLine true Microsoft.CodeAnalysis.VisualBasic.CommandLine.Program - net46 - win7 + net46;netcoreapp2.0 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 + false @@ -20,8 +21,8 @@ - + @@ -30,6 +31,12 @@ BuildServerConnection.cs + + CoreClrAnalyzerAssemblyLoader.cs + + + CoreClrBuildClient.cs + DesktopBuildClient.cs @@ -45,6 +52,7 @@ + diff --git a/src/Interactive/CsiCore/CsiCore.csproj b/src/Interactive/CsiCore/CsiCore.csproj deleted file mode 100644 index e1eea3f56ac..00000000000 --- a/src/Interactive/CsiCore/CsiCore.csproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - x64 - x64 - x64 - Exe - CSharpInteractive - csi - True - netcoreapp1.1 - win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 - true - - - - - - - - - - - - PreserveNewest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Interactive/VbiCore/VbiCore.vbproj b/src/Interactive/VbiCore/VbiCore.vbproj deleted file mode 100644 index dab3dd12c89..00000000000 --- a/src/Interactive/VbiCore/VbiCore.vbproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - x64 - x64 - x64 - Exe - Sub Main - vbi - True - netcoreapp1.1 - win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 - true - - - - - - - - - - - - PreserveNewest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Interactive/CsiCore/Csi.cs b/src/Interactive/csi/Csi.cs similarity index 100% rename from src/Interactive/CsiCore/Csi.cs rename to src/Interactive/csi/Csi.cs diff --git a/src/Interactive/CsiCore/csi.rsp b/src/Interactive/csi/csi.coreclr.rsp similarity index 100% rename from src/Interactive/CsiCore/csi.rsp rename to src/Interactive/csi/csi.coreclr.rsp diff --git a/src/Interactive/csi/csi.csproj b/src/Interactive/csi/csi.csproj index 5b83b00be04..9486b16086f 100644 --- a/src/Interactive/csi/csi.csproj +++ b/src/Interactive/csi/csi.csproj @@ -8,8 +8,9 @@ AnyCPU Exe CSharpInteractive - net46 - win7 + net46;netcoreapp2.0 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 + false @@ -21,14 +22,14 @@ - + + csi.rsp + PreserveNewest + + + csi.rsp PreserveNewest - - - - Csi.cs - diff --git a/src/Interactive/csi/csi.rsp b/src/Interactive/csi/csi.desktop.rsp similarity index 100% rename from src/Interactive/csi/csi.rsp rename to src/Interactive/csi/csi.desktop.rsp diff --git a/src/Interactive/VbiCore/Vbi.vb b/src/Interactive/vbi/Vbi.vb similarity index 100% rename from src/Interactive/VbiCore/Vbi.vb rename to src/Interactive/vbi/Vbi.vb diff --git a/src/Interactive/VbiCore/vbi.rsp b/src/Interactive/vbi/vbi.coreclr.rsp similarity index 100% rename from src/Interactive/VbiCore/vbi.rsp rename to src/Interactive/vbi/vbi.coreclr.rsp diff --git a/src/Interactive/vbi/vbi.rsp b/src/Interactive/vbi/vbi.desktop.rsp similarity index 100% rename from src/Interactive/vbi/vbi.rsp rename to src/Interactive/vbi/vbi.desktop.rsp diff --git a/src/Interactive/vbi/vbi.vbproj b/src/Interactive/vbi/vbi.vbproj index 64f84b97d6f..d0882c8b869 100644 --- a/src/Interactive/vbi/vbi.vbproj +++ b/src/Interactive/vbi/vbi.vbproj @@ -8,8 +8,9 @@ AnyCPU Exe Sub Main - net46 - win7 + net46;netcoreapp2.0 + win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;osx.10.12-x64 + false @@ -21,14 +22,17 @@ - + + vbi.rsp + PreserveNewest + + + vbi.rsp PreserveNewest - - Vbi.cs - + diff --git a/src/NuGet/Microsoft.NETCore.Compilers.nuspec b/src/NuGet/Microsoft.NETCore.Compilers.nuspec index efe7434a102..94b26c1d828 100644 --- a/src/NuGet/Microsoft.NETCore.Compilers.nuspec +++ b/src/NuGet/Microsoft.NETCore.Compilers.nuspec @@ -27,20 +27,20 @@ - - - + + + - - - + + + - - + + diff --git a/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec b/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec index fede7cb517d..c7b1fc668d0 100644 --- a/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec +++ b/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec @@ -28,6 +28,6 @@ - + diff --git a/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec b/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec index 22cf8b26001..012bc067646 100644 --- a/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec +++ b/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec @@ -30,7 +30,7 @@ - - + + diff --git a/src/NuGet/Microsoft.Net.Compilers.nuspec b/src/NuGet/Microsoft.Net.Compilers.nuspec index b87e4447be0..fec77a37110 100644 --- a/src/NuGet/Microsoft.Net.Compilers.nuspec +++ b/src/NuGet/Microsoft.Net.Compilers.nuspec @@ -31,15 +31,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/NuGet/NuGet.proj b/src/NuGet/NuGet.proj index c5fde120bd0..6645f17e81c 100644 --- a/src/NuGet/NuGet.proj +++ b/src/NuGet/NuGet.proj @@ -5,13 +5,13 @@ - + - + - + diff --git a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb index 662f77775a2..e4efc1bdd24 100644 --- a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb +++ b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb @@ -829,13 +829,13 @@ Public Class BuildDevDivInsertionFiles Next Next - add("Exes\csc\csc.exe.config") - add("Exes\csc\csc.rsp") - add("Exes\vbc\vbc.exe.config") - add("Exes\vbc\vbc.rsp") + add("Exes\csc\net46\csc.exe.config") + add("Exes\csc\net46\csc.rsp") + add("Exes\vbc\net46\vbc.exe.config") + add("Exes\vbc\net46\vbc.rsp") add("Exes\VBCSCompiler\net46\VBCSCompiler.exe.config") add("Exes\InteractiveHost\InteractiveHost.exe.config") - add("Exes\csi\csi.rsp") + add("Exes\csi\net46\csi.rsp") add("Vsix\Roslyn.Deployment.Full.Next\remoteSymbolSearchUpdateEngine.servicehub.service.json") add("Vsix\Roslyn.Deployment.Full.Next\snapshotService.servicehub.service.json") add("Vsix\VisualStudioInteractiveComponents\CSharpInteractive.rsp") diff --git a/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr b/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr index 568ae0fd666..1596d34ab97 100644 --- a/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr +++ b/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr @@ -8,18 +8,18 @@ vs.dependencies folder InstallDir:\MSBuild\15.0\Bin\Roslyn file source=$(OutputPath)\Exes\VBCSCompiler\net46\VBCSCompiler.exe vs.file.ngenArchitecture=all - file source=$(OutputPath)\Exes\csc\csc.exe vs.file.ngenArchitecture=all - file source=$(OutputPath)\Exes\csi\csi.exe vs.file.ngenArchitecture=all - file source=$(OutputPath)\Exes\vbc\vbc.exe vs.file.ngenArchitecture=all + file source=$(OutputPath)\Exes\csc\net46\csc.exe vs.file.ngenArchitecture=all + file source=$(OutputPath)\Exes\csi\net46\csi.exe vs.file.ngenArchitecture=all + file source=$(OutputPath)\Exes\vbc\net46\vbc.exe vs.file.ngenArchitecture=all - file source=$(OutputPath)\Exes\csc\csc.exe.config - file source=$(OutputPath)\Exes\csi\csi.exe.config - file source=$(OutputPath)\Exes\vbc\vbc.exe.config file source=$(OutputPath)\Exes\VBCSCompiler\net46\VBCSCompiler.exe.config + file source=$(OutputPath)\Exes\csc\net46\csc.exe.config + file source=$(OutputPath)\Exes\csi\net46\csi.exe.config + file source=$(OutputPath)\Exes\vbc\net46\vbc.exe.config - file source=$(OutputPath)\Exes\csc\csc.rsp - file source=$(OutputPath)\Exes\csi\csi.rsp - file source=$(OutputPath)\Exes\vbc\vbc.rsp + file source=$(OutputPath)\Exes\csc\net46\csc.rsp + file source=$(OutputPath)\Exes\csi\net46\csi.rsp + file source=$(OutputPath)\Exes\vbc\net46\vbc.rsp file source=$(OutputPath)\Dlls\MSBuildTask\Microsoft.VisualBasic.Core.targets file source=$(OutputPath)\Dlls\MSBuildTask\Microsoft.CSharp.Core.targets @@ -32,7 +32,7 @@ folder InstallDir:\MSBuild\15.0\Bin\Roslyn file source=$(OutputPath)\Dlls\CodeAnalysis\Microsoft.CodeAnalysis.dll vs.file.ngenArchitecture=all file source=$(OutputPath)\Vsix\CompilerExtension\System.Collections.Immutable.dll vs.file.ngenArchitecture=all file source=$(OutputPath)\Vsix\CompilerExtension\System.Reflection.Metadata.dll vs.file.ngenArchitecture=all - file source=$(OutputPath)\Exes\csi\System.ValueTuple.dll vs.file.ngenArchitecture=all + file source=$(OutputPath)\Exes\csi\net46\System.ValueTuple.dll vs.file.ngenArchitecture=all file source=$(OutputPath)\Vsix\CompilerExtension\System.AppContext.dll vs.file.ngenArchitecture=all file source=$(OutputPath)\Vsix\CompilerExtension\System.Console.dll vs.file.ngenArchitecture=all diff --git a/src/Test/Perf/tests/csharp/csharp_compiler.csx b/src/Test/Perf/tests/csharp/csharp_compiler.csx index 27efc97f128..681f5ebf6a2 100644 --- a/src/Test/Perf/tests/csharp/csharp_compiler.csx +++ b/src/Test/Perf/tests/csharp/csharp_compiler.csx @@ -29,7 +29,7 @@ class CSharpCompilerTest: PerfTest string workingDirectory = Path.Combine(TempDirectory, "csharp"); - ShellOutVital(Path.Combine(MyBinaries(), "Exes", "csc", "csc.exe"), args, workingDirectory); + ShellOutVital(Path.Combine(MyBinaries(), "Exes", "csc", "net46", "csc.exe"), args, workingDirectory); _logger.Flush(); } diff --git a/src/Test/Perf/tests/helloworld/hello_world.csx b/src/Test/Perf/tests/helloworld/hello_world.csx index 008900a6b14..ca899784951 100644 --- a/src/Test/Perf/tests/helloworld/hello_world.csx +++ b/src/Test/Perf/tests/helloworld/hello_world.csx @@ -26,7 +26,7 @@ class HelloWorldTest : PerfTest public override void Test() { - ShellOutVital(Path.Combine(MyBinaries(), "Exes", "csc", @"csc.exe"), _pathToHelloWorld + " /out:" + _pathToOutput, MyWorkingDirectory); + ShellOutVital(Path.Combine(MyBinaries(), "Exes", "csc", "net46", @"csc.exe"), _pathToHelloWorld + " /out:" + _pathToOutput, MyWorkingDirectory); _logger.Flush(); } diff --git a/src/Test/Utilities/Desktop/Traits.cs b/src/Test/Utilities/Portable/Traits/Traits.cs similarity index 100% rename from src/Test/Utilities/Desktop/Traits.cs rename to src/Test/Utilities/Portable/Traits/Traits.cs -- GitLab