diff --git a/.gitattributes b/.gitattributes index e8917806a306d..996fe676587fb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,16 +2,6 @@ # Set default behavior to automatically normalize line endings. ############################################################################### * text=auto encoding=UTF-8 - -# RunCsc/RunVbc are shell scripts and should always have unix line endings -# These shell scripts are included in the toolset packages. Normally, the shell -# scripts in our repo are only run by cloning onto a Linux/Mac machine, and git -# automatically chooses LF as the line ending. -# -# However, right now the toolset packages must be built on Windows, and so the -# files must be hard-coded to be cloned with LF -build/NuGetAdditionalFiles/RunCsc text eol=lf -build/NuGetAdditionalFiles/RunVbc text eol=lf *.sh text eol=lf ############################################################################### diff --git a/Compilers.sln b/Compilers.sln index 3488eff78a452..5eb57a7b84d90 100644 --- a/Compilers.sln +++ b/Compilers.sln @@ -106,8 +106,6 @@ Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Microsoft.CodeAnalysis.Visu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Scripting.TestUtilities", "src\Scripting\CoreTestUtilities\Microsoft.CodeAnalysis.Scripting.TestUtilities.csproj", "{21A01C2D-2501-4619-8144-48977DD22D9C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Toolset", "build\Toolset\Toolset.csproj", "{57557F32-0635-421A-BCF8-549AED50F764}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "csi", "src\Interactive\csi\csi.csproj", "{14118347-ED06-4608-9C45-18228273C712}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workspace", "Workspace", "{D9591377-7868-4D64-9314-83E0C92A871B}" @@ -144,7 +142,17 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "BasicAnalyzerDriver", "src\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IlAsmDeploy", "src\Tools\ILAsm\IlAsmDeploy.csproj", "{46B3E63A-C462-4133-9F27-3B85DA5E7D37}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetProjectPackUtil", "src\NuGet\NuGetProjectPackUtil.csproj", "{B2B261E8-56EC-45DC-8AB8-A491A065EFD4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{274B96B7-F815-47E3-9CA4-4024A57A478F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NETCore.Compilers.Package", "src\NuGet\Microsoft.NETCore.Compilers\Microsoft.NETCore.Compilers.Package.csproj", "{15FEBD1B-55CE-4EBD-85E3-04898260A25B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Compilers.Package", "src\NuGet\Microsoft.Net.Compilers\Microsoft.Net.Compilers.Package.csproj", "{27B1EAE2-2E06-48EF-8A67-06D6FB3DC275}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Compilers.Package", "src\NuGet\Microsoft.CodeAnalysis.Compilers.Package.csproj", "{E0756C89-603F-4B48-8E64-1D53E62654C8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Scripting.Package", "src\NuGet\Microsoft.CodeAnalysis.Scripting.Package.csproj", "{7F8057D9-F70F-4EA7-BD64-AB2D0DD8057B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Package", "src\NuGet\Microsoft.CodeAnalysis.Package.csproj", "{2483917E-7024-4D10-99C6-2BEF338FF53B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompilerBenchmarks", "src\Tools\CompilerBenchmarks\CompilerBenchmarks.csproj", "{B446E771-AB52-41C9-ACFC-FDF8EACAF291}" EndProject @@ -335,10 +343,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 - {57557F32-0635-421A-BCF8-549AED50F764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57557F32-0635-421A-BCF8-549AED50F764}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57557F32-0635-421A-BCF8-549AED50F764}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57557F32-0635-421A-BCF8-549AED50F764}.Release|Any CPU.Build.0 = Release|Any CPU {14118347-ED06-4608-9C45-18228273C712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {14118347-ED06-4608-9C45-18228273C712}.Debug|Any CPU.Build.0 = Debug|Any CPU {14118347-ED06-4608-9C45-18228273C712}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -395,14 +399,30 @@ Global {46B3E63A-C462-4133-9F27-3B85DA5E7D37}.Debug|Any CPU.Build.0 = Debug|Any CPU {46B3E63A-C462-4133-9F27-3B85DA5E7D37}.Release|Any CPU.ActiveCfg = Release|Any CPU {46B3E63A-C462-4133-9F27-3B85DA5E7D37}.Release|Any CPU.Build.0 = Release|Any CPU - {B2B261E8-56EC-45DC-8AB8-A491A065EFD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2B261E8-56EC-45DC-8AB8-A491A065EFD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2B261E8-56EC-45DC-8AB8-A491A065EFD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2B261E8-56EC-45DC-8AB8-A491A065EFD4}.Release|Any CPU.Build.0 = Release|Any CPU {B446E771-AB52-41C9-ACFC-FDF8EACAF291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B446E771-AB52-41C9-ACFC-FDF8EACAF291}.Debug|Any CPU.Build.0 = Debug|Any CPU {B446E771-AB52-41C9-ACFC-FDF8EACAF291}.Release|Any CPU.ActiveCfg = Release|Any CPU {B446E771-AB52-41C9-ACFC-FDF8EACAF291}.Release|Any CPU.Build.0 = Release|Any CPU + {15FEBD1B-55CE-4EBD-85E3-04898260A25B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {15FEBD1B-55CE-4EBD-85E3-04898260A25B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {15FEBD1B-55CE-4EBD-85E3-04898260A25B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {15FEBD1B-55CE-4EBD-85E3-04898260A25B}.Release|Any CPU.Build.0 = Release|Any CPU + {27B1EAE2-2E06-48EF-8A67-06D6FB3DC275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27B1EAE2-2E06-48EF-8A67-06D6FB3DC275}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27B1EAE2-2E06-48EF-8A67-06D6FB3DC275}.Release|Any CPU.ActiveCfg = Release|Any CPU + {27B1EAE2-2E06-48EF-8A67-06D6FB3DC275}.Release|Any CPU.Build.0 = Release|Any CPU + {E0756C89-603F-4B48-8E64-1D53E62654C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E0756C89-603F-4B48-8E64-1D53E62654C8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E0756C89-603F-4B48-8E64-1D53E62654C8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E0756C89-603F-4B48-8E64-1D53E62654C8}.Release|Any CPU.Build.0 = Release|Any CPU + {7F8057D9-F70F-4EA7-BD64-AB2D0DD8057B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7F8057D9-F70F-4EA7-BD64-AB2D0DD8057B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F8057D9-F70F-4EA7-BD64-AB2D0DD8057B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7F8057D9-F70F-4EA7-BD64-AB2D0DD8057B}.Release|Any CPU.Build.0 = Release|Any CPU + {2483917E-7024-4D10-99C6-2BEF338FF53B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2483917E-7024-4D10-99C6-2BEF338FF53B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2483917E-7024-4D10-99C6-2BEF338FF53B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2483917E-7024-4D10-99C6-2BEF338FF53B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -452,7 +472,6 @@ Global {066F0DBD-C46C-4C20-AFEC-99829A172625} = {3FF38FD4-DF16-44B0-924F-0D5AE155495B} {3E7DEA65-317B-4F43-A25D-62F18D96CFD7} = {3FF38FD4-DF16-44B0-924F-0D5AE155495B} {21A01C2D-2501-4619-8144-48977DD22D9C} = {3FF38FD4-DF16-44B0-924F-0D5AE155495B} - {57557F32-0635-421A-BCF8-549AED50F764} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} {14118347-ED06-4608-9C45-18228273C712} = {3FF38FD4-DF16-44B0-924F-0D5AE155495B} {5F8D2414-064A-4B3A-9B42-8E2A04246BE5} = {D9591377-7868-4D64-9314-83E0C92A871B} {21B239D0-D144-430F-A394-C066D58EE267} = {D9591377-7868-4D64-9314-83E0C92A871B} @@ -469,8 +488,12 @@ Global {54E08BF5-F819-404F-A18D-0AB9EA81EA04} = {32A48625-F0AD-419D-828B-A50BDABA38EA} {E8F0BAA5-7327-43D1-9A51-644E81AE55F1} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37} {46B3E63A-C462-4133-9F27-3B85DA5E7D37} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} - {B2B261E8-56EC-45DC-8AB8-A491A065EFD4} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} {B446E771-AB52-41C9-ACFC-FDF8EACAF291} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} + {15FEBD1B-55CE-4EBD-85E3-04898260A25B} = {274B96B7-F815-47E3-9CA4-4024A57A478F} + {27B1EAE2-2E06-48EF-8A67-06D6FB3DC275} = {274B96B7-F815-47E3-9CA4-4024A57A478F} + {E0756C89-603F-4B48-8E64-1D53E62654C8} = {274B96B7-F815-47E3-9CA4-4024A57A478F} + {7F8057D9-F70F-4EA7-BD64-AB2D0DD8057B} = {3FF38FD4-DF16-44B0-924F-0D5AE155495B} + {2483917E-7024-4D10-99C6-2BEF338FF53B} = {274B96B7-F815-47E3-9CA4-4024A57A478F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6F599E08-A9EA-4FAA-897F-5D824B0210E6} diff --git a/Roslyn.sln b/Roslyn.sln index cd9ba38837780..0d40fbc44e395 100644 --- a/Roslyn.sln +++ b/Roslyn.sln @@ -309,8 +309,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Scri EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roslyn.Services.UnitTests.Utilities", "src\Workspaces\CoreTestUtilities\Roslyn.Services.UnitTests.Utilities.csproj", "{3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Toolset", "build\Toolset\Toolset.csproj", "{57557F32-0635-421A-BCF8-549AED50F764}" -EndProject Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities", "src\EditorFeatures\TestUtilities2\Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities.vbproj", "{3DFB4701-E3D6-4435-9F70-A6E35822C4F2}" EndProject Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Microsoft.VisualStudio.LanguageServices.Test.Utilities2", "src\VisualStudio\TestUtilities2\Microsoft.VisualStudio.LanguageServices.Test.Utilities2.vbproj", "{69F853E5-BD04-4842-984F-FC68CC51F402}" @@ -365,14 +363,32 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevDivPackagesDebugger_DoNo EndProject Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Roslyn.BuildDevDivInsertionFiles", "src\Setup\DevDivInsertionFiles\Roslyn.BuildDevDivInsertionFiles.vbproj", "{5FE910A9-E7C9-40E1-AAF1-6C6C7DD61B67}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetProjectPackUtil", "src\NuGet\NuGetProjectPackUtil.csproj", "{B2B261E8-56EC-45DC-8AB8-A491A065EFD4}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InteractiveHost64", "src\Interactive\Host\InteractiveHost64.csproj", "{2F11618A-9251-4609-B3D5-CE4D2B3D3E49}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.IntegrationTest.IntegrationService", "src\VisualStudio\IntegrationTest\IntegrationService\Microsoft.VisualStudio.IntegrationTest.IntegrationService.csproj", "{764D2C19-0187-4837-A2A3-96DDC6EF4CE2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompilerBenchmarks", "src\Tools\CompilerBenchmarks\CompilerBenchmarks.csproj", "{9860FCF7-3111-4C12-A16F-ACEBA42D930F}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Compilers.Package", "src\NuGet\Microsoft.Net.Compilers\Microsoft.Net.Compilers.Package.csproj", "{9102ECF3-5CD1-4107-B8B7-F3795A52D790}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NETCore.Compilers.Package", "src\NuGet\Microsoft.NETCore.Compilers\Microsoft.NETCore.Compilers.Package.csproj", "{50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Compilers.Package", "src\NuGet\Microsoft.CodeAnalysis.Compilers.Package.csproj", "{CFA94A39-4805-456D-A369-FC35CCC170E9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{C52D8057-43AF-40E6-A01B-6CDBB7301985}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Scripting.Package", "src\NuGet\Microsoft.CodeAnalysis.Scripting.Package.csproj", "{4A490CBC-37F4-4859-AFDB-4B0833D144AF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.EditorFeatures.Package", "src\NuGet\Microsoft.CodeAnalysis.EditorFeatures.Package.csproj", "{34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{BE25E872-1667-4649-9D19-96B83E75A44E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.ExternalAPIs.Roslyn.Package", "src\NuGet\VisualStudio\VS.ExternalAPIs.Roslyn.Package.csproj", "{0EB22BD1-B8B1-417D-8276-F475C2E190FF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.Tools.Roslyn.Package", "src\NuGet\VisualStudio\VS.Tools.Roslyn.Package.csproj", "{3636D3E2-E3EF-4815-B020-819F382204CD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Package", "src\NuGet\Microsoft.CodeAnalysis.Package.csproj", "{B9843F65-262E-4F40-A0BC-2CBEF7563A44}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 4 @@ -870,10 +886,6 @@ Global {3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E}.Release|Any CPU.Build.0 = Release|Any CPU - {57557F32-0635-421A-BCF8-549AED50F764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57557F32-0635-421A-BCF8-549AED50F764}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57557F32-0635-421A-BCF8-549AED50F764}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57557F32-0635-421A-BCF8-549AED50F764}.Release|Any CPU.Build.0 = Release|Any CPU {3DFB4701-E3D6-4435-9F70-A6E35822C4F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3DFB4701-E3D6-4435-9F70-A6E35822C4F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {3DFB4701-E3D6-4435-9F70-A6E35822C4F2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -982,10 +994,6 @@ Global {5FE910A9-E7C9-40E1-AAF1-6C6C7DD61B67}.Debug|Any CPU.Build.0 = Debug|Any CPU {5FE910A9-E7C9-40E1-AAF1-6C6C7DD61B67}.Release|Any CPU.ActiveCfg = Release|Any CPU {5FE910A9-E7C9-40E1-AAF1-6C6C7DD61B67}.Release|Any CPU.Build.0 = Release|Any CPU - {B2B261E8-56EC-45DC-8AB8-A491A065EFD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2B261E8-56EC-45DC-8AB8-A491A065EFD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2B261E8-56EC-45DC-8AB8-A491A065EFD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2B261E8-56EC-45DC-8AB8-A491A065EFD4}.Release|Any CPU.Build.0 = Release|Any CPU {2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Debug|Any CPU.Build.0 = Debug|Any CPU {2F11618A-9251-4609-B3D5-CE4D2B3D3E49}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -998,6 +1006,38 @@ Global {9860FCF7-3111-4C12-A16F-ACEBA42D930F}.Debug|Any CPU.Build.0 = Debug|Any CPU {9860FCF7-3111-4C12-A16F-ACEBA42D930F}.Release|Any CPU.ActiveCfg = Release|Any CPU {9860FCF7-3111-4C12-A16F-ACEBA42D930F}.Release|Any CPU.Build.0 = Release|Any CPU + {9102ECF3-5CD1-4107-B8B7-F3795A52D790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9102ECF3-5CD1-4107-B8B7-F3795A52D790}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9102ECF3-5CD1-4107-B8B7-F3795A52D790}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9102ECF3-5CD1-4107-B8B7-F3795A52D790}.Release|Any CPU.Build.0 = Release|Any CPU + {50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50CF5D8F-F82F-4210-A06E-37CC9BFFDD49}.Release|Any CPU.Build.0 = Release|Any CPU + {CFA94A39-4805-456D-A369-FC35CCC170E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CFA94A39-4805-456D-A369-FC35CCC170E9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CFA94A39-4805-456D-A369-FC35CCC170E9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CFA94A39-4805-456D-A369-FC35CCC170E9}.Release|Any CPU.Build.0 = Release|Any CPU + {4A490CBC-37F4-4859-AFDB-4B0833D144AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A490CBC-37F4-4859-AFDB-4B0833D144AF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A490CBC-37F4-4859-AFDB-4B0833D144AF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A490CBC-37F4-4859-AFDB-4B0833D144AF}.Release|Any CPU.Build.0 = Release|Any CPU + {34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {34E868E9-D30B-4FB5-BC61-AFC4A9612A0F}.Release|Any CPU.Build.0 = Release|Any CPU + {0EB22BD1-B8B1-417D-8276-F475C2E190FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0EB22BD1-B8B1-417D-8276-F475C2E190FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0EB22BD1-B8B1-417D-8276-F475C2E190FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0EB22BD1-B8B1-417D-8276-F475C2E190FF}.Release|Any CPU.Build.0 = Release|Any CPU + {3636D3E2-E3EF-4815-B020-819F382204CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3636D3E2-E3EF-4815-B020-819F382204CD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3636D3E2-E3EF-4815-B020-819F382204CD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3636D3E2-E3EF-4815-B020-819F382204CD}.Release|Any CPU.Build.0 = Release|Any CPU + {B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B9843F65-262E-4F40-A0BC-2CBEF7563A44}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1125,7 +1165,7 @@ Global {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} - {43026D51-3083-4850-928D-07E1883D5B1A} = {3F40F71B-7DCF-44A1-B15C-38CA34824143} + {43026D51-3083-4850-928D-07E1883D5B1A} = {C52D8057-43AF-40E6-A01B-6CDBB7301985} {A88AB44F-7F9D-43F6-A127-83BB65E5A7E2} = {CC126D03-7EAC-493F-B187-DCDEE1EF6A70} {E5A55C16-A5B9-4874-9043-A5266DC02F58} = {CC126D03-7EAC-493F-B187-DCDEE1EF6A70} {3BED15FD-D608-4573-B432-1569C1026F6D} = {CC126D03-7EAC-493F-B187-DCDEE1EF6A70} @@ -1143,7 +1183,6 @@ Global {9C0660D9-48CA-40E1-BABA-8F6A1F11FE10} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} {21A01C2D-2501-4619-8144-48977DD22D9C} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05} {3F2FDC1C-DC6F-44CB-B4A1-A9026F25D66E} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5} - {57557F32-0635-421A-BCF8-549AED50F764} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} {3DFB4701-E3D6-4435-9F70-A6E35822C4F2} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6} {69F853E5-BD04-4842-984F-FC68CC51F402} = {8DBA5174-B0AA-4561-82B1-A46607697753} {6FC8E6F5-659C-424D-AEB5-331B95883E29} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6} @@ -1171,10 +1210,19 @@ Global {037F06F0-3BE8-42D0-801E-2F74FC380AB8} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5} {18BDB5D5-340B-4834-B4FC-0327729A4A26} = {C2D1346B-9665-4150-B644-075CF1636BAA} {5FE910A9-E7C9-40E1-AAF1-6C6C7DD61B67} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} - {B2B261E8-56EC-45DC-8AB8-A491A065EFD4} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} {2F11618A-9251-4609-B3D5-CE4D2B3D3E49} = {5CA5F70E-0FDB-467B-B22C-3CD5994F0087} {764D2C19-0187-4837-A2A3-96DDC6EF4CE2} = {CC126D03-7EAC-493F-B187-DCDEE1EF6A70} {9860FCF7-3111-4C12-A16F-ACEBA42D930F} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC} + {9102ECF3-5CD1-4107-B8B7-F3795A52D790} = {C52D8057-43AF-40E6-A01B-6CDBB7301985} + {50CF5D8F-F82F-4210-A06E-37CC9BFFDD49} = {C52D8057-43AF-40E6-A01B-6CDBB7301985} + {CFA94A39-4805-456D-A369-FC35CCC170E9} = {C52D8057-43AF-40E6-A01B-6CDBB7301985} + {C52D8057-43AF-40E6-A01B-6CDBB7301985} = {3F40F71B-7DCF-44A1-B15C-38CA34824143} + {4A490CBC-37F4-4859-AFDB-4B0833D144AF} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05} + {34E868E9-D30B-4FB5-BC61-AFC4A9612A0F} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6} + {BE25E872-1667-4649-9D19-96B83E75A44E} = {8DBA5174-B0AA-4561-82B1-A46607697753} + {0EB22BD1-B8B1-417D-8276-F475C2E190FF} = {BE25E872-1667-4649-9D19-96B83E75A44E} + {3636D3E2-E3EF-4815-B020-819F382204CD} = {BE25E872-1667-4649-9D19-96B83E75A44E} + {B9843F65-262E-4F40-A0BC-2CBEF7563A44} = {C52D8057-43AF-40E6-A01B-6CDBB7301985} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {604E6B91-7BC0-4126-AE07-D4D2FEFC3D29} diff --git a/SourceBuild.sln b/SourceBuild.sln index 55e71684a3dfb..71d7b261583f7 100644 --- a/SourceBuild.sln +++ b/SourceBuild.sln @@ -28,10 +28,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VBCSCompiler", "src\Compile EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{B57E7F86-EB16-4F60-A47C-F9D170F54400}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{CF8C8A40-B634-493D-9070-3319698BC280}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetProjectPackUtil", "src\NuGet\NuGetProjectPackUtil.csproj", "{1D59AF1F-972B-423C-AEF3-2003E1BB1B43}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -44,76 +40,76 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x64.ActiveCfg = Debug|x64 - {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x64.Build.0 = Debug|x64 - {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x86.ActiveCfg = Debug|x86 - {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x86.Build.0 = Debug|x86 + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x64.ActiveCfg = Debug|Any CPU + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x64.Build.0 = Debug|Any CPU + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x86.ActiveCfg = Debug|Any CPU + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x86.Build.0 = Debug|Any CPU {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|Any CPU.ActiveCfg = Release|Any CPU {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|Any CPU.Build.0 = Release|Any CPU - {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x64.ActiveCfg = Release|x64 - {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x64.Build.0 = Release|x64 - {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x86.ActiveCfg = Release|x86 - {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x86.Build.0 = Release|x86 + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x64.ActiveCfg = Release|Any CPU + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x64.Build.0 = Release|Any CPU + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x86.ActiveCfg = Release|Any CPU + {1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x86.Build.0 = Release|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x64.ActiveCfg = Debug|x64 - {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x64.Build.0 = Debug|x64 - {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x86.ActiveCfg = Debug|x86 - {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x86.Build.0 = Debug|x86 + {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x64.ActiveCfg = Debug|Any CPU + {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x64.Build.0 = Debug|Any CPU + {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x86.ActiveCfg = Debug|Any CPU + {B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x86.Build.0 = Debug|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|Any CPU.ActiveCfg = Release|Any CPU {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|Any CPU.Build.0 = Release|Any CPU - {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x64.ActiveCfg = Release|x64 - {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x64.Build.0 = Release|x64 - {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x86.ActiveCfg = Release|x86 - {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x86.Build.0 = Release|x86 + {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x64.ActiveCfg = Release|Any CPU + {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x64.Build.0 = Release|Any CPU + {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x86.ActiveCfg = Release|Any CPU + {B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x86.Build.0 = Release|Any CPU {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|x64.ActiveCfg = Debug|x64 - {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|x64.Build.0 = Debug|x64 - {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|x86.ActiveCfg = Debug|x86 - {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|x86.Build.0 = Debug|x86 + {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|x64.ActiveCfg = Debug|Any CPU + {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|x64.Build.0 = Debug|Any CPU + {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|x86.ActiveCfg = Debug|Any CPU + {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|x86.Build.0 = Debug|Any CPU {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|Any CPU.ActiveCfg = Release|Any CPU {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|Any CPU.Build.0 = Release|Any CPU - {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|x64.ActiveCfg = Release|x64 - {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|x64.Build.0 = Release|x64 - {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|x86.ActiveCfg = Release|x86 - {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|x86.Build.0 = Release|x86 + {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|x64.ActiveCfg = Release|Any CPU + {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|x64.Build.0 = Release|Any CPU + {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|x86.ActiveCfg = Release|Any CPU + {2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|x86.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}.Debug|x64.ActiveCfg = Debug|x64 - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x64.Build.0 = Debug|x64 - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x86.ActiveCfg = Debug|x86 - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x86.Build.0 = Debug|x86 + {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x64.ActiveCfg = Debug|Any CPU + {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x64.Build.0 = Debug|Any CPU + {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x86.ActiveCfg = Debug|Any CPU + {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Debug|x86.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 - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x64.ActiveCfg = Release|x64 - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x64.Build.0 = Release|x64 - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x86.ActiveCfg = Release|x86 - {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x86.Build.0 = Release|x86 + {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x64.ActiveCfg = Release|Any CPU + {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x64.Build.0 = Release|Any CPU + {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x86.ActiveCfg = Release|Any CPU + {E3CD2895-76A8-4D11-A316-EA67CB5EA42C}.Release|x86.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}.Debug|x64.ActiveCfg = Debug|x64 - {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x64.Build.0 = Debug|x64 - {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x86.ActiveCfg = Debug|x86 - {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x86.Build.0 = Debug|x86 + {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x64.ActiveCfg = Debug|Any CPU + {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x64.Build.0 = Debug|Any CPU + {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x86.ActiveCfg = Debug|Any CPU + {8CE3A581-2969-4864-A803-013E9D977C3A}.Debug|x86.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 - {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.ActiveCfg = Release|x64 - {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.Build.0 = Release|x64 - {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x86.ActiveCfg = Release|x86 - {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x86.Build.0 = Release|x86 + {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.ActiveCfg = Release|Any CPU + {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.Build.0 = Release|Any CPU + {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x86.ActiveCfg = Release|Any CPU + {8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x86.Build.0 = Release|Any CPU {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|x64.ActiveCfg = Debug|x64 - {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|x64.Build.0 = Debug|x64 - {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|x86.ActiveCfg = Debug|x86 - {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|x86.Build.0 = Debug|x86 + {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|x64.ActiveCfg = Debug|Any CPU + {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|x64.Build.0 = Debug|Any CPU + {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|x86.ActiveCfg = Debug|Any CPU + {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|x86.Build.0 = Debug|Any CPU {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|Any CPU.ActiveCfg = Release|Any CPU {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|Any CPU.Build.0 = Release|Any CPU - {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|x64.ActiveCfg = Release|x64 - {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|x64.Build.0 = Release|x64 - {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|x86.ActiveCfg = Release|x86 - {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|x86.Build.0 = Release|x86 + {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|x64.ActiveCfg = Release|Any CPU + {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|x64.Build.0 = Release|Any CPU + {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|x86.ActiveCfg = Release|Any CPU + {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|x86.Build.0 = Release|Any CPU {649CE05A-529C-40D7-A501-CA9BCFEE40DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {649CE05A-529C-40D7-A501-CA9BCFEE40DC}.Debug|Any CPU.Build.0 = Debug|Any CPU {649CE05A-529C-40D7-A501-CA9BCFEE40DC}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -126,18 +122,9 @@ Global {649CE05A-529C-40D7-A501-CA9BCFEE40DC}.Release|x64.Build.0 = Release|Any CPU {649CE05A-529C-40D7-A501-CA9BCFEE40DC}.Release|x86.ActiveCfg = Release|Any CPU {649CE05A-529C-40D7-A501-CA9BCFEE40DC}.Release|x86.Build.0 = Release|Any CPU - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43}.Debug|x64.ActiveCfg = Debug|Any CPU - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43}.Debug|x64.Build.0 = Debug|Any CPU - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43}.Debug|x86.ActiveCfg = Debug|Any CPU - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43}.Debug|x86.Build.0 = Debug|Any CPU - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43}.Release|Any CPU.Build.0 = Release|Any CPU - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43}.Release|x64.ActiveCfg = Release|Any CPU - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43}.Release|x64.Build.0 = Release|Any CPU - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43}.Release|x86.ActiveCfg = Release|Any CPU - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {DDFAE591-7414-4CC9-AD99-427C2D153893} = {6D173F59-562E-4BAA-8D98-9A8F4901D99A} @@ -152,7 +139,8 @@ Global {7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3} = {5DC491BA-E836-47C1-A4AA-3C770742718B} {649CE05A-529C-40D7-A501-CA9BCFEE40DC} = {B57E7F86-EB16-4F60-A47C-F9D170F54400} {B57E7F86-EB16-4F60-A47C-F9D170F54400} = {DDFAE591-7414-4CC9-AD99-427C2D153893} - {CF8C8A40-B634-493D-9070-3319698BC280} = {DDFAE591-7414-4CC9-AD99-427C2D153893} - {1D59AF1F-972B-423C-AEF3-2003E1BB1B43} = {CF8C8A40-B634-493D-9070-3319698BC280} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {8157FCF4-7FB2-412F-883A-DC40977425EC} EndGlobalSection EndGlobal diff --git a/build.sh b/build.sh index 4d95d04c940e9..03eeff0ad74a1 100755 --- a/build.sh +++ b/build.sh @@ -15,8 +15,7 @@ usage() echo " --release Build Release" echo " --restore Restore projects required to build" echo " --build Build all projects" - echo " --pack Build prerelease nuget packages" - echo " --packall Build all nuget packages" + echo " --pack Build nuget packages" echo " --test Run unit tests" echo " --mono Run unit tests with mono" echo " --build-bootstrap Build the bootstrap compilers" @@ -35,7 +34,6 @@ restore=false build=false test_=false pack=false -pack_all=false use_mono=false build_bootstrap=false use_bootstrap=false @@ -100,10 +98,6 @@ do --pack) pack=true ;; - --packall) - pack_all=true - pack=true - ;; *) echo "$1" usage @@ -120,32 +114,6 @@ mkdir -p ${binaries_path} mkdir -p ${config_path} mkdir -p ${logs_path} -function pack_all_kind() { - pushd "${root_path}/src/NuGet" - - echo Packing $1 - - local nupkg_path="${config_path}/NuGet/PreRelease" - local nuspec_files=("Microsoft.CodeAnalysis.CSharp.nuspec" "Microsoft.CodeAnalysis.Compilers.nuspec" "Microsoft.CodeAnalysis.VisualBasic.nuspec" "Microsoft.CodeAnalysis.Common.nuspec" "Microsoft.NETCore.Compilers.nuspec") - mkdir -p ${nupkg_path} - for i in "${nuspec_files[@]}" - do - dotnet pack -nologo --no-build NuGetProjectPackUtil.csproj -p:NuSpecFile=$i -p:NuGetPackageKind=$1 -p:NuspecBasePath=${binaries_path}/Debug -o ${nupkg_path} - done - - popd -} - -function pack_all() { - pack_all_kind PreRelease - - if [[ "$pack_all" = true ]] - then - pack_all_kind Release - pack_all_kind PerBuildPreRelease - fi -} - function stop_processes { echo "Killing running build processes..." pkill -9 "dotnet" || true @@ -164,32 +132,29 @@ source "${root_path}"/build/scripts/obtain_dotnet.sh if [[ "$restore" == true ]] then echo "Restoring RoslynToolset.csproj" - dotnet restore "${root_path}/build/ToolsetPackages/RoslynToolset.csproj" /bl:${logs_path}/Restore-RoslynToolset.binlog + dotnet restore "${root_path}/build/ToolsetPackages/RoslynToolset.csproj" "/bl:${logs_path}/Restore-RoslynToolset.binlog" echo "Restoring Compilers.sln" - dotnet restore "${root_path}/Compilers.sln" /bl:${logs_path}/Restore-Compilers.binlog + dotnet restore "${root_path}/Compilers.sln" "/bl:${logs_path}/Restore-Compilers.binlog" fi build_args="--no-restore -c ${build_configuration} /nologo" if [[ "$build_bootstrap" == true ]] then - echo "Building bootstrap toolset" - bootstrap_build_args="${build_args} /p:UseShippingAssemblyVersion=true /p:InitialDefineConstants=BOOTSTRAP" - bootstrap_files=( 'src/Compilers/CSharp/csc/csc.csproj' 'src/Compilers/VisualBasic/vbc/vbc.csproj' 'src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj' 'src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj') - for bootstrap_file in "${bootstrap_files[@]}" - do - bootstrap_name=$(basename $bootstrap_file) - dotnet publish "${bootstrap_file}" --framework netcoreapp2.0 ${bootstrap_build_args} "/bl:${binaries_path}/${bootstrap_name}.binlog" - done + echo "Building bootstrap compiler" rm -rf ${bootstrap_path} mkdir -p ${bootstrap_path} - dotnet pack -nologo src/NuGet/NuGetProjectPackUtil.csproj -p:NuSpecFile=Microsoft.NETCore.Compilers.nuspec -p:NuGetPackageKind=Bootstrap -p:NuspecBasePath=${binaries_path}/Debug -o ${bootstrap_path} - mkdir -p ${bootstrap_path}/microsoft.netcore.compilers - unzip ${bootstrap_path}/Microsoft.NETCore.Compilers.42.42.42.42-bootstrap.nupkg -d ${bootstrap_path}/microsoft.netcore.compilers/42.42.42.42 - chmod -R 755 ${bootstrap_path}/microsoft.netcore.compilers - dotnet clean Compilers.sln + project_path=src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj + + dotnet pack -nologo ${project_path} /p:DotNetUseShippingVersions=true /p:InitialDefineConstants=BOOTSTRAP /p:PackageOutputPath=${bootstrap_path} + unzip ${bootstrap_path}/Microsoft.NETCore.Compilers.*.nupkg -d ${bootstrap_path} + chmod -R 755 ${bootstrap_path} + + echo "Cleaning Bootstrap compiler artifacts" + dotnet clean ${project_path} + stop_processes fi @@ -208,20 +173,20 @@ fi if [[ "${build}" == true ]] then echo "Building Compilers.sln" - dotnet build "${root_path}"/Compilers.sln ${build_args} "/bl:${binaries_path}/Build.binlog" -fi -if [[ "${pack}" == true ]] -then - pack_all + if [[ "${pack}" == true ]] + then + build_args+=" /t:Pack" + fi + + dotnet build "${root_path}/Compilers.sln" ${build_args} "/bl:${binaries_path}/Build.binlog" fi if [[ "${stop_vbcscompiler}" == true ]] then if [[ "${use_bootstrap}" == true ]] then - echo "Stopping VBCSCompiler" - dotnet "${bootstrap_path}"/microsoft.netcore.compilers/42.42.42.42/tools/bincore/VBCSCompiler.dll -shutdown + dotnet build-server shutdown else echo "--stop-vbcscompiler requires --use-bootstrap. Aborting." exit 1 diff --git a/build/Targets/BeforeCommonTargets.targets b/build/Targets/BeforeCommonTargets.targets index 7c873ab12c75f..70b18cf850cfd 100644 --- a/build/Targets/BeforeCommonTargets.targets +++ b/build/Targets/BeforeCommonTargets.targets @@ -73,7 +73,7 @@ $(IntermediateOutputPath)$(TargetFramework.ToLowerInvariant())\ - $(OutputPath)$(TargetFramework.ToLowerInvariant())\ + $(OutputPath)$(TargetFramework.ToLowerInvariant())\ $(IntermediateOutputPath)$(AssemblyName).xml diff --git a/build/Targets/Imports.targets b/build/Targets/Imports.targets index 9bacf4f685bbd..ae067b6dc8e96 100644 --- a/build/Targets/Imports.targets +++ b/build/Targets/Imports.targets @@ -95,24 +95,6 @@ DestinationFolder="$(OutDir)" /> - - - - - - false - - - + + + + + + + + + $(PackageDescription) + More details at https://aka.ms/roslyn-packages + This package was built from the source at $(PrivateRepositoryUrl)/commit/$(SourceRevisionId). + + + + + + + + + + + + true + false + false + + + + + + + + + + + diff --git a/build/Targets/PackageProject.targets b/build/Targets/PackageProject.targets new file mode 100644 index 0000000000000..3326b7d9aae51 --- /dev/null +++ b/build/Targets/PackageProject.targets @@ -0,0 +1,22 @@ + + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + + + + + false + + \ No newline at end of file diff --git a/build/Targets/Packages.props b/build/Targets/Packages.props index 5e242985a42a2..f848edd6ea5f7 100644 --- a/build/Targets/Packages.props +++ b/build/Targets/Packages.props @@ -6,6 +6,25 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + 2.11.0 + beta1 + true + + + $(VersionPrefix).0 + + + 2.6.2-beta2 @@ -146,9 +165,10 @@ 0.2.4-beta 1.0.0-beta2-63222-01 0.5.0-alpha + 1.0.0-beta2-63223-01 0.1.3 1.0.0-beta2-dev3 - 1.0.0-beta2-62731-01 + 1.0.0-beta2-63217-01 4.3.0 1.1.92 4.3.0 @@ -241,9 +261,76 @@ 2.3.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true true + true diff --git a/build/Targets/RepoToolset/AfterSolutionBuild.proj b/build/Targets/RepoToolset/AfterSolutionBuild.proj new file mode 100644 index 0000000000000..d644ba1d627b5 --- /dev/null +++ b/build/Targets/RepoToolset/AfterSolutionBuild.proj @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/build/Targets/RepoToolset/BuildReleasePackages.targets b/build/Targets/RepoToolset/BuildReleasePackages.targets new file mode 100644 index 0000000000000..c3258c73103fa --- /dev/null +++ b/build/Targets/RepoToolset/BuildReleasePackages.targets @@ -0,0 +1,32 @@ + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)roslyntools.nugetrepack.buildtasks\$(RoslynToolsNuGetRepackVersion)\tools\net461\RoslynTools.NuGetRepack.BuildTasks.dll + <_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)roslyntools.nugetrepack.buildtasks\$(RoslynToolsNuGetRepackVersion)\tools\netcoreapp2.0\RoslynTools.NuGetRepack.BuildTasks.dll + + + + + + + + + + + <_BuiltPackages Include="$(ArtifactsShippingPackagesDir)*.nupkg" /> + + + + + + + + + + + diff --git a/build/Targets/RepoToolset/BuildTasks.props b/build/Targets/RepoToolset/BuildTasks.props index 2a933932f2668..67497365ea3d3 100644 --- a/build/Targets/RepoToolset/BuildTasks.props +++ b/build/Targets/RepoToolset/BuildTasks.props @@ -5,7 +5,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - $(NuGetPackageRoot)roslyntools.buildtasks\$(RoslynToolsBuildTasksVersion)\tools\net46\RoslynTools.BuildTasks.dll - $(NuGetPackageRoot)roslyntools.buildtasks\$(RoslynToolsBuildTasksVersion)\tools\netcoreapp1.0\RoslynTools.BuildTasks.dll + $(NuGetPackageRoot)roslyntools.buildtasks\$(RoslynToolsBuildTasksVersion)\tools\net461\RoslynTools.BuildTasks.dll + $(NuGetPackageRoot)roslyntools.buildtasks\$(RoslynToolsBuildTasksVersion)\tools\netcoreapp2.0\RoslynTools.BuildTasks.dll \ No newline at end of file diff --git a/build/Targets/RepoToolset/Imports.targets b/build/Targets/RepoToolset/Imports.targets index e5c5151b8a622..d990627f439b7 100644 --- a/build/Targets/RepoToolset/Imports.targets +++ b/build/Targets/RepoToolset/Imports.targets @@ -10,6 +10,20 @@ true + + + true + + $(ArtifactsShippingPackagesDir) + $(ArtifactsNonShippingPackagesDir) + + diff --git a/build/Targets/RepoToolset/RepoLayout.props b/build/Targets/RepoToolset/RepoLayout.props index 01b739e325d3d..455428bc8f9bc 100644 --- a/build/Targets/RepoToolset/RepoLayout.props +++ b/build/Targets/RepoToolset/RepoLayout.props @@ -35,5 +35,7 @@ $(ArtifactsConfigurationDir)SymStore\ $(ArtifactsConfigurationDir)tmp\ $(ArtifactsConfigurationDir)NuGet\ + $(ArtifactsPackagesDir)Shipping\ + $(ArtifactsPackagesDir)NonShipping\ diff --git a/build/Targets/RepoToolset/Version.targets b/build/Targets/RepoToolset/Version.targets index 6a60e867d00d2..2427ce9a9cb78 100644 --- a/build/Targets/RepoToolset/Version.targets +++ b/build/Targets/RepoToolset/Version.targets @@ -41,7 +41,7 @@ - diff --git a/build/Targets/RepoToolset/Workarounds.targets b/build/Targets/RepoToolset/Workarounds.targets index fba52c9b002c2..19dfca3b3ca2e 100644 --- a/build/Targets/RepoToolset/Workarounds.targets +++ b/build/Targets/RepoToolset/Workarounds.targets @@ -18,10 +18,10 @@ - + false @@ -78,4 +78,75 @@ + + + + + + $(RepositoryUrl) + + + + + + + + + + + + + + + + + + + + + + + + + + @(NuspecProperty, ';') + + + + + + + + $(PrivateRepositoryUrl) + $(SourceRevisionId) + + + + + + *$(MSBuildProjectName)* + + + + + $(NuspecPackageId) + + \ No newline at end of file diff --git a/build/Targets/Settings.props b/build/Targets/Settings.props index 4fbaee40d312b..ee776ccd60216 100644 --- a/build/Targets/Settings.props +++ b/build/Targets/Settings.props @@ -8,21 +8,10 @@ https://github.com/dotnet/roslyn + $(RepositoryUrl)/blob/master/License.txt https://raw.githubusercontent.com/dotnet/roslyn - - - - - 2.11.0 - beta1 - true - - - $(VersionPrefix).0 + https://github.com/dotnet/roslyn + Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics @@ -54,6 +43,7 @@ true true + $(MSBuildThisFileDirectory)..\..\src\NuGet\ThirdPartyNotices.rtf $(NuGetPackageRoot)\roslyntools.referenceassemblies\$(RoslynToolsReferenceAssembliesVersion)\tools\framework 15.0 @@ -103,13 +93,14 @@ <_PackageName Condition="'$(MSBuildRuntimeType)' != 'Core'">Microsoft.Net.Compilers <_PackageName Condition="'$(MSBuildRuntimeType)' == 'Core'">Microsoft.NETCore.Compilers - <_PackageVersion Condition="'$(MSBuildRuntimeType)' != 'Core' AND '$(BootstrapBuildPath)' == ''">$(MicrosoftNetCompilersVersion) - <_PackageVersion Condition="'$(MSBuildRuntimeType)' == 'Core' AND '$(BootstrapBuildPath)' == ''">$(MicrosoftNETCoreCompilersVersion) - <_PackageVersion Condition="'$(BootstrapBuildPath)' != ''">42.42.42.42 - <_PackageRoot>$(NuGetPackageRoot) - <_PackageRoot Condition="'$(BootstrapBuildPath)' != ''">$(BootstrapBuildPath) - $(_PackageRoot)\$(_PackageName.ToLower())\$(_PackageVersion) - $(RoslynToolsetDirectory)\build\$(_PackageName).props + <_PackageVersion Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MicrosoftNetCompilersVersion) + <_PackageVersion Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MicrosoftNETCoreCompilersVersion) + + $(NuGetPackageRoot)$(_PackageName.ToLower())\$(_PackageVersion)\ + $(BootstrapBuildPath) + $(RoslynToolsetDirectory)\ + + $(RoslynToolsetDirectory)build\$(_PackageName).props @@ -131,18 +122,17 @@ - diff --git a/build/Toolset/Program.cs b/build/Toolset/Program.cs deleted file mode 100644 index 3859fe1967c75..0000000000000 --- a/build/Toolset/Program.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace DoNotUse -{ - public class Program - { - private static void Main(string[] args) - { - throw new Exception("Do not use"); - } - } -} diff --git a/build/Toolset/Toolset.csproj b/build/Toolset/Toolset.csproj deleted file mode 100644 index e64b6af0b6d61..0000000000000 --- a/build/Toolset/Toolset.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - AnyCPU - AnyCPU - Exe - Toolset_DoNotUse - net46 - $(RoslynCrossPlatformRuntimeIdentifiers) - true - false - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/Toolset/Toolset_DoNetUse.xml b/build/Toolset/Toolset_DoNetUse.xml deleted file mode 100644 index 30da0a393e944..0000000000000 --- a/build/Toolset/Toolset_DoNetUse.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - Toolset_DoNetUse - - - - diff --git a/build/ToolsetPackages/RoslynToolset.csproj b/build/ToolsetPackages/RoslynToolset.csproj index 3b1532fc4872f..514ac72d82790 100644 --- a/build/ToolsetPackages/RoslynToolset.csproj +++ b/build/ToolsetPackages/RoslynToolset.csproj @@ -16,6 +16,7 @@ + diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1 index 06d2d742dca8f..bf3b19a0343fe 100644 --- a/build/scripts/build.ps1 +++ b/build/scripts/build.ps1 @@ -26,7 +26,6 @@ param ( [switch]$bootstrap = $false, [switch]$sign = $false, [switch]$pack = $false, - [switch]$packAll = $false, [switch]$binaryLog = $false, [switch]$deployExtensions = $false, [switch]$launch = $false, @@ -124,8 +123,7 @@ function Process-Arguments() { exit 1 } - $script:pack = $pack -or $packAll - $script:packAll = $packAll -or ($pack -and $official) + $script:pack = $pack if ($buildCoreClr) { $script:build = $true @@ -208,62 +206,43 @@ function Restore-Packages() { # Important to not set $script:bootstrapDir here yet as we're actually in the process of # building the bootstrap. function Make-BootstrapBuild() { + Write-Host "Building bootstrap compiler" + $dir = Join-Path $binariesDir "Bootstrap" - Write-Host "Building Bootstrap compiler" - $bootstrapArgs = "/p:DotNetUseShippingVersions=true /p:InitialDefineConstants=BOOTSTRAP" Remove-Item -re $dir -ErrorAction SilentlyContinue Create-Directory $dir - if ($buildCoreClr) { - $bootstrapFramework = "netcoreapp2.0" - $projectFiles = @( - 'src/Compilers/CSharp/csc/csc.csproj', - 'src/Compilers/VisualBasic/vbc/vbc.csproj', - 'src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj', - 'src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj' - ) - - foreach ($projectFilePath in $projectFiles) { - $fileName = [IO.Path]::GetFileNameWithoutExtension((Split-Path -leaf $projectFilePath)) - $logFileName = "Bootstrap$($fileName)" - Run-MSBuild $projectFilePath "/t:Publish /p:TargetFramework=netcoreapp2.0 $bootstrapArgs" -logFileName $logFileName -useDotnetBuild - } - Pack-One "Microsoft.NetCore.Compilers.nuspec" "Bootstrap" $dir - Unzip-File "$dir\Microsoft.NETCore.Compilers.42.42.42.42-bootstrap.nupkg" "$dir\Microsoft.NETCore.Compilers\42.42.42.42" - - Write-Host "Cleaning Bootstrap compiler artifacts" - Run-MSBuild "Compilers.sln" "/t:Clean" - Stop-BuildProcesses - } - else { - Run-MSBuild "build\Toolset\Toolset.csproj" $bootstrapArgs -logFileName "Bootstrap" - Remove-Item -re $dir -ErrorAction SilentlyContinue - Create-Directory $dir + $packageName = if ($buildCoreClr) { "Microsoft.NETCore.Compilers" } else { "Microsoft.Net.Compilers" } + $projectPath = "src\NuGet\$packageName\$packageName.Package.csproj" - Pack-One "Microsoft.Net.Compilers.nuspec" "Bootstrap" $dir - Unzip-File "$dir\Microsoft.Net.Compilers.42.42.42.42-bootstrap.nupkg" "$dir\Microsoft.Net.Compilers\42.42.42.42" + Run-MSBuild $projectPath "/t:Pack /p:DotNetUseShippingVersions=true /p:InitialDefineConstants=BOOTSTRAP /p:PackageOutputPath=$dir" -logFileName "Bootstrap" -useDotnetBuild:$buildCoreClr + $packageFile = Get-ChildItem -Path $dir -Filter "$packageName.*.nupkg" + Unzip-File "$dir\$packageFile" $dir - Write-Host "Cleaning Bootstrap compiler artifacts" - Run-MSBuild "build\Toolset\Toolset.csproj" "/t:Clean" -logFileName "BootstrapClean" - Stop-BuildProcesses - } + Write-Host "Cleaning Bootstrap compiler artifacts" + Run-MSBuild $projectPath "/t:Clean" -logFileName "BootstrapClean" return $dir } function Build-Artifacts() { + $args = "/t:Build" + if ($pack) { $args += " /t:Pack" } + if (-not $deployExtensions) { $args += " /p:DeployExtension=false" } + if ($buildCoreClr) { - Run-MSBuild "Compilers.sln" -useDotnetBuild + Run-MSBuild "Compilers.sln" $args -useDotnetBuild } elseif ($build) { - Run-MSBuild "Roslyn.sln" $(if (-not $deployExtensions) {"/p:DeployExtension=false"}) + Run-MSBuild "Roslyn.sln" $args + if (-not $skipBuildExtras) { Build-ExtraSignArtifacts } } if ($pack) { - Build-NuGetPackages + Run-MSBuild "build\Targets\RepoToolset\AfterSolutionBuild.proj" "/t:Pack" } if ($sign) { @@ -274,7 +253,7 @@ function Build-Artifacts() { Build-DeployToSymStore } - if ($build -and (-not $skipBuildExtras) -and (-not $buildCoreClr)) { + if ($build -and $pack -and (-not $skipBuildExtras) -and (-not $buildCoreClr)) { Build-InsertionItems Build-Installer } @@ -286,15 +265,6 @@ 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 csc" - Run-MSBuild "..\Compilers\CSharp\csc\csc.csproj" "/p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding" - Write-Host "Publishing vbc" - Run-MSBuild "..\Compilers\VisualBasic\vbc\vbc.csproj" "/p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding" - Write-Host "Publishing VBCSCompiler" - Run-MSBuild "..\Compilers\Server\VBCSCompiler\VBCSCompiler.csproj" "/p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding" - Write-Host "Publishing Microsoft.Build.Tasks.CodeAnalysis" - Run-MSBuild "..\Compilers\Core\MSBuildTask\Microsoft.Build.Tasks.CodeAnalysis.csproj" "/p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding" Write-Host "Building PortableFacades Swix" Run-MSBuild "DevDivVsix\PortableFacades\PortableFacades.swixproj" Write-Host "Building CompilersCodeAnalysis Swix" @@ -337,7 +307,9 @@ function Build-InsertionItems() { Push-Location $setupDir try { Create-PerfTests - Exec-Console (Join-Path $configDir "Exes\Roslyn.BuildDevDivInsertionFiles\Roslyn.BuildDevDivInsertionFiles.exe") "$configDir $repoDir $(Get-PackagesDir)" + + Write-Host "Building VS Insertion artifacts" + Exec-Console (Join-Path $configDir "Exes\Roslyn.BuildDevDivInsertionFiles\Roslyn.BuildDevDivInsertionFiles.exe") "$configDir $(Get-PackagesDir)" # In non-official builds need to supply values for a few MSBuild properties. The actual value doesn't # matter, just that it's provided some value. @@ -348,14 +320,11 @@ function Build-InsertionItems() { $insertionDir = Join-Path $configDir "DevDivInsertionFiles" $vsToolsDir = Join-Path $insertionDir "VS.Tools.Roslyn" + $packageOutDir = Join-Path $configDir "DevDivPackages\Roslyn" - $packArgs = "/p:NoPackageAnalysis=true" Create-Directory $packageOutDir - Pack-One (Join-Path $insertionDir "VS.ExternalAPIs.Roslyn.nuspec") "PerBuildPreRelease" $packageOutDir $packArgs - Pack-One (Join-Path $vsToolsDir "VS.Tools.Roslyn.nuspec") "PerBuildPreRelease" $packageOutDir $packArgs -basePath $vsToolsDir - $netfx20Dir = Join-Path $repoDir "src\Dependencies\Microsoft.NetFX20" - Pack-One (Join-Path $netfx20Dir "Microsoft.NetFX20.nuspec") "PerBuildPreRelease" -packageOutDir (Join-Path $configDir "NuGet\NetFX20") -basePath $netfx20Dir -extraArgs "$packArgs /p:CurrentVersion=4.3.0" + Copy-Item (Join-Path $configDir "NuGet\NonShipping\VS.*.nupkg") -Destination $packageOutDir Run-MSBuild "DevDivVsix\PortableFacades\PortableFacades.vsmanproj" -buildArgs $extraArgs Run-MSBuild "DevDivVsix\CompilersPackage\Microsoft.CodeAnalysis.Compilers.vsmanproj" -buildArgs $extraArgs @@ -416,71 +385,6 @@ function Build-Installer () { Compress-Archive -Path $intermidateDirectory -DestinationPath $installerZip } -function Pack-One([string]$nuspecFilePath, [string]$packageKind, [string]$packageOutDir = "", [string]$extraArgs = "", [string]$basePath = "", [switch]$useConsole = $true) { - $nugetDir = Join-Path $repoDir "src\Nuget" - if ($packageOutDir -eq "") { - $packageOutDir = Join-Path $configDir "NuGet\$packageKind" - } - - if ($basePath -eq "") { - $basePath = $configDir - } - - if (-not ([IO.Path]::IsPathRooted($nuspecFilePath))) { - $nuspecFilePath = Join-Path $nugetDir $nuspecFilePath - } - - Create-Directory $packageOutDir - $nuspecFileName = Split-Path -leaf $nuspecFilePath - $projectFilePath = Join-Path $nugetDir "NuGetProjectPackUtil.csproj" - $packArgs = "pack -nologo --no-build $projectFilePath $extraArgs /p:NugetPackageKind=$packageKind /p:NuspecFile=$nuspecFilePath /p:NuspecBasePath=$basePath -o $packageOutDir" - - if ($official) { - $packArgs = "$packArgs /p:OfficialBuild=true" - } - - Write-Host $dotnet $packArgs - - if ($useConsole) { - Exec-Console $dotnet $packArgs - } - else { - Exec-Command $dotnet $packArgs - } -} - -function Build-NuGetPackages() { - - function Pack-All([string]$packageKind, $extraArgs) { - - Write-Host "Packing for $packageKind" - foreach ($item in Get-ChildItem *.nuspec) { - $name = Split-Path -leaf $item - Pack-One $name $packageKind -extraArgs $extraArgs - } - } - - Push-Location (Join-Path $repoDir "src\NuGet") - try { - $extraArgs = "" - - # Empty directory for packing explicit empty items in the nuspec - $emptyDir = Join-Path ([IO.Path]::GetTempPath()) ([IO.Path]::GetRandomFileName()) - Create-Directory $emptyDir - New-Item -Path (Join-Path $emptyDir "_._") -Type File | Out-Null - $extraArgs += " /p:EmptyDir=$emptyDir" - - Pack-All "PreRelease" $extraArgs - if ($packAll) { - Pack-All "Release" $extraArgs - Pack-All "PerBuildPreRelease" $extraArgs - } - } - finally { - Pop-Location - } -} - function Build-DeployToSymStore() { Run-MSBuild "Roslyn.sln" "/t:DeployToSymStore" -logFileName "RoslynDeployToSymStore" } diff --git a/build/scripts/cibuild.cmd b/build/scripts/cibuild.cmd index 1551ffc63a6cc..b4dc8daa4b4b5 100644 --- a/build/scripts/cibuild.cmd +++ b/build/scripts/cibuild.cmd @@ -1,2 +1,2 @@ @echo off -powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\build.ps1" -cibuild -build -restore -bootstrap -binaryLog %* +powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\build.ps1" -cibuild -build -restore -bootstrap -pack -binaryLog %* diff --git a/build/scripts/cibuild.sh b/build/scripts/cibuild.sh index 1d028504b4841..80237d0c442f2 100755 --- a/build/scripts/cibuild.sh +++ b/build/scripts/cibuild.sh @@ -24,4 +24,4 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 echo "Building this commit:" git show --no-patch --pretty=raw HEAD -"${root_path}"/build.sh --restore --bootstrap --build --packall --stop-vbcscompiler --test "$@" +"${root_path}"/build.sh --restore --bootstrap --build --pack --stop-vbcscompiler --test "$@" diff --git a/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj b/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj index 691a5b2dd227c..37bf117b0a9a8 100644 --- a/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj +++ b/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj @@ -7,7 +7,31 @@ Library Microsoft.CodeAnalysis.CSharp netstandard1.3 + + + true + true + Microsoft.CodeAnalysis.CSharp.CodeStyle + + .NET Compiler Platform ("Roslyn") code style analyzers for C#. + + $(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage + + + + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CSharp.CodeStyle\Microsoft.CodeAnalysis.CSharp.CodeStyle.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes\Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CodeStyle\Microsoft.CodeAnalysis.CodeStyle.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CodeStyle.Fixes\Microsoft.CodeAnalysis.CodeStyle.Fixes.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CSharp.CodeStyle\**\Microsoft.CodeAnalysis.CSharp.CodeStyle.resources.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes\**\Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.resources.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CodeStyle\**\Microsoft.CodeAnalysis.CodeStyle.resources.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CodeStyle.Fixes\**\Microsoft.CodeAnalysis.CodeStyle.Fixes.resources.dll"/> + + + + diff --git a/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj b/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj index 71731bd147d18..7c83e925f4e7f 100644 --- a/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj +++ b/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj @@ -7,7 +7,31 @@ Library netstandard1.3 + + + true + true + Microsoft.CodeAnalysis.VisualBasic.CodeStyle + + .NET Compiler Platform ("Roslyn") code style analyzers for Visual Basic. + + $(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage + + + + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.VisualBasic.CodeStyle\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CodeStyle\Microsoft.CodeAnalysis.CodeStyle.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CodeStyle.Fixes\Microsoft.CodeAnalysis.CodeStyle.Fixes.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.VisualBasic.CodeStyle\**\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.resources.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes\**\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.resources.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CodeStyle\**\Microsoft.CodeAnalysis.CodeStyle.resources.dll"/> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CodeStyle.Fixes\**\Microsoft.CodeAnalysis.CodeStyle.Fixes.resources.dll"/> + + + + diff --git a/src/Compilers/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.csproj b/src/Compilers/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.csproj index 66859f73ef2d2..5439cdfffd685 100644 --- a/src/Compilers/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.csproj +++ b/src/Compilers/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.csproj @@ -8,15 +8,14 @@ Microsoft.CodeAnalysis.CSharp true netstandard1.3 - true ..\CSharpCodeAnalysisRules.ruleset true - - $(NuGetPerBuildPreReleaseVersion) + + + true + + .NET Compiler Platform ("Roslyn") support for C#, Microsoft.CodeAnalysis.CSharp.dll. + @@ -33,10 +32,10 @@ - - - - + + + + diff --git a/src/Compilers/CSharp/csc/csc.csproj b/src/Compilers/CSharp/csc/csc.csproj index 60760a62d4de0..45610931a8694 100644 --- a/src/Compilers/CSharp/csc/csc.csproj +++ b/src/Compilers/CSharp/csc/csc.csproj @@ -23,6 +23,7 @@ + diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj index 0891c36ebc528..b014632b9b1b8 100644 --- a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj +++ b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj @@ -11,20 +11,26 @@ $(RoslynPortableTargetFrameworks) $(NoWarn);CA1819 + + + true + Microsoft.CodeAnalysis.Build.Tasks + + + The build task and targets used by MSBuild to run the C# and VB compilers. + Supports using VBCSCompiler on Windows. + - + PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + true + None + true + contentFiles\any\any + diff --git a/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj b/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj index 888cf1dab1ae4..bc18eb5d5cec4 100644 --- a/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj +++ b/src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj @@ -8,10 +8,17 @@ Microsoft.CodeAnalysis true netstandard1.3 - true $(DefineConstants);COMPILERCORE ..\CodeAnalysisRules.ruleset true + + + true + Microsoft.CodeAnalysis.Common + + A shared package used by the Microsoft .NET Compiler Platform ("Roslyn"). + Do not install this package manually, it will be added as a prerequisite by other packages that require it. + @@ -19,10 +26,12 @@ PreserveNewest false + false PreserveNewest false + false @@ -37,7 +46,16 @@ - + + + + diff --git a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj index 93f19b6468993..03447b49db182 100644 --- a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj +++ b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj @@ -24,6 +24,7 @@ + diff --git a/src/Compilers/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.vbproj b/src/Compilers/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.vbproj index 68005c9baefdd..695bd938c045c 100644 --- a/src/Compilers/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.vbproj +++ b/src/Compilers/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.vbproj @@ -6,17 +6,16 @@ AnyCPU Library netstandard1.3 - true $(NoWarn);42014 ..\BasicCodeAnalysisRules.ruleset true - - $(NuGetPerBuildPreReleaseVersion) + + + true + + .NET Compiler Platform ("Roslyn") support for Visual Basic, $(AssemblyName).dll. + @@ -52,8 +51,8 @@ - - + + diff --git a/src/Compilers/VisualBasic/vbc/vbc.csproj b/src/Compilers/VisualBasic/vbc/vbc.csproj index 08621a96b7232..6e5765eeaa070 100644 --- a/src/Compilers/VisualBasic/vbc/vbc.csproj +++ b/src/Compilers/VisualBasic/vbc/vbc.csproj @@ -22,6 +22,7 @@ + diff --git a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj index a8a7405bbb113..90d794a7975b6 100644 --- a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj +++ b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj @@ -3,8 +3,17 @@ netstandard1.3;net45 - Microsoft.CodeAnalysis.Debugging SourcePackage + + + true + Microsoft.CodeAnalysis.Debugging + $(PackageId).nuspec + $(OutputPath) + false + + Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") debug information encoders and decoders. + diff --git a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.nuspec b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.nuspec new file mode 100644 index 0000000000000..1a511c3dd4daa --- /dev/null +++ b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.nuspec @@ -0,0 +1,28 @@ + + + + $PackageId$ + $PackageDescription$ + $Version$ + $Authors$ + $RequireLicenseAcceptance$ + $PackageLicenseUrl$ + $PackageProjectUrl$ + $Copyright$ + $DevelopmentDependency$ + $PackageTags$ + $Serviceable$ + + + + + + + + + + + + + + diff --git a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj index 8d9a780a9d357..cbf99b671ee8f 100644 --- a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj +++ b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj @@ -3,8 +3,17 @@ netstandard1.3;net45 - Microsoft.CodeAnalysis.PooledObjects SourcePackage + + + true + Microsoft.CodeAnalysis.PooledObjects + $(PackageId).nuspec + $(OutputPath) + false + + Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") pooled objects. + diff --git a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.nuspec b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.nuspec new file mode 100644 index 0000000000000..ac07e50c6979c --- /dev/null +++ b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.nuspec @@ -0,0 +1,25 @@ + + + + $PackageId$ + $PackageDescription$ + $Version$ + $Authors$ + $RequireLicenseAcceptance$ + $PackageLicenseUrl$ + $PackageProjectUrl$ + $Copyright$ + $DevelopmentDependency$ + $PackageTags$ + $Serviceable$ + + + + + + + + + + + diff --git a/src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj b/src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj index bdd3eabdcb37b..cf09c3739bb84 100644 --- a/src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj +++ b/src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj @@ -8,6 +8,12 @@ Microsoft.CodeAnalysis.Editor.CSharp net46 true + + + true + + .NET Compiler Platform ("Roslyn") support for C# editor features inside the Visual Studio editor. + diff --git a/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj b/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj index 0530fd7707823..656d4ff105451 100644 --- a/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj +++ b/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj @@ -17,6 +17,7 @@ + diff --git a/src/EditorFeatures/CSharpTest2/Microsoft.CodeAnalysis.CSharp.EditorFeatures2.UnitTests.csproj b/src/EditorFeatures/CSharpTest2/Microsoft.CodeAnalysis.CSharp.EditorFeatures2.UnitTests.csproj index 0bd401a92f9fe..b2218b8579a47 100644 --- a/src/EditorFeatures/CSharpTest2/Microsoft.CodeAnalysis.CSharp.EditorFeatures2.UnitTests.csproj +++ b/src/EditorFeatures/CSharpTest2/Microsoft.CodeAnalysis.CSharp.EditorFeatures2.UnitTests.csproj @@ -16,6 +16,7 @@ + diff --git a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj index 2c0b63e2c8e4b..5d74860e10064 100644 --- a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj +++ b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj @@ -8,10 +8,17 @@ Microsoft.CodeAnalysis.Editor net46 true + + + true + + .NET Compiler Platform ("Roslyn") support for WPF-dependent editor features inside the Visual Studio editor. + - + + @@ -30,6 +37,7 @@ + diff --git a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj index b7afb517a7074..2ed4d275abc4d 100644 --- a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj +++ b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj @@ -9,10 +9,18 @@ net46 true $(DefineConstants);EDITOR_FEATURES + + + Microsoft.CodeAnalysis.EditorFeatures.Common + true + + .NET Compiler Platform ("Roslyn") support for editor features inside the Visual Studio editor. + - + + diff --git a/src/EditorFeatures/TestUtilities/Roslyn.Services.Test.Utilities.csproj b/src/EditorFeatures/TestUtilities/Roslyn.Services.Test.Utilities.csproj index a2f4a0b5664ff..d55ecf6091345 100644 --- a/src/EditorFeatures/TestUtilities/Roslyn.Services.Test.Utilities.csproj +++ b/src/EditorFeatures/TestUtilities/Roslyn.Services.Test.Utilities.csproj @@ -60,14 +60,17 @@ + + + diff --git a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj index 5074c3c3fa1e7..1153d5d4f18df 100644 --- a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj +++ b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj @@ -7,6 +7,12 @@ Library Microsoft.CodeAnalysis.Text net46 + + + true + + .NET Compiler Platform ("Roslyn") support for working with Visual Studio text buffers. + diff --git a/src/EditorFeatures/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj b/src/EditorFeatures/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj index 01d25f04328a4..fd12b32686da3 100644 --- a/src/EditorFeatures/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj +++ b/src/EditorFeatures/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj @@ -7,6 +7,12 @@ Library net46 + + + true + + .NET Compiler Platform ("Roslyn") support for VisualBasic editor features inside the Visual Studio editor. + diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj index 7fc7d84b19679..973bf8194159c 100644 --- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj +++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj @@ -7,6 +7,13 @@ Library Microsoft.CodeAnalysis.CSharp netstandard1.3 + + + true + + + .NET Compiler Platform ("Roslyn") support for creating C# editing experiences. + @@ -59,7 +66,7 @@ - + \ No newline at end of file diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj index 8f859b6960879..977cf5aaaaacd 100644 --- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj @@ -7,6 +7,12 @@ Library Microsoft.CodeAnalysis netstandard1.3 + + + true + + .NET Compiler Platform ("Roslyn") support for creating editing experiences. + diff --git a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj index f7427783031b4..7a4d17171b4f9 100644 --- a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj +++ b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj @@ -7,6 +7,12 @@ Library netstandard1.3 + + + true + + .NET Compiler Platform ("Roslyn") support for creating Visual Basic editing experiences. + diff --git a/src/NuGet/Directory.Build.targets b/src/NuGet/Directory.Build.targets new file mode 100644 index 0000000000000..6db8d983b2c4e --- /dev/null +++ b/src/NuGet/Directory.Build.targets @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.Build.Tasks.nuspec b/src/NuGet/Microsoft.CodeAnalysis.Build.Tasks.nuspec deleted file mode 100644 index fd4e410a9aca0..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.Build.Tasks.nuspec +++ /dev/null @@ -1,64 +0,0 @@ - - - - Microsoft.CodeAnalysis.Build.Tasks - - The build task and targets used by MSBuild to run the C# and VB compilers. - - - The build task and targets used by MSBuild to run the C# and VB compilers. - Supports using VBCSCompiler on Windows. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - - - - - - - - - - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.CSharp.CodeStyle.nuspec b/src/NuGet/Microsoft.CodeAnalysis.CSharp.CodeStyle.nuspec deleted file mode 100644 index 8c573ea84ee29..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.CSharp.CodeStyle.nuspec +++ /dev/null @@ -1,47 +0,0 @@ - - - - Microsoft.CodeAnalysis.CSharp.CodeStyle - - .NET Compiler Platform ("Roslyn") code style analyzers for C#. - - - .NET Compiler Platform ("Roslyn") code style analyzers for C#. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - true - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.CSharp.Features.nuspec b/src/NuGet/Microsoft.CodeAnalysis.CSharp.Features.nuspec deleted file mode 100644 index 94f396f538ca7..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.CSharp.Features.nuspec +++ /dev/null @@ -1,40 +0,0 @@ - - - - Microsoft.CodeAnalysis.CSharp.Features - - .NET Compiler Platform ("Roslyn") support for creating C# editing experiences. - - - .NET Compiler Platform ("Roslyn") support for creating C# editing experiences. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.CSharp.Scripting.nuspec b/src/NuGet/Microsoft.CodeAnalysis.CSharp.Scripting.nuspec deleted file mode 100644 index b26d8fe986d4c..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.CSharp.Scripting.nuspec +++ /dev/null @@ -1,40 +0,0 @@ - - - - Microsoft.CodeAnalysis.CSharp.Scripting - - Microsoft .NET Compiler Platform ("Roslyn") CSharp scripting package. - - - Microsoft .NET Compiler Platform ("Roslyn") CSharp scripting package. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.CSharp.Workspaces.nuspec b/src/NuGet/Microsoft.CodeAnalysis.CSharp.Workspaces.nuspec deleted file mode 100644 index b3b10581984fb..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.CSharp.Workspaces.nuspec +++ /dev/null @@ -1,41 +0,0 @@ - - - - Microsoft.CodeAnalysis.CSharp.Workspaces - - .NET Compiler Platform ("Roslyn") support for analyzing C# projects and solutions. - - - .NET Compiler Platform ("Roslyn") support for analyzing C# projects and solutions. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.CSharp.nuspec b/src/NuGet/Microsoft.CodeAnalysis.CSharp.nuspec deleted file mode 100644 index 82b81eb13525c..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.CSharp.nuspec +++ /dev/null @@ -1,40 +0,0 @@ - - - - Microsoft.CodeAnalysis.CSharp - - .NET Compiler Platform ("Roslyn") support for C#, Microsoft.CodeAnalysis.CSharp.dll. - - - .NET Compiler Platform ("Roslyn") support for C#, Microsoft.CodeAnalysis.CSharp.dll. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.Common.nuspec b/src/NuGet/Microsoft.CodeAnalysis.Common.nuspec deleted file mode 100644 index 80aa052ba208b..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.Common.nuspec +++ /dev/null @@ -1,83 +0,0 @@ - - - - Microsoft.CodeAnalysis.Common - - A shared package used by the Microsoft .NET Compiler Platform ("Roslyn"). - - - A shared package used by the Microsoft .NET Compiler Platform ("Roslyn"). - Do not install this package manually, it will be added as a prerequisite by other packages that require it. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.Compilers.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.Compilers.Package.csproj new file mode 100644 index 0000000000000..ca4d1b6635c06 --- /dev/null +++ b/src/NuGet/Microsoft.CodeAnalysis.Compilers.Package.csproj @@ -0,0 +1,22 @@ + + + + netstandard1.3 + Custom + + + true + Microsoft.CodeAnalysis.Compilers + false + + Compiler layer of the .NET Compiler Platform ("Roslyn"). + Install this package to get both C# and Visual Basic support. + If you want just support for one language, install Microsoft.CodeAnalysis.CSharp or Microsoft.CodeAnalysis.VisualBasic. + + + + + + + + \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.Compilers.nuspec b/src/NuGet/Microsoft.CodeAnalysis.Compilers.nuspec deleted file mode 100644 index 32868c2c4f785..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.Compilers.nuspec +++ /dev/null @@ -1,36 +0,0 @@ - - - - Microsoft.CodeAnalysis.Compilers - - Compiler layer of the .NET Compiler Platform ("Roslyn"). - - - Compiler layer of the .NET Compiler Platform ("Roslyn"). - Install this package to get both C# and Visual Basic support. - If you want just support for one language, install Microsoft.CodeAnalysis.CSharp or Microsoft.CodeAnalysis.VisualBasic. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - diff --git a/src/NuGet/Microsoft.CodeAnalysis.Debugging.nuspec b/src/NuGet/Microsoft.CodeAnalysis.Debugging.nuspec deleted file mode 100644 index 9b0f747deac74..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.Debugging.nuspec +++ /dev/null @@ -1,37 +0,0 @@ - - - - Microsoft.CodeAnalysis.Debugging - - Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") debug information encoders and decoders. - - - Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") debug information encoders and decoders. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - en-US - true - $version$ - $authors$ - $licenseUrlSource$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - - - - - - - - - diff --git a/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Package.csproj new file mode 100644 index 0000000000000..0c32c1888687d --- /dev/null +++ b/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Package.csproj @@ -0,0 +1,21 @@ + + + + net46 + Custom + + + true + Microsoft.CodeAnalysis.EditorFeatures + false + + .NET Compiler Platform ("Roslyn") support for editor features inside the Visual Studio editor. + + + + + + + + + \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Text.nuspec b/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Text.nuspec deleted file mode 100644 index 0183f753794f1..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Text.nuspec +++ /dev/null @@ -1,42 +0,0 @@ - - - - Microsoft.CodeAnalysis.EditorFeatures.Text - - .NET Compiler Platform ("Roslyn") support for working with Visual Studio text buffers. - - - .NET Compiler Platform ("Roslyn") support for working with Visual Studio text buffers. - - Supported Platforms: - - .NET Framework 4.6 - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Wpf.nuspec b/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Wpf.nuspec deleted file mode 100644 index 73e2e8c9da1ab..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Wpf.nuspec +++ /dev/null @@ -1,39 +0,0 @@ - - - - Microsoft.CodeAnalysis.EditorFeatures.Wpf - - .NET Compiler Platform ("Roslyn") support for WPF-dependent editor features inside the Visual Studio editor. - - - .NET Compiler Platform ("Roslyn") support for WPF-dependent editor features inside the Visual Studio editor. - - Supported Platforms: - - .NET Framework 4.6 - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlNonRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.nuspec b/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.nuspec deleted file mode 100644 index 455c2f5ec78d3..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.nuspec +++ /dev/null @@ -1,50 +0,0 @@ - - - - Microsoft.CodeAnalysis.EditorFeatures - - .NET Compiler Platform ("Roslyn") support for editor features inside the Visual Studio editor. - - - .NET Compiler Platform ("Roslyn") support for editor features inside the Visual Studio editor. - - Supported Platforms: - - .NET Framework 4.6 - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - - - - - - - - - **\ - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.Features.nuspec b/src/NuGet/Microsoft.CodeAnalysis.Features.nuspec deleted file mode 100644 index 2963b39330290..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.Features.nuspec +++ /dev/null @@ -1,39 +0,0 @@ - - - - Microsoft.CodeAnalysis.Features - - .NET Compiler Platform ("Roslyn") support for creating editing experiences. - - - .NET Compiler Platform ("Roslyn") support for creating editing experiences. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.Package.csproj new file mode 100644 index 0000000000000..5c0e4e1120b09 --- /dev/null +++ b/src/NuGet/Microsoft.CodeAnalysis.Package.csproj @@ -0,0 +1,27 @@ + + + + net46;netstandard1.3 + Custom + + + true + Microsoft.CodeAnalysis + false + + .NET Compiler Platform ("Roslyn"). + + This is the all-in-one package (a superset of all assemblies). You can install any of these sub-packages if you only want part of the functionality: + - "Microsoft.CodeAnalysis.CSharp.Workspaces" (C# compiler + services) + - "Microsoft.CodeAnalysis.VisualBasic.Workspaces" (VB compiler + services) + - "Microsoft.CodeAnalysis.Compilers" (both compilers) + - "Microsoft.CodeAnalysis.CSharp" (only the C# compiler) + - "Microsoft.CodeAnalysis.VisualBasic (only the VB compiler) + + + + + + + + \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.PooledObjects.nuspec b/src/NuGet/Microsoft.CodeAnalysis.PooledObjects.nuspec deleted file mode 100644 index dce95eda7943b..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.PooledObjects.nuspec +++ /dev/null @@ -1,35 +0,0 @@ - - - - Microsoft.CodeAnalysis.PooledObjects - - Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") pooled objects. - - - Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") pooled objects. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - en-US - true - $version$ - $authors$ - $licenseUrlSource$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - - - - - - - diff --git a/src/NuGet/Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.nuspec b/src/NuGet/Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.nuspec deleted file mode 100644 index 6642fdceab57c..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.nuspec +++ /dev/null @@ -1,40 +0,0 @@ - - - - Microsoft.CodeAnalysis.Remote.Razor.ServiceHub - - A private package for the Razor team to grant access to certain internal APIs. - - - A private package for the Razor team to grant access to certain internal APIs. - - Supported Platforms: - - .NET Framework 4.6 - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlNonRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.Remote.ServiceHub.nuspec b/src/NuGet/Microsoft.CodeAnalysis.Remote.ServiceHub.nuspec deleted file mode 100644 index 5630d4bb84390..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.Remote.ServiceHub.nuspec +++ /dev/null @@ -1,44 +0,0 @@ - - - - Microsoft.CodeAnalysis.Remote.ServiceHub - - A shared package used by the .NET Compiler Platform ("Roslyn") including support for coordinating analysis of projects and solutions using a separate server process. - - - A shared package used by the .NET Compiler Platform ("Roslyn") including support for coordinating analysis of projects and solutions using a separate server process. - Do not install this package manually, it will be added as a prerequisite by other packages that require it. - - Supported Platforms: - - .NET Framework 4.6 - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.Remote.Workspaces.nuspec b/src/NuGet/Microsoft.CodeAnalysis.Remote.Workspaces.nuspec deleted file mode 100644 index 64075d335bfe5..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.Remote.Workspaces.nuspec +++ /dev/null @@ -1,46 +0,0 @@ - - - - Microsoft.CodeAnalysis.Remote.Workspaces - - A shared package used by the .NET Compiler Platform ("Roslyn") including support for coordinating analysis of projects and solutions using a separate server process. - - - A shared package used by the .NET Compiler Platform ("Roslyn") including support for coordinating analysis of projects and solutions using a separate server process. - Do not install this package manually, it will be added as a prerequisite by other packages that require it. - - Supported Platforms: - - .NET Framework 4.6 - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.Scripting.Common.nuspec b/src/NuGet/Microsoft.CodeAnalysis.Scripting.Common.nuspec deleted file mode 100644 index 8f6412a6f5d1f..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.Scripting.Common.nuspec +++ /dev/null @@ -1,60 +0,0 @@ - - - - Microsoft.CodeAnalysis.Scripting.Common - - Microsoft .NET Compiler Platform ("Roslyn") shared scripting package. - - - Microsoft .NET Compiler Platform ("Roslyn") shared scripting package. - Do not install this package manually, it will be added as a prerequisite by other packages that require it. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.Scripting.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.Scripting.Package.csproj new file mode 100644 index 0000000000000..b3d7465a9e912 --- /dev/null +++ b/src/NuGet/Microsoft.CodeAnalysis.Scripting.Package.csproj @@ -0,0 +1,19 @@ + + + + netstandard1.3 + Custom + + + true + Microsoft.CodeAnalysis.Scripting + false + + Microsoft .NET Compiler Platform ("Roslyn") CSharp and VB scripting package. + + + + + + + \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.Scripting.nuspec b/src/NuGet/Microsoft.CodeAnalysis.Scripting.nuspec deleted file mode 100644 index 0b356400a5287..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.Scripting.nuspec +++ /dev/null @@ -1,33 +0,0 @@ - - - - Microsoft.CodeAnalysis.Scripting - - Microsoft .NET Compiler Platform ("Roslyn") CSharp and VB scripting package. - - - Microsoft .NET Compiler Platform ("Roslyn") CSharp and VB scripting package. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - diff --git a/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.nuspec b/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.nuspec deleted file mode 100644 index 792da50ecf303..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.nuspec +++ /dev/null @@ -1,47 +0,0 @@ - - - - Microsoft.CodeAnalysis.VisualBasic.CodeStyle - - .NET Compiler Platform ("Roslyn") code style analyzers for Visual Basic. - - - .NET Compiler Platform ("Roslyn") code style analyzers for Visual Basic. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - true - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.Features.nuspec b/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.Features.nuspec deleted file mode 100644 index a9ed560231f35..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.Features.nuspec +++ /dev/null @@ -1,40 +0,0 @@ - - - - Microsoft.CodeAnalysis.VisualBasic.Features - - .NET Compiler Platform ("Roslyn") support for creating Visual Basic editing experiences. - - - .NET Compiler Platform ("Roslyn") support for creating Visual Basic editing experiences. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.Scripting.nuspec b/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.Scripting.nuspec deleted file mode 100644 index dbae1b7315871..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.Scripting.nuspec +++ /dev/null @@ -1,42 +0,0 @@ - - - - Microsoft.CodeAnalysis.VisualBasic.Scripting - - Microsoft .NET Compiler Platform ("Roslyn") Visual Basic scripting package. - - - Microsoft .NET Compiler Platform ("Roslyn") Visual Basic scripting package. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.Workspaces.nuspec b/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.Workspaces.nuspec deleted file mode 100644 index e71c5d6aa143d..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.Workspaces.nuspec +++ /dev/null @@ -1,41 +0,0 @@ - - - - Microsoft.CodeAnalysis.VisualBasic.Workspaces - - .NET Compiler Platform ("Roslyn") support for analyzing Visual Basic projects and solutions. - - - .NET Compiler Platform ("Roslyn") support for analyzing Visual Basic projects and solutions. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.nuspec b/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.nuspec deleted file mode 100644 index ff5aa3c687f7e..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.nuspec +++ /dev/null @@ -1,40 +0,0 @@ - - - - Microsoft.CodeAnalysis.VisualBasic - - .NET Compiler Platform ("Roslyn") support for Visual Basic, Microsoft.CodeAnalysis.VisualBasic.dll. - - - .NET Compiler Platform ("Roslyn") support for Visual Basic, Microsoft.CodeAnalysis.VisualBasic.dll. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.Workspaces.MSBuild.nuspec b/src/NuGet/Microsoft.CodeAnalysis.Workspaces.MSBuild.nuspec deleted file mode 100644 index e79c9e3cfe33e..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.Workspaces.MSBuild.nuspec +++ /dev/null @@ -1,47 +0,0 @@ - - - - Microsoft.CodeAnalysis.Workspaces.MSBuild - - .NET Compiler Platform ("Roslyn") support for analyzing MSBuild projects and solutions. - - - .NET Compiler Platform ("Roslyn") support for analyzing MSBuild projects and solutions. This should be used with at least one - of the following packages to add the appropriate language support: - - Microsoft.CodeAnalysis.CSharp.Workspaces - - Microsoft.CodeAnalysis.VisualBasic.Workspaces - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.CodeAnalysis.nuspec b/src/NuGet/Microsoft.CodeAnalysis.nuspec deleted file mode 100644 index 63387e0f84d0f..0000000000000 --- a/src/NuGet/Microsoft.CodeAnalysis.nuspec +++ /dev/null @@ -1,40 +0,0 @@ - - - - Microsoft.CodeAnalysis - - .NET Compiler Platform ("Roslyn"). - - - .NET Compiler Platform ("Roslyn"). - - This is the all-in-one package (a superset of all assemblies). You can install any of these sub-packages if you only want part of the functionality: - - "Microsoft.CodeAnalysis.CSharp.Workspaces" (C# compiler + services) - - "Microsoft.CodeAnalysis.VisualBasic.Workspaces" (VB compiler + services) - - "Microsoft.CodeAnalysis.Compilers" (both compilers) - - "Microsoft.CodeAnalysis.CSharp" (only the C# compiler) - - "Microsoft.CodeAnalysis.VisualBasic (only the VB compiler) - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - diff --git a/src/NuGet/Microsoft.NETCore.Compilers.nuspec b/src/NuGet/Microsoft.NETCore.Compilers.nuspec deleted file mode 100644 index 17326d7549802..0000000000000 --- a/src/NuGet/Microsoft.NETCore.Compilers.nuspec +++ /dev/null @@ -1,68 +0,0 @@ - - - - Microsoft.NETCore.Compilers - - CoreCLR-compatible versions of the C# and VB compilers for use in MSBuild. - - - CoreCLR-compatible versions of the C# and VB compilers for use in MSBuild. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $tags$ - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.NETCore.Compilers/.gitattributes b/src/NuGet/Microsoft.NETCore.Compilers/.gitattributes new file mode 100644 index 0000000000000..4f676c6917585 --- /dev/null +++ b/src/NuGet/Microsoft.NETCore.Compilers/.gitattributes @@ -0,0 +1,9 @@ +# RunCsc/RunVbc are shell scripts and should always have unix line endings +# These shell scripts are included in the toolset packages. Normally, the shell +# scripts in our repo are only run by cloning onto a Linux/Mac machine, and git +# automatically chooses LF as the line ending. +# +# However, right now the toolset packages must be built on Windows, and so the +# files must be hard-coded to be cloned with LF +tools/bincore/RunCsc text eol=lf +tools/bincore/RunVbc text eol=lf \ No newline at end of file diff --git a/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj b/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj new file mode 100644 index 0000000000000..a06781467ac39 --- /dev/null +++ b/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj @@ -0,0 +1,80 @@ + + + + netcoreapp2.0 + Custom + + true + Microsoft.NETCore.Compilers + false + true + + CoreCLR-compatible versions of the C# and VB compilers for use in MSBuild. + + $(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage + + + + + + + + + + + + <_ExplicitProjectReference Include="@(ProjectReference)" /> + + + + + + + + <_Dlls>$(ArtifactsConfigurationDir)Dlls\ + <_Exes>$(ArtifactsConfigurationDir)Exes\ + + + <_File Include="$(MSBuildProjectDirectory)\build\**" TargetDir="build" /> + <_File Include="$(MSBuildProjectDirectory)\tools\bincore\*.cmd" TargetDir="tools\bincore" /> + + <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.0\publish\*.targets" TargetDir="tools" /> + <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.0\publish\Microsoft.Build.Tasks.CodeAnalysis.dll" TargetDir="tools" /> + <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.0\publish\**\Microsoft.Build.Tasks.CodeAnalysis.resources.dll" TargetDir="tools" /> + <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.0\publish\runtimes\**\*.*" TargetDir="tools\runtimes" /> + + <_File Include="$(_Dlls)Microsoft.CodeAnalysis\Microsoft.CodeAnalysis.dll" TargetDir="tools\bincore" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis\**\Microsoft.CodeAnalysis.resources.dll" TargetDir="tools\bincore" /> + + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp\Microsoft.CodeAnalysis.CSharp.dll" TargetDir="tools\bincore" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp\**\Microsoft.CodeAnalysis.CSharp.resources.dll" TargetDir="tools\bincore" /> + + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic\Microsoft.CodeAnalysis.VisualBasic.dll" TargetDir="tools\bincore" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic\**\Microsoft.CodeAnalysis.VisualBasic.resources.dll" TargetDir="tools\bincore" /> + + <_File Include="$(_Exes)csc\netcoreapp2.0\publish\csc.dll" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)csc\netcoreapp2.0\publish\csc.deps.json" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)csc\netcoreapp2.0\publish\csc.runtimeconfig.json" TargetDir="tools\bincore" /> + + <_File Include="$(_Exes)vbc\netcoreapp2.0\publish\vbc.dll" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)vbc\netcoreapp2.0\publish\vbc.deps.json" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)vbc\netcoreapp2.0\publish\vbc.runtimeconfig.json" TargetDir="tools\bincore" /> + + <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.0\publish\VBCSCompiler.dll" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.0\publish\VBCSCompiler.deps.json" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.0\publish\VBCSCompiler.runtimeconfig.json" TargetDir="tools\bincore" /> + + + + <_File Include="$(_Exes)csc\netcoreapp2.0\publish\System.*.dll" TargetDir="tools\bincore" /> + <_File Include="$(_Exes)csc\netcoreapp2.0\publish\runtimes\**" TargetDir="tools\bincore\runtimes" /> + + + + + + + + + \ No newline at end of file diff --git a/build/NuGetAdditionalFiles/Microsoft.NETCore.Compilers.props b/src/NuGet/Microsoft.NETCore.Compilers/build/Microsoft.NETCore.Compilers.props similarity index 100% rename from build/NuGetAdditionalFiles/Microsoft.NETCore.Compilers.props rename to src/NuGet/Microsoft.NETCore.Compilers/build/Microsoft.NETCore.Compilers.props diff --git a/build/NuGetAdditionalFiles/RunCsc b/src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunCsc similarity index 100% rename from build/NuGetAdditionalFiles/RunCsc rename to src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunCsc diff --git a/build/NuGetAdditionalFiles/RunCsc.cmd b/src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunCsc.cmd similarity index 100% rename from build/NuGetAdditionalFiles/RunCsc.cmd rename to src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunCsc.cmd diff --git a/build/NuGetAdditionalFiles/RunVbc b/src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunVbc similarity index 100% rename from build/NuGetAdditionalFiles/RunVbc rename to src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunVbc diff --git a/build/NuGetAdditionalFiles/RunVbc.cmd b/src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunVbc.cmd similarity index 100% rename from build/NuGetAdditionalFiles/RunVbc.cmd rename to src/NuGet/Microsoft.NETCore.Compilers/tools/bincore/RunVbc.cmd diff --git a/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec b/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec deleted file mode 100644 index 9145a97d1579f..0000000000000 --- a/src/NuGet/Microsoft.Net.CSharp.Interactive.netcore.nuspec +++ /dev/null @@ -1,40 +0,0 @@ - - - - Microsoft.Net.CSharp.Interactive.netcore - - CoreCLR-compatible version of csi.exe. - - - CoreCLR-compatible version of csi.exe. - - Supported Platforms: - - .NET Core (NETCoreApp1.0) - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - en-US - true - $version$ - $authors$ - $licenseUrlNonRedist$ - $projectUrl$ - $tags$ - - - - - - - - - - - - - - - - diff --git a/src/NuGet/Microsoft.Net.Compilers.nuspec b/src/NuGet/Microsoft.Net.Compilers.nuspec deleted file mode 100644 index 179622389d7d9..0000000000000 --- a/src/NuGet/Microsoft.Net.Compilers.nuspec +++ /dev/null @@ -1,77 +0,0 @@ - - - - Microsoft.Net.Compilers - - .NET Compilers package. - - - .NET Compilers package. - Referencing this package will cause the project to be built using the specific version of the C# and Visual Basic compilers contained in the package, as opposed to any system installed version. - - This package can be used to compile code targeting any platform, but can only be run using the desktop .NET 4.6+ Full Framework. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.Net.Compilers/CompilerArtifacts.props b/src/NuGet/Microsoft.Net.Compilers/CompilerArtifacts.props new file mode 100644 index 0000000000000..c490ef611879b --- /dev/null +++ b/src/NuGet/Microsoft.Net.Compilers/CompilerArtifacts.props @@ -0,0 +1,50 @@ + + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + <_Dlls>$(ArtifactsConfigurationDir)Dlls\ + <_Exes>$(ArtifactsConfigurationDir)Exes\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj b/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj new file mode 100644 index 0000000000000..ac048de8cb46a --- /dev/null +++ b/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj @@ -0,0 +1,48 @@ + + + + net46 + Custom + + true + Microsoft.Net.Compilers + false + true + + .NET Compilers package. + Referencing this package will cause the project to be built using the specific version of the C# and Visual Basic compilers contained in the package, as opposed to any system installed version. + + This package can be used to compile code targeting any platform, but can only be run using the desktop .NET 4.6+ Full Framework. + $(RoslynPackageDescriptionDetails) + + $(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage + + + + + + + + + + + + + + + <_File Include="@(CompilerArtifact)" TargetDir="tools"/> + + <_File Include="$(MSBuildProjectDirectory)\build\**\*.*" TargetDir="build" /> + + + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis\**\Microsoft.CodeAnalysis.resources.dll" TargetDir="tools" /> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CSharp\**\Microsoft.CodeAnalysis.CSharp.resources.dll" TargetDir="tools" /> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.Scripting\**\Microsoft.CodeAnalysis.Scripting.resources.dll" TargetDir="tools" /> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.CSharp.Scripting\**\Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll" TargetDir="tools" /> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.CodeAnalysis.VisualBasic\**\Microsoft.CodeAnalysis.VisualBasic.resources.dll" TargetDir="tools" /> + <_File Include="$(ArtifactsConfigurationDir)Dlls\Microsoft.Build.Tasks.CodeAnalysis\net46\**\Microsoft.Build.Tasks.CodeAnalysis.resources.dll" TargetDir="tools" /> + + + + + \ No newline at end of file diff --git a/build/NuGetAdditionalFiles/Microsoft.Net.Compilers.props b/src/NuGet/Microsoft.Net.Compilers/build/Microsoft.Net.Compilers.props similarity index 100% rename from build/NuGetAdditionalFiles/Microsoft.Net.Compilers.props rename to src/NuGet/Microsoft.Net.Compilers/build/Microsoft.Net.Compilers.props diff --git a/src/NuGet/Microsoft.VisualStudio.IntegrationTest.Utilities.nuspec b/src/NuGet/Microsoft.VisualStudio.IntegrationTest.Utilities.nuspec deleted file mode 100644 index a985fa713cb92..0000000000000 --- a/src/NuGet/Microsoft.VisualStudio.IntegrationTest.Utilities.nuspec +++ /dev/null @@ -1,35 +0,0 @@ - - - - Microsoft.VisualStudio.IntegrationTest.Utilities - - Utility methods used to run Visual Studio integration tests. - - - Utility methods used to run Visual Studio integration tests. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - en-US - true - $version$ - $authors$ - $licenseUrlNonRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient.nuspec b/src/NuGet/Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient.nuspec deleted file mode 100644 index 35b70126192b2..0000000000000 --- a/src/NuGet/Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient.nuspec +++ /dev/null @@ -1,40 +0,0 @@ - - - - Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient - - A private package for the Razor team to grant access to certain internal APIs. - - - A private package for the Razor team to grant access to certain internal APIs. - - Supported Platforms: - - .NET Framework 4.6 - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlNonRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/Microsoft.VisualStudio.LanguageServices.nuspec b/src/NuGet/Microsoft.VisualStudio.LanguageServices.nuspec deleted file mode 100644 index c148749bb99b0..0000000000000 --- a/src/NuGet/Microsoft.VisualStudio.LanguageServices.nuspec +++ /dev/null @@ -1,39 +0,0 @@ - - - - Microsoft.VisualStudio.LanguageServices - - .NET Compiler Platform ("Roslyn") support for Visual Studio. - - - .NET Compiler Platform ("Roslyn") support for Visual Studio. - - Supported Platforms: - - .NET Framework 4.6 - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - - - - - - en-US - true - $version$ - $authors$ - $licenseUrlNonRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - - - - - - - - - - \ No newline at end of file diff --git a/src/NuGet/NuGetProjectPackUtil.csproj b/src/NuGet/NuGetProjectPackUtil.csproj deleted file mode 100644 index 33af760777cb0..0000000000000 --- a/src/NuGet/NuGetProjectPackUtil.csproj +++ /dev/null @@ -1,105 +0,0 @@ - - - - - netcoreapp2.0 - false - Library - false - - true - - - - <_Version> - <_Version Condition="'$(NuGetPackageKind)' == 'release'">$(VersionPrefix) - <_Version Condition="'$(NuGetPackageKind)' == 'prerelease'">$(VersionPrefix)-$(PreReleaseVersionLabel) - <_Version Condition="'$(NuGetPackageKind)' == 'perbuildprerelease'">$(VersionPrefix)-$(PreReleaseVersionLabel)-$(VersionSuffixDateStamp)-$(VersionSuffixBuildOfTheDayPadded) - <_Version Condition="'$(NuGetPackageKind)' == 'bootstrap'">42.42.42.42-bootstrap - <_CommitPathMessage>This an unofficial build from a developer's machine. - <_CommitPathMessage Condition="'$(ContinuousIntegrationBuild)' == 'true'">This package was built from the source at https://github.com/dotnet/roslyn/commit/$(SourceRevisionId). - $(NuspecProperties);version=$(_Version) - $(NuspecProperties);authors=Microsoft - $(NuspecProperties);licenseUrlRedist=http://go.microsoft.com/fwlink/?LinkId=529443 - $(NuspecProperties);licenseUrlNonRedist=http://go.microsoft.com/fwlink/?LinkId=529444 - $(NuspecProperties);licenseUrlSource=https://github.com/dotnet/roslyn/blob/master/License.txt - $(NuspecProperties);projectUrl=https://github.com/dotnet/roslyn - $(NuspecProperties);additionalFilesPath=$(RepoRoot)build/NuGetAdditionalFiles - $(NuspecProperties);srcDirPath=$(RepoRoot)\src - $(NuspecProperties);emptyDirPath=$(EmptyDir) - $(NuspecProperties);currentVersion=$(CurrentVersion) - $(NuspecProperties);commitPathMessage=$(_CommitPathMessage) - $(NuspecProperties);tags=Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics - $(NuspecProperties);repositoryType=$(RepositoryType) - $(NuspecProperties);repositoryUrl=$(RepositoryUrl) - $(NuspecProperties);repositoryCommit=$(SourceRevisionId) - - $(NuspecProperties);MicrosoftBuildFixedVersion=$(MicrosoftBuildFixedVersion) - $(NuspecProperties);MicrosoftBuildTasksCoreFixedVersion=$(MicrosoftBuildTasksCoreFixedVersion) - $(NuspecProperties);MicrosoftCSharpVersion=$(MicrosoftCSharpVersion) - $(NuspecProperties);MicrosoftCodeAnalysisAnalyzersVersion=$(MicrosoftCodeAnalysisAnalyzersVersion) - $(NuspecProperties);MicrosoftCodeAnalysisElfieVersion=$(MicrosoftCodeAnalysisElfieVersion) - $(NuspecProperties);MicrosoftVisualBasicVersion=$(MicrosoftVisualBasicVersion) - $(NuspecProperties);MicrosoftVisualStudioSetupConfigurationInteropVersion=$(MicrosoftVisualStudioSetupConfigurationInteropVersion) - $(NuspecProperties);SystemAppContextVersion=$(SystemAppContextVersion) - $(NuspecProperties);SystemCollectionsVersion=$(SystemCollectionsVersion) - $(NuspecProperties);SystemCollectionsConcurrentVersion=$(SystemCollectionsConcurrentVersion) - $(NuspecProperties);SystemCollectionsImmutableVersion=$(SystemCollectionsImmutableVersion) - $(NuspecProperties);SystemCompositionVersion=$(SystemCompositionVersion) - $(NuspecProperties);SystemConsoleVersion=$(SystemConsoleVersion) - $(NuspecProperties);SystemDiagnosticsContractsVersion=$(SystemDiagnosticsContractsVersion) - $(NuspecProperties);SystemDiagnosticsDebugVersion=$(SystemDiagnosticsDebugVersion) - $(NuspecProperties);SystemDiagnosticsFileVersionInfoVersion=$(SystemDiagnosticsFileVersionInfoVersion) - $(NuspecProperties);SystemDiagnosticsProcessVersion=$(SystemDiagnosticsProcessVersion) - $(NuspecProperties);SystemDiagnosticsStackTraceVersion=$(SystemDiagnosticsStackTraceVersion) - $(NuspecProperties);SystemDiagnosticsToolsVersion=$(SystemDiagnosticsToolsVersion) - $(NuspecProperties);SystemDynamicRuntimeVersion=$(SystemDynamicRuntimeVersion) - $(NuspecProperties);SystemGlobalizationVersion=$(SystemGlobalizationVersion) - $(NuspecProperties);SystemIOVersion=$(SystemIOVersion) - $(NuspecProperties);SystemIOCompressionVersion=$(SystemIOCompressionVersion) - $(NuspecProperties);SystemIOFileSystemVersion=$(SystemIOFileSystemVersion) - $(NuspecProperties);SystemIOFileSystemPrimitivesVersion=$(SystemIOFileSystemPrimitivesVersion) - $(NuspecProperties);SystemIOPipesAccessControlVersion=$(SystemIOPipesAccessControlVersion) - $(NuspecProperties);SystemLinqVersion=$(SystemLinqVersion) - $(NuspecProperties);SystemLinqExpressionsVersion=$(SystemLinqExpressionsVersion) - $(NuspecProperties);SystemLinqParallelVersion=$(SystemLinqParallelVersion) - $(NuspecProperties);SystemNetSocketsVersion=$(SystemNetSocketsVersion) - $(NuspecProperties);SystemObjectModelVersion=$(SystemObjectModelVersion) - $(NuspecProperties);SystemReflectionVersion=$(SystemReflectionVersion) - $(NuspecProperties);SystemReflectionExtensionsVersion=$(SystemReflectionExtensionsVersion) - $(NuspecProperties);SystemReflectionMetadataVersion=$(SystemReflectionMetadataVersion) - $(NuspecProperties);SystemResourcesResourceManagerVersion=$(SystemResourcesResourceManagerVersion) - $(NuspecProperties);SystemRuntimeVersion=$(SystemRuntimeVersion) - $(NuspecProperties);SystemRuntimeExtensionsVersion=$(SystemRuntimeExtensionsVersion) - $(NuspecProperties);SystemRuntimeInteropServicesVersion=$(SystemRuntimeInteropServicesVersion) - $(NuspecProperties);SystemRuntimeNumericsVersion=$(SystemRuntimeNumericsVersion) - $(NuspecProperties);SystemSecurityAccessControlVersion=$(SystemSecurityAccessControlVersion) - $(NuspecProperties);SystemSecurityCryptographyAlgorithmsVersion=$(SystemSecurityCryptographyAlgorithmsVersion) - $(NuspecProperties);SystemSecurityCryptographyEncodingVersion=$(SystemSecurityCryptographyEncodingVersion) - $(NuspecProperties);SystemSecurityCryptographyX509CertificatesVersion=$(SystemSecurityCryptographyX509CertificatesVersion) - $(NuspecProperties);SystemTextEncodingVersion=$(SystemTextEncodingVersion) - $(NuspecProperties);SystemTextEncodingCodePagesVersion=$(SystemTextEncodingCodePagesVersion) - $(NuspecProperties);SystemTextEncodingExtensionsVersion=$(SystemTextEncodingExtensionsVersion) - $(NuspecProperties);SystemTextRegularExpressionsVersion=$(SystemTextRegularExpressionsVersion) - $(NuspecProperties);SystemThreadingVersion=$(SystemThreadingVersion) - $(NuspecProperties);SystemThreadingTasksVersion=$(SystemThreadingTasksVersion) - $(NuspecProperties);SystemThreadingTasksExtensionsVersion=$(SystemThreadingTasksExtensionsVersion) - $(NuspecProperties);SystemThreadingTasksParallelVersion=$(SystemThreadingTasksParallelVersion) - $(NuspecProperties);SystemThreadingThreadVersion=$(SystemThreadingThreadVersion) - $(NuspecProperties);SystemValueTupleVersion=$(SystemValueTupleVersion) - $(NuspecProperties);SystemXmlReaderWriterVersion=$(SystemXmlReaderWriterVersion) - $(NuspecProperties);SystemXmlXDocumentVersion=$(SystemXmlXDocumentVersion) - $(NuspecProperties);SystemXmlXmlDocumentVersion=$(SystemXmlXmlDocumentVersion) - $(NuspecProperties);SystemXmlXPathXDocumentVersion=$(SystemXmlXPathXDocumentVersion) - - - \ No newline at end of file diff --git a/src/NuGet/Releases/1.3.0.packages b/src/NuGet/Releases/1.3.0.packages deleted file mode 100644 index 0624ea7c4a654..0000000000000 --- a/src/NuGet/Releases/1.3.0.packages +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/NuGetAdditionalFiles/ThirdPartyNotices.rtf b/src/NuGet/ThirdPartyNotices.rtf similarity index 100% rename from build/NuGetAdditionalFiles/ThirdPartyNotices.rtf rename to src/NuGet/ThirdPartyNotices.rtf diff --git a/src/NuGet/VisualStudio/Init.cmd b/src/NuGet/VisualStudio/Init.cmd new file mode 100644 index 0000000000000..aa3bcca1d5065 --- /dev/null +++ b/src/NuGet/VisualStudio/Init.cmd @@ -0,0 +1,4 @@ +@echo off + +set RoslynToolsRoot=%~dp0 +set DEVPATH=%RoslynToolsRoot%;%DEVPATH% \ No newline at end of file diff --git a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj new file mode 100644 index 0000000000000..482a6481c3a8b --- /dev/null +++ b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj @@ -0,0 +1,124 @@ + + + + net46 + Custom + + + false + + true + VS.ExternalAPIs.Roslyn + false + CoreXT package for the VS build + $(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage + + + $(NoWarn);NU5100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_Dlls>$(ArtifactsConfigurationDir)Dlls\ + + + + <_File Include="$(_Dlls)Microsoft.CodeAnalysis\Microsoft.CodeAnalysis.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp.EditorFeatures\Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp.Features\Microsoft.CodeAnalysis.CSharp.Features.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp.Workspaces\Microsoft.CodeAnalysis.CSharp.Workspaces.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp\Microsoft.CodeAnalysis.CSharp.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.EditorFeatures.Text\Microsoft.CodeAnalysis.EditorFeatures.Text.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.EditorFeatures.Wpf\Microsoft.CodeAnalysis.EditorFeatures.Wpf.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.EditorFeatures\Microsoft.CodeAnalysis.EditorFeatures.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.Features\Microsoft.CodeAnalysis.Features.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.Remote.Razor.ServiceHub\Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.Remote.ServiceHub\Microsoft.CodeAnalysis.Remote.ServiceHub.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.Remote.Workspaces\Microsoft.CodeAnalysis.Remote.Workspaces.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic.EditorFeatures\Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic.Features\Microsoft.CodeAnalysis.VisualBasic.Features.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic.Workspaces\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic\Microsoft.CodeAnalysis.VisualBasic.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.Workspaces.Desktop\Microsoft.CodeAnalysis.Workspaces.Desktop.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.Workspaces.MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.Workspaces\Microsoft.CodeAnalysis.Workspaces.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.VisualStudio.LanguageServices.CSharp\Microsoft.VisualStudio.LanguageServices.CSharp.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.VisualStudio.LanguageServices.Implementation\Microsoft.VisualStudio.LanguageServices.Implementation.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient\Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.VisualStudio.LanguageServices.SolutionExplorer\Microsoft.VisualStudio.LanguageServices.SolutionExplorer.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.VisualStudio.LanguageServices.VisualBasic\Microsoft.VisualStudio.LanguageServices.VisualBasic.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.VisualStudio.LanguageServices.Xaml\Microsoft.VisualStudio.LanguageServices.Xaml.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.VisualStudio.LanguageServices\Microsoft.VisualStudio.LanguageServices.dll" TargetDir="" /> + + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.ResultProvider\Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp.ResultProvider\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic.ResultProvider\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.FunctionResolver\Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp.ExpressionCompiler\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.dll" TargetDir="" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.ExpressionCompiler\Microsoft.CodeAnalysis.ExpressionEvaluator.ExpressionCompiler.dll" TargetDir="" /> + + <_File Include="$(_Dlls)BasicResultProvider.NetFX20\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.dll" TargetDir="Dlls\BasicResultProvider.NetFX20" /> + <_File Include="$(_Dlls)CSharpResultProvider.NetFX20\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.dll" TargetDir="Dlls\CSharpResultProvider.NetFX20" /> + <_File Include="$(_Dlls)ResultProvider.NetFX20\Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider.dll" TargetDir="Dlls\ResultProvider.NetFX20" /> + + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp.ResultProvider\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.CSharp.ExpressionCompiler\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic.ResultProvider\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" /> + <_File Include="$(_Dlls)Microsoft.VisualStudio.LanguageServices\Microsoft.VisualStudio.LanguageServices.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.FunctionResolver\Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" /> + <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler.vsdconfig" TargetDir="LanguageServiceRegistration\ExpressionEvaluatorPackage" /> + + + + + <_File Include="%(_File.RootDir)%(_File.Directory)%(_File.FileName).xml" TargetDir="%(_File.TargetDir)" Condition="Exists('%(_File.RootDir)%(_File.Directory)%(_File.FileName).xml')"/> + + + + + + + \ No newline at end of file diff --git a/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj b/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj new file mode 100644 index 0000000000000..91547f60ea774 --- /dev/null +++ b/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj @@ -0,0 +1,64 @@ + + + + net46 + Custom + + + false + + true + VS.Tools.Roslyn + false + CoreXT package for Roslyn compiler toolset. + $(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage + + + $(NoWarn);NU5100 + + + + + + + + + + + + + + + <_File Include="@(CompilerArtifact)" TargetDir="" /> + <_File Include="$(MSBuildProjectDirectory)\Init.cmd" TargetDir="" /> + + + <_File Remove="$(ArtifactsConfigurationDir)Exes\csc\net46\csc.exe"/> + <_File Include="$(IntermediateOutputPath)csc.exe"/> + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj b/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj index bb9b2b26cbe10..d1e4561d5fb40 100644 --- a/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj +++ b/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj @@ -7,6 +7,12 @@ Library Microsoft.CodeAnalysis.CSharp.Scripting netstandard1.3 + + + true + + Microsoft .NET Compiler Platform ("Roslyn") CSharp scripting package. + diff --git a/src/Scripting/Core/Microsoft.CodeAnalysis.Scripting.csproj b/src/Scripting/Core/Microsoft.CodeAnalysis.Scripting.csproj index dd13e1e25dd7e..fda45f221d412 100644 --- a/src/Scripting/Core/Microsoft.CodeAnalysis.Scripting.csproj +++ b/src/Scripting/Core/Microsoft.CodeAnalysis.Scripting.csproj @@ -9,6 +9,14 @@ true netstandard1.3 $(DefineConstants);SCRIPTING + + + true + Microsoft.CodeAnalysis.Scripting.Common + + Microsoft .NET Compiler Platform ("Roslyn") shared scripting package. + Do not install this package manually, it will be added as a prerequisite by other packages that require it. + @@ -23,7 +31,7 @@ so that it can be referenced in libraries targeting netstandard1.3 once they check that the executing runtime is .NET Core. --> - + diff --git a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb index ed6e84e15edf9..a9243aa1d786c 100644 --- a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb +++ b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb @@ -1,48 +1,29 @@ -Imports System.IO.Packaging -Imports System.IO +Imports System.IO Imports System.Threading Imports Newtonsoft.Json Imports Newtonsoft.Json.Linq Imports System.Reflection.PortableExecutable Imports System.Reflection.Metadata -Imports System.Runtime.InteropServices - -' Set the global XML namespace to be the NuSpec namespace. This will simplify -' the building of xml literals in this file -Imports Public Class BuildDevDivInsertionFiles Private Const DevDivInsertionFilesDirName = "DevDivInsertionFiles" Private Const DevDivPackagesDirName = "DevDivPackages" - Private Const DevDivVsixDirName = "DevDivVsix" - Private Const ExternalApisDirName = "ExternalAPIs" - Private Const PublicKeyToken = "31BF3856AD364E35" Private ReadOnly _binDirectory As String Private ReadOnly _outputDirectory As String Private ReadOnly _outputPackageDirectory As String - Private ReadOnly _setupDirectory As String Private ReadOnly _nugetPackageRoot As String - Private ReadOnly _nuspecDirectory As String - Private ReadOnly _pathMap As Dictionary(Of String, String) - Private ReadOnly _verbose As Boolean Private Sub New(args As String()) _binDirectory = Path.GetFullPath(args(0)) - - Dim repoDirectory = Path.GetFullPath(args(1)) - _setupDirectory = Path.Combine(repoDirectory, "src\Setup") - _nuspecDirectory = Path.Combine(repoDirectory, "src\Nuget") - _nugetPackageRoot = Path.GetFullPath(args(2)) - _verbose = args.Last() = "/verbose" + _nugetPackageRoot = Path.GetFullPath(args(1)) _outputDirectory = Path.Combine(_binDirectory, DevDivInsertionFilesDirName) _outputPackageDirectory = Path.Combine(_binDirectory, DevDivPackagesDirName) - _pathMap = CreatePathMap() End Sub Public Shared Function Main(args As String()) As Integer - If args.Length < 3 Then - Console.WriteLine("Expected arguments: [/verbose]") + If args.Length < 2 Then + Console.WriteLine("Expected arguments: ") Console.WriteLine($"Actual argument count is {args.Length}") Return 1 End If @@ -56,63 +37,6 @@ Public Class BuildDevDivInsertionFiles End Try End Function - Private ReadOnly VsixContentsToSkip As String() = { - "Microsoft.Data.ConnectionUI.dll", - "Microsoft.TeamFoundation.TestManagement.Client.dll", - "Microsoft.TeamFoundation.TestManagement.Common.dll", - "Microsoft.VisualStudio.CallHierarchy.Package.Definitions.dll", - "Microsoft.VisualStudio.CodeAnalysis.Sdk.UI.dll", - "Microsoft.VisualStudio.Data.dll", - "Microsoft.VisualStudio.QualityTools.OperationalStore.ClientHelper.dll", - "Microsoft.VisualStudio.QualityTools.WarehouseCommon.dll", - "Microsoft.VisualStudio.TeamSystem.Common.dll", - "Microsoft.VisualStudio.TeamSystem.Common.Framework.dll", - "Microsoft.VisualStudio.TeamSystem.Integration.dll", - "SQLitePCLRaw.batteries_green.dll", - "SQLitePCLRaw.batteries_v2.dll", - "SQLitePCLRaw.core.dll", - "SQLitePCLRaw.provider.e_sqlite3.dll", - "e_sqlite3.dll", - "Newtonsoft.Json.dll", - "StreamJsonRpc.dll", - "StreamJsonRpc.resources.dll", - "roslynCodeAnalysis.servicehub.service.json", - "roslynRemoteHost.servicehub.service.json", - "roslynSnapshot.servicehub.service.json", - "roslynRemoteSymbolSearchUpdateEngine.servicehub.service.json", - "roslynCodeAnalysis64.servicehub.service.json", - "roslynRemoteHost64.servicehub.service.json", - "roslynSnapshot64.servicehub.service.json", - "roslynRemoteSymbolSearchUpdateEngine64.servicehub.service.json", - "Microsoft.Build.Conversion.Core.dll", - "Microsoft.Build.dll", - "Microsoft.Build.Engine.dll", - "Microsoft.Build.Framework.dll", - "Microsoft.Build.Tasks.Core.dll", - "Microsoft.Build.Utilities.Core.dll", - "Microsoft.VisualStudio.Threading.dll", - "Microsoft.VisualStudio.Threading.resources.dll", - "Microsoft.VisualStudio.Validation.dll", - "System.Composition.AttributedModel.dll", - "System.Composition.Runtime.dll", - "System.Composition.Convention.resources.dll", - "System.Composition.Hosting.resources.dll", - "System.Composition.TypedParts.resources.dll", - "Microsoft.CodeAnalysis.VisualBasic.Scripting.dll", - "Microsoft.CodeAnalysis.VisualBasic.InteractiveEditorFeatures.dll", - "Microsoft.VisualStudio.VisualBasic.Repl.dll", - "Microsoft.VisualStudio.VisualBasic.Repl.pkgdef", - "VisualBasicInteractive.png", - "VisualBasicInteractive.rsp", - "VisualBasicInteractivePackageRegistration.pkgdef" - } - - Private ReadOnly VsixesToInstall As String() = { - "Vsix\Roslyn.VisualStudio.Setup\Roslyn.VisualStudio.Setup.vsix", - "Vsix\ExpressionEvaluatorPackage\ExpressionEvaluatorPackage.vsix", - "Vsix\Roslyn.VisualStudio.InteractiveComponents\Roslyn.VisualStudio.InteractiveComponents.vsix" - } - Private Sub DeleteDirContents(dir As String) If Directory.Exists(dir) Then ' Delete everything within it. We'll keep the top-level one around. @@ -137,96 +61,8 @@ Public Class BuildDevDivInsertionFiles GenerateContractsListMsbuild(dependencies) GenerateAssemblyVersionList(dependencies) CopyDependencies(dependencies) - - ' List of files to add to VS.ExternalAPI.Roslyn.nuspec. - ' Paths are relative to input directory. - ' Files in DevDivInsertionFiles\ExternalAPIs don't need to be added, they are included in the nuspec using a pattern. - ' May contain duplicates. - Dim filesToInsert = New List(Of NugetFileInfo) - - ' And now copy over all our core compiler binaries and related files - ' Build tools setup authoring depends on these files being inserted. - For Each fileName In GetCompilerInsertFiles() - Dim dependency As DependencyInfo = Nothing - If Not dependencies.TryGetValue(fileName, dependency) Then - AddXmlDocumentationFile(filesToInsert, fileName) - filesToInsert.Add(New NugetFileInfo(GetMappedPath(fileName))) - End If - Next - - GenerateVSToolsRoslynCoreXTNuspec() - - ' Copy over the files in the NetFX20 subdirectory (identical, except for references and Authenticode signing). - ' These are for msvsmon, whose setup authoring is done by the debugger. - For Each folder In Directory.EnumerateDirectories(Path.Combine(_binDirectory, "Dlls"), "*.NetFX20") - For Each eePath In Directory.EnumerateFiles(folder, "*.ExpressionEvaluator.*.dll", SearchOption.TopDirectoryOnly) - filesToInsert.Add(New NugetFileInfo(GetPathRelativeToBinaries(eePath), GetPathRelativeToBinaries(folder))) - Next - Next - - ProcessVsixFiles(filesToInsert, dependencies) - - ' Generate Roslyn.nuspec: - GenerateRoslynNuSpec(filesToInsert) End Sub - Private Function GetPathRelativeToBinaries(p As String) As String - Debug.Assert(p.StartsWith(_binDirectory, StringComparison.OrdinalIgnoreCase)) - p = p.Substring(_binDirectory.Length) - If Not String.IsNullOrEmpty(p) AndAlso p(0) = "\"c Then - p = p.Substring(1) - End If - Return p - End Function - - Private Shared Function GetExternalApiDirectory() As String - Return Path.Combine(ExternalApisDirName, "Roslyn") - End Function - - Private Shared Function GetExternalApiDirectory(dependency As DependencyInfo, contract As Boolean) As String - Return If(dependency Is Nothing, - GetExternalApiDirectory(), - Path.Combine(ExternalApisDirName, dependency.PackageName, If(contract, dependency.ContractDir, dependency.ImplementationDir))) - End Function - - Private Class NugetFileInfo - Implements IEquatable(Of NugetFileInfo) - - Public Path As String - Public Target As String - - Sub New(path As String, Optional target As String = "") - If IO.Path.IsPathRooted(path) Then - Throw New ArgumentException($"Parameter {NameOf(path)} cannot be absolute: {path}") - End If - - If IO.Path.IsPathRooted(target) Then - Throw New ArgumentException($"Parameter {NameOf(target)} cannot be absolute: {target}") - End If - - Me.Path = path - Me.Target = target - End Sub - - Public Overrides Function Equals(obj As Object) As Boolean - Return IEquatableEquals(TryCast(obj, NugetFileInfo)) - End Function - - Public Overrides Function GetHashCode() As Integer - Return StringComparer.OrdinalIgnoreCase.GetHashCode(Path) Xor StringComparer.OrdinalIgnoreCase.GetHashCode(Target) - End Function - - Public Function IEquatableEquals(other As NugetFileInfo) As Boolean Implements IEquatable(Of NugetFileInfo).Equals - Return other IsNot Nothing AndAlso - StringComparer.OrdinalIgnoreCase.Equals(Path, other.Path) AndAlso - StringComparer.OrdinalIgnoreCase.Equals(Target, other.Target) - End Function - - Public Overrides Function ToString() As String - Return Path - End Function - End Class - Private Class DependencyInfo ' For example, "ref/net46" Public ContractDir As String @@ -362,16 +198,6 @@ Public Class BuildDevDivInsertionFiles Next End Function - Private Iterator Function GetImplementations(dependencies As IReadOnlyDictionary(Of String, DependencyInfo)) As IEnumerable(Of KeyValuePair(Of String, String)) - For Each entry In dependencies.OrderBy(Function(e) e.Key) - Dim fileName = entry.Key - Dim dependency = entry.Value - Dim variableName = "CoreFXLib_" + Path.GetFileNameWithoutExtension(fileName).Replace(".", "_") - Dim dir = Path.Combine(dependency.PackageName, dependency.ImplementationDir) - Yield New KeyValuePair(Of String, String)(variableName, Path.Combine(dir, fileName)) - Next - End Function - Private Sub GenerateAssemblyVersionList(dependencies As IReadOnlyDictionary(Of String, DependencyInfo)) Using writer = New StreamWriter(GetAbsolutePathInOutputDirectory("DependentAssemblyVersions.csv")) For Each entry In dependencies.OrderBy(Function(e) e.Key) @@ -404,51 +230,6 @@ Public Class BuildDevDivInsertionFiles Next End Sub - Private Sub ParseSwrFile(path As String, ByRef version As Version, ByRef files As IEnumerable(Of String)) - Dim lines = File.ReadAllLines(path) - - version = Version.Parse(lines.Single(Function(line) line.TrimStart().StartsWith("version=")).Split("="c)(1)) - files = (From line In lines Where line.TrimStart().StartsWith("file")).ToArray() - End Sub - - ''' - ''' Enumerate files specified in the list. The specifications may include file names, directory names, and patterns. - ''' - ''' - ''' If the item contains '*', then it will be treated as a search pattern for the top directory. - ''' Otherwise, if the item represents a directory, then all files and subdirectories of the item will be copied over. - ''' - ''' This funtion will fail and throw and exception if any of the specified files do not exist on disk. - ''' - Private Iterator Function ExpandTestDependencies(fileSpecs As String()) As IEnumerable(Of String) - Dim allGood = True - For Each spec In fileSpecs - If spec.Contains("*") Then - For Each path In Directory.EnumerateFiles(_binDirectory, spec, SearchOption.TopDirectoryOnly) - Yield path.Substring(_binDirectory.Length) - Next - Else - spec = GetPotentiallyMappedPath(spec) - Dim inputItem = Path.Combine(_binDirectory, spec) - - If Directory.Exists(inputItem) Then - For Each path In Directory.EnumerateFiles(inputItem, "*.*", SearchOption.AllDirectories) - Yield path.Substring(_binDirectory.Length) - Next - ElseIf File.Exists(inputItem) Then - Yield spec - Else - Console.WriteLine($"File Or directory '{spec}' listed in test dependencies doesn't exist.", spec) - allGood = False - End If - End If - Next - - If Not allGood Then - Throw New Exception("Unable to expand test dependencies") - End If - End Function - ''' ''' A simple method to retry an operation. Helpful if some file locking is going on and you want to just try the operation again. ''' @@ -463,382 +244,6 @@ Public Class BuildDevDivInsertionFiles Next End Sub - ''' - ''' Recently a number of our compontents have moved from the root of the output directory to sub-directories. The - ''' map returned from this function maps file names to their relative path in the build output. - ''' - ''' This is still pretty terrible though. Instead of doing all this name matching we should have explicit paths - ''' and match on file contents. That is a large change for this tool though. As a temporary work around this - ''' map will be used instead. - ''' - Private Function CreatePathMap() As Dictionary(Of String, String) - - Dim map As New Dictionary(Of String, String) - Dim add = Sub(filePath As String) - If Not File.Exists(Path.Combine(_binDirectory, filePath)) Then - Throw New Exception($"Mapped VSIX path does not exist: {filePath}") - End If - Dim name = Path.GetFileName(filePath) - If map.ContainsKey(name) Then - Throw New Exception($"{name} already exist!") - End If - - map.Add(name, filePath) - End Sub - - Dim configPath = Path.Combine(_binDirectory, "..\..\build\config\SignToolData.json") - Dim comparison = StringComparison.OrdinalIgnoreCase - Dim obj = JObject.Parse(File.ReadAllText(configPath)) - Dim array = CType(obj.Property("sign").Value, JArray) - For Each element As JObject In array - Dim values = CType(element.Property("values").Value, JArray) - For Each item As String In values - Dim parent = Path.GetDirectoryName(item) - Dim name = Path.GetFileName(item) - - If parent.EndsWith("NetFX20", comparison) Then - Continue For - End If - - ' Don't add in the netcoreapp2.0 version of DLL - If Path.GetFileName(parent) = "netcoreapp2.0" AndAlso name = "Microsoft.Build.Tasks.CodeAnalysis.dll" Then - Continue For - End If - - ' There are items in SignToolData which are built after this tool is run and hence - ' can't be a part of the map. - If parent.EndsWith("DevDivPackages\Roslyn", comparison) OrElse - parent.StartsWith("Vsix\CodeAnalysisCompilers", comparison) Then - Continue For - End If - - ' Ignore wild cards. The map contains full file paths and supporting wildcards would - ' require expansion. That is doable but given none of the files identified by wild cards - ' are used by other downstream tools this isn't necessary. - If item.Contains("*") Then - Continue For - End If - - add(item) - Next - Next - - 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\InteractiveHost32\InteractiveHost32.exe.config") - add("Exes\InteractiveHost64\InteractiveHost64.exe.config") - add("Exes\csi\net46\csi.rsp") - add("Exes\csi\net46\csi.exe.config") - add("Vsix\Roslyn.VisualStudio.InteractiveComponents\CSharpInteractive.rsp") - add("Vsix\Roslyn.VisualStudio.Setup\Microsoft.CodeAnalysis.Elfie.dll") - add("Vsix\Roslyn.VisualStudio.Setup\Microsoft.VisualStudio.CallHierarchy.Package.Definitions.dll") - add("Vsix\Roslyn.VisualStudio.Setup\System.Composition.Convention.dll") - add("Vsix\Roslyn.VisualStudio.Setup\System.Composition.Hosting.dll") - add("Vsix\Roslyn.VisualStudio.Setup\System.Composition.TypedParts.dll") - add("Vsix\Roslyn.VisualStudio.Setup\System.Threading.Tasks.Extensions.dll") - add("Vsix\Roslyn.VisualStudio.Setup\ICSharpCode.Decompiler.dll") - add("Dlls\Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler.vsdconfig") - add("Dlls\Microsoft.CodeAnalysis.VisualBasic.ResultProvider\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.vsdconfig") - add("Dlls\Microsoft.CodeAnalysis.CSharp.ExpressionCompiler\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.vsdconfig") - add("Dlls\Microsoft.CodeAnalysis.CSharp.ResultProvider\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.vsdconfig") - add("Dlls\Microsoft.CodeAnalysis.FunctionResolver\Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver.vsdconfig") - add("Dlls\Microsoft.VisualStudio.LanguageServices\Microsoft.VisualStudio.LanguageServices.vsdconfig") - add("Dlls\Microsoft.Build.Tasks.CodeAnalysis\net46\Microsoft.Managed.Core.targets") - add("Dlls\Microsoft.Build.Tasks.CodeAnalysis\net46\Microsoft.CSharp.Core.targets") - add("Dlls\Microsoft.Build.Tasks.CodeAnalysis\net46\Microsoft.VisualBasic.Core.targets") - add("Dlls\Microsoft.CodeAnalysis.CSharp.Test.Utilities\Microsoft.CodeAnalysis.CSharp.Test.Utilities.dll") - add("Dlls\Microsoft.CodeAnalysis.VisualBasic.Test.Utilities\Microsoft.CodeAnalysis.VisualBasic.Test.Utilities.dll") - add("Dlls\Microsoft.CodeAnalysis.Compiler.Test.Resources\\Microsoft.CodeAnalysis.Compiler.Test.Resources.dll") - add("Dlls\Microsoft.CodeAnalysis.ExpressionCompiler.Utilities\Microsoft.CodeAnalysis.ExpressionEvaluator.ExpressionCompiler.Utilities.dll") - add("Dlls\Microsoft.CodeAnalysis.ResultProvider.Utilities\Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider.Utilities.dll") - add("Dlls\Roslyn.Test.PdbUtilities\Roslyn.Test.PdbUtilities.dll") - add("UnitTests\Microsoft.CodeAnalysis.EditorFeatures.UnitTests\BasicUndo.dll") - add("UnitTests\Microsoft.CodeAnalysis.EditorFeatures.UnitTests\Moq.dll") - add("UnitTests\Microsoft.CodeAnalysis.EditorFeatures.UnitTests\Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll") - add("UnitTests\Microsoft.CodeAnalysis.CSharp.Emit.UnitTests\net46\Microsoft.DiaSymReader.PortablePdb.dll") - add("UnitTests\Microsoft.CodeAnalysis.CSharp.Emit.UnitTests\net46\Microsoft.DiaSymReader.Converter.dll") - add("UnitTests\Microsoft.CodeAnalysis.CSharp.Emit.UnitTests\net46\Microsoft.DiaSymReader.Converter.Xml.dll") - add("UnitTests\Microsoft.CodeAnalysis.CSharp.Emit.UnitTests\net46\Microsoft.DiaSymReader.dll") - add("UnitTests\Microsoft.CodeAnalysis.CSharp.Emit.UnitTests\net46\Microsoft.DiaSymReader.Native.amd64.dll") - add("UnitTests\Microsoft.CodeAnalysis.CSharp.Emit.UnitTests\net46\Microsoft.DiaSymReader.Native.x86.dll") - add("Vsix\ExpressionEvaluatorPackage\Microsoft.VisualStudio.Debugger.Engine.dll") - add("Vsix\Microsoft.VisualStudio.IntegrationTest.Setup\Microsoft.Diagnostics.Runtime.dll") - add("Exes\Toolset\System.AppContext.dll") - add("Exes\Toolset\System.Console.dll") - add("Exes\Toolset\System.Collections.Immutable.dll") - add("Exes\Toolset\System.Diagnostics.DiagnosticSource.dll") - add("Exes\Toolset\System.Diagnostics.FileVersionInfo.dll") - add("Exes\Toolset\System.Diagnostics.StackTrace.dll") - add("Exes\Toolset\System.IO.Compression.dll") - add("Exes\Toolset\System.IO.FileSystem.dll") - add("Exes\Toolset\System.IO.FileSystem.Primitives.dll") - add("Exes\Toolset\System.Net.Http.dll") - add("Exes\Toolset\System.Reflection.Metadata.dll") - add("Exes\Toolset\System.Security.Cryptography.Algorithms.dll") - add("Exes\Toolset\System.Security.Cryptography.Encoding.dll") - add("Exes\Toolset\System.Security.Cryptography.Primitives.dll") - add("Exes\Toolset\System.Security.Cryptography.X509Certificates.dll") - add("Exes\Toolset\System.Text.Encoding.CodePages.dll") - add("Exes\Toolset\System.ValueTuple.dll") - add("Exes\Toolset\System.Xml.ReaderWriter.dll") - add("Exes\Toolset\System.Xml.XmlDocument.dll") - add("Exes\Toolset\System.Xml.XPath.dll") - add("Exes\Toolset\System.Xml.XPath.XDocument.dll") - add("Vsix\Roslyn.VisualStudio.Setup\Humanizer.dll") - Return map - End Function - - Private Function GetMappedPath(fileName As String) As String - Dim mappedPath As String = Nothing - If Not _pathMap.TryGetValue(fileName, mappedPath) Then - Throw New Exception($"File name {fileName} does not have a mapped path") - End If - - Return mappedPath - End Function - - Private Function GetPotentiallyMappedPath(fileName As String) As String - Dim mappedPath As String = Nothing - If _pathMap.TryGetValue(fileName, mappedPath) Then - Return mappedPath - Else - Return fileName - End If - End Function - - Private Sub ProcessVsixFiles(filesToInsert As List(Of NugetFileInfo), dependencies As Dictionary(Of String, DependencyInfo)) - Dim processedFiles = New HashSet(Of String)(StringComparer.OrdinalIgnoreCase) - Dim allGood = True - - ' We build our language service authoring by cracking our .vsixes and pulling out the bits that matter - For Each vsixFileName In VsixesToInstall - Dim vsixName As String = Path.GetFileNameWithoutExtension(vsixFileName) - WriteLineIfVerbose($"Processing {vsixName}") - - Using vsix = Package.Open(Path.Combine(_binDirectory, vsixFileName), FileMode.Open, FileAccess.Read, FileShare.Read) - For Each vsixPart In vsix.GetParts() - - ' This part might be metadata for the digital signature. In that case, skip it - If vsixPart.ContentType.StartsWith("application/vnd.openxmlformats-package.") Then - Continue For - End If - - Dim partRelativePath = GetPartRelativePath(vsixPart) - Dim partFileName = Path.GetFileName(partRelativePath) - - WriteLineIfVerbose($" Processing {partFileName}") - - ' If this is something that we don't need to ship, skip it - If VsixContentsToSkip.Contains(partFileName) Then - WriteLineIfVerbose($" Skipping because {partFileName} is in {NameOf(VsixContentsToSkip)}") - Continue For - End If - - If IsLanguageServiceRegistrationFile(partFileName) Then - WriteLineIfVerbose($" Skipping because {partFileName} is a language service registration file that doesn't need to be processed") - Continue For - End If - - ' Files generated by the VSIX v3 installer that don't need to be inserted. - If partFileName = "catalog.json" OrElse partFileName = "manifest.json" Then - Continue For - End If - - If dependencies.ContainsKey(partFileName) Then - WriteLineIfVerbose($" Skipping because {partFileName} is a dependency that is coming from NuGet package {dependencies(partFileName).PackageName}") - Continue For - End If - - Dim relativeOutputFilePath = Path.Combine(GetExternalApiDirectory(), partFileName) - - ' paths are relative to input directory: - If processedFiles.Add(relativeOutputFilePath) Then - ' In Razzle src\ArcProjects\debugger\ConcordSDK.targets references .vsdconfig files under LanguageServiceRegistration\ExpressionEvaluatorPackage - Dim target = If(Path.GetExtension(partFileName).Equals(".vsdconfig"), "LanguageServiceRegistration\ExpressionEvaluatorPackage", "") - - Dim partPath = GetPotentiallyMappedPath(partFileName) - - If Not File.Exists(Path.Combine(_binDirectory, partPath)) Then - Console.WriteLine($"File {partPath} does not exist at {_binDirectory}") - allGood = False - End If - - filesToInsert.Add(New NugetFileInfo(partPath, target)) - AddXmlDocumentationFile(filesToInsert, partPath) - End If - Next - End Using - Next - - If Not allGood Then - Throw New Exception("Error processing VSIX files") - End If - End Sub - - Private Function GetPartRelativePath(part As PackagePart) As String - Dim name = part.Uri.OriginalString - If name.Length > 0 AndAlso name(0) = "/"c Then - name = name.Substring(1) - End If - - Return name.Replace("/"c, "\"c) - End Function - - ' XML doc file if exists: - Private Sub AddXmlDocumentationFile(filesToInsert As List(Of NugetFileInfo), fileName As String) - If IsExecutableCodeFileName(fileName) Then - Dim xmlDocFile = Path.ChangeExtension(fileName, ".xml") - If File.Exists(Path.Combine(_binDirectory, xmlDocFile)) Then - ' paths are relative to input directory - filesToInsert.Add(New NugetFileInfo(xmlDocFile)) - End If - End If - End Sub - - ''' - ''' Takes a list of paths relative to and generates a nuspec file that includes them. - ''' - Private Sub GenerateRoslynNuSpec(filesToInsert As List(Of NugetFileInfo)) - Const PackageName As String = "VS.ExternalAPIs.Roslyn" - - ' Do a quick sanity check for the files existing. If they don't exist at this time then the tool output - ' is going to be unusable - Dim allGood = True - For Each fileInfo In filesToInsert - Dim filePath = Path.Combine(_binDirectory, fileInfo.Path) - If Not File.Exists(filePath) Then - allGood = False - Console.WriteLine($"File {fileInfo.Path} does not exist at {_binDirectory}") - End If - Next - - Dim xml = - - - <%= PackageName %> - Roslyn binaries for the VS build. - CoreXT package for the VS build. - Managed Languages - 0.0 - - - <%= filesToInsert. - OrderBy(Function(f) f.Path). - Distinct(). - Select(Function(f) target=<%= f.Target %>/>) %> - - - - xml.Save(GetAbsolutePathInOutputDirectory(PackageName & ".nuspec"), SaveOptions.OmitDuplicateNamespaces) - End Sub - - ''' - ''' Generates the nuspec + supporting file layout for the Roslyn toolset nupkg file. This is the toolset - ''' which will be used during the VS build. This will exactly match the layout of the toolset used - ''' by the Microsoft.Net.Compilers package + some devdiv environment files. - ''' - Private Sub GenerateVSToolsRoslynCoreXTNuspec() - Const packageName As String = "VS.Tools.Roslyn" - Dim outputDir = GetAbsolutePathInOutputDirectory(packageName) - Dim nuspecFiles As New List(Of String) - Directory.CreateDirectory(outputDir) - - ' First copy over all the files from the compilers toolset. - For Each fileFullPath In GetCompilerToolsetNuspecFiles() - Dim fileName = Path.GetFileName(fileFullPath) - - ' Skip satellite assemblies; we don't need these for the compiler insertion - If fileName.EndsWith(".resources.dll", StringComparison.OrdinalIgnoreCase) Then - Continue For - End If - - Dim destFilepath = Path.Combine(outputDir, fileName) - File.Copy(fileFullPath, destFilepath) - nuspecFiles.Add(fileName) - - ' A bug in VS forces all of our exes to use the prefer 32 bit mode. Mark the copies added - ' to this nuspec as such. They are isolated and hence allow our binaries shipped to customers - ' to remain executable as 64 bit apps - ' See https://github.com/dotnet/roslyn/issues/17864 - If Path.GetExtension(fileName) = ".exe" Then - MarkFile32BitPref(destFilepath) - End If - Next - - ' Write an Init.cmd that sets DEVPATH to the toolset location. This overrides - ' assembly loading during the VS build to always look in the Roslyn toolset - ' first. This is necessary because there are various incompatible versions - ' of Roslyn littered throughout the DEVPATH already and this one should always - ' take precedence. - Dim initFileName = "Init.cmd" - Dim fileContents = "@echo off - -set RoslynToolsRoot=%~dp0 -set DEVPATH=%RoslynToolsRoot%;%DEVPATH%" - - File.WriteAllText(Path.Combine(outputDir, initFileName), fileContents) - nuspecFiles.Add(initFileName) - - Dim xml = - - - <%= packageName %> - Roslyn compiler binaries used to build VS - CoreXT package for Roslyn compiler toolset. - Managed Language Compilers - 0.0 - - - - <%= nuspecFiles. - OrderBy(Function(f) f). - Select(Function(f) />) %> - - - - xml.Save(Path.Combine(outputDir, packageName & ".nuspec"), SaveOptions.OmitDuplicateNamespaces) - End Sub - - Private Sub MarkFile32BitPref(filePath As String) - Const OffsetFromStartOfCorHeaderToFlags = 4 + ' byte count - 2 + ' Major version - 2 + ' Minor version - 8 ' Metadata directory - - Using stream As FileStream = File.Open(filePath, FileMode.Open, FileAccess.ReadWrite, FileShare.Read) - Using reader As PEReader = New PEReader(stream) - Dim newFlags As Int32 = reader.PEHeaders.CorHeader.Flags Or - CorFlags.Prefers32Bit Or - CorFlags.Requires32Bit ' CLR requires both req and pref flags to be set - - Using writer = New BinaryWriter(stream) - Dim mdReader = reader.GetMetadataReader() - stream.Position = reader.PEHeaders.CorHeaderStartOffset + OffsetFromStartOfCorHeaderToFlags - - writer.Write(newFlags) - writer.Flush() - End Using - End Using - End Using - End Sub - - Private Function IsLanguageServiceRegistrationFile(fileName As String) As Boolean - Select Case Path.GetExtension(fileName) - Case ".vsixmanifest", ".pkgdef", ".png", ".ico" - Return True - Case Else - Return False - End Select - End Function - - Private Shared Function IsExecutableCodeFileName(fileName As String) As Boolean - Dim extension = Path.GetExtension(fileName) - Return extension = ".exe" OrElse extension = ".dll" - End Function - Private Function GetAbsolutePathInOutputDirectory(relativePath As String) As String Dim absolutePath = Path.Combine(_outputDirectory, relativePath) @@ -847,63 +252,4 @@ set DEVPATH=%RoslynToolsRoot%;%DEVPATH%" Return absolutePath End Function - - ''' - ''' Get the list of files that appear in the compiler toolset nuspec file. This is the authorative - ''' list of files that make up the compiler toolset layout. - ''' - Private Function GetCompilerToolsetNuspecFiles() As List(Of String) - Dim files As New List(Of String) - Dim nuspecFilePath = Path.Combine(_nuspecDirectory, "Microsoft.Net.Compilers.nuspec") - Dim document = XDocument.Load(nuspecFilePath) - For Each fileElement In document... - If fileElement.Attribute("target").Value = "tools" Then - Dim fileRelativePath = fileElement.Attribute("src").Value - Dim fileFullPath = Path.Combine(_binDirectory, fileRelativePath) - If fileRelativePath.Contains("**") Then - Continue For - ElseIf fileRelativePath.Contains("*") Then - Dim dir = Path.GetDirectoryName(fileRelativePath) - dir = Path.Combine(_binDirectory, dir) - For Each f In Directory.EnumerateFiles(dir, Path.GetFileName(fileRelativePath)) - files.Add(f) - Next - Else - files.Add(fileFullPath) - End If - End If - Next - - Return files - End Function - - ''' - ''' Get the set of compiler files that need to be copied over during insertion. - ''' - Private Function GetCompilerInsertFiles() As IEnumerable(Of String) - Return GetCompilerToolsetNuspecFiles(). - Select(AddressOf Path.GetFileName). - Where(Function(f) - ' Skip satellite assemblies; we don't need these for the compiler insertion - Return Not f.EndsWith(".resources.dll", StringComparison.OrdinalIgnoreCase) - End Function). - Where(Function(f) - Select Case f - ' These files are inserted by MSBuild setup - Case "Microsoft.DiaSymReader.Native.amd64.dll", "Microsoft.DiaSymReader.Native.x86.dll" - Return False - ' Do not truly understand why these are excluded here. Just maintaining compat - Case "System.Collections.Immutable.dll", "System.Reflection.Metadata.dll" - Return False - Case Else - Return True - End Select - End Function) - End Function - - Private Sub WriteLineIfVerbose(s As String) - If _verbose Then - Console.WriteLine(s) - End If - End Sub End Class diff --git a/src/Setup/DevDivInsertionFiles/NugetUtilities.vb b/src/Setup/DevDivInsertionFiles/NugetUtilities.vb deleted file mode 100644 index c433a4d6250cd..0000000000000 --- a/src/Setup/DevDivInsertionFiles/NugetUtilities.vb +++ /dev/null @@ -1,35 +0,0 @@ -Imports System.IO -Imports System.Runtime.InteropServices - -Public Class NugetUtilities - Private Const PackageNamePrefix = "VS.ExternalAPIs." - Private Const PackageExtension = ".nupkg" - - Public Shared Sub ParsePackageFileName(fileName As String, ByRef libraryName As String, ByRef versionStr As String) - If Not fileName.EndsWith(PackageExtension) Then - Throw New InvalidDataException($"Invalid package name: '{fileName}'") - End If - - Dim nameStart = If(fileName.StartsWith(PackageNamePrefix), PackageNamePrefix.Length, 0) - Dim parts = fileName.Substring(nameStart, fileName.Length - nameStart - PackageExtension.Length).Split("."c) - - Dim firstNumber As Integer = IndexOfNumericPart(parts) - If firstNumber = -1 Then - Throw New InvalidDataException($"Invalid package name: '{fileName}'") - End If - - libraryName = String.Join(".", parts.Take(firstNumber)) - versionStr = String.Join(".", parts.Skip(firstNumber)) - End Sub - - Private Shared Function IndexOfNumericPart(parts As String()) As Integer - For i = 0 To parts.Length - 1 - Dim number As Integer - If Integer.TryParse(parts(i), number) Then - Return i - End If - Next - - Return -1 - End Function -End Class diff --git a/src/Setup/DevDivInsertionFiles/Roslyn.BuildDevDivInsertionFiles.vbproj b/src/Setup/DevDivInsertionFiles/Roslyn.BuildDevDivInsertionFiles.vbproj index e61f4429f7a33..1ccbcc8a9c89d 100644 --- a/src/Setup/DevDivInsertionFiles/Roslyn.BuildDevDivInsertionFiles.vbproj +++ b/src/Setup/DevDivInsertionFiles/Roslyn.BuildDevDivInsertionFiles.vbproj @@ -37,6 +37,5 @@ - \ No newline at end of file diff --git a/src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj b/src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj index ee6a3d3ea92d3..c2af510e442a1 100644 --- a/src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj +++ b/src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj @@ -44,15 +44,19 @@ + + + + + - diff --git a/src/VisualStudio/CSharp/Repl/Microsoft.VisualStudio.CSharp.Repl.csproj b/src/VisualStudio/CSharp/Repl/Microsoft.VisualStudio.CSharp.Repl.csproj index 11cef0963f5e7..f508db8cab1a8 100644 --- a/src/VisualStudio/CSharp/Repl/Microsoft.VisualStudio.CSharp.Repl.csproj +++ b/src/VisualStudio/CSharp/Repl/Microsoft.VisualStudio.CSharp.Repl.csproj @@ -39,6 +39,10 @@ + + + + diff --git a/src/VisualStudio/CSharp/Test/Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.csproj b/src/VisualStudio/CSharp/Test/Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.csproj index 8d92ddf120c34..b8b880d230028 100644 --- a/src/VisualStudio/CSharp/Test/Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.csproj +++ b/src/VisualStudio/CSharp/Test/Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.csproj @@ -68,14 +68,9 @@ but includes the lib folder so it's copied as a dependency of Microsoft.VisualStudio.Platform.VSEditor. Unfortunately we still have test code that does depend on internal APIs, so we need to a force a reference here. This hack is tracked by https://devdiv.visualstudio.com/DevDiv/_workitems/edit/567115 --> - - - - - diff --git a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj index 5b3a0494ed67d..aa9e6eeaae3a2 100644 --- a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj +++ b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj @@ -13,6 +13,12 @@ false false None + + + true + + .NET Compiler Platform ("Roslyn") support for Visual Studio. + @@ -77,7 +83,8 @@ - + + diff --git a/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj b/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj index 3358f66194c2b..f3a6fb1abce80 100644 --- a/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj +++ b/src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj @@ -58,12 +58,15 @@ + + + diff --git a/src/VisualStudio/Core/SolutionExplorerShim/Microsoft.VisualStudio.LanguageServices.SolutionExplorer.csproj b/src/VisualStudio/Core/SolutionExplorerShim/Microsoft.VisualStudio.LanguageServices.SolutionExplorer.csproj index 690c9542bdb33..7003d751d4eff 100644 --- a/src/VisualStudio/Core/SolutionExplorerShim/Microsoft.VisualStudio.LanguageServices.SolutionExplorer.csproj +++ b/src/VisualStudio/Core/SolutionExplorerShim/Microsoft.VisualStudio.LanguageServices.SolutionExplorer.csproj @@ -34,11 +34,21 @@ + + + + + + + + + + diff --git a/src/VisualStudio/Core/Test.Next/Roslyn.VisualStudio.Next.UnitTests.csproj b/src/VisualStudio/Core/Test.Next/Roslyn.VisualStudio.Next.UnitTests.csproj index 159c0da85eae5..11bfca24fe444 100644 --- a/src/VisualStudio/Core/Test.Next/Roslyn.VisualStudio.Next.UnitTests.csproj +++ b/src/VisualStudio/Core/Test.Next/Roslyn.VisualStudio.Next.UnitTests.csproj @@ -62,6 +62,8 @@ + + diff --git a/src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj b/src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj index 7db8445080395..e5b7c023252e8 100644 --- a/src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj +++ b/src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj @@ -67,15 +67,16 @@ - + + + + - - @@ -83,7 +84,6 @@ - diff --git a/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj b/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj index 328dd45e1cf20..4c9858dd3aa45 100644 --- a/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj +++ b/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj @@ -58,6 +58,12 @@ --> + + + + + + diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/Microsoft.VisualStudio.IntegrationTest.Utilities.csproj b/src/VisualStudio/IntegrationTest/TestUtilities/Microsoft.VisualStudio.IntegrationTest.Utilities.csproj index 7eefe9c67e543..f0b23b6bec144 100644 --- a/src/VisualStudio/IntegrationTest/TestUtilities/Microsoft.VisualStudio.IntegrationTest.Utilities.csproj +++ b/src/VisualStudio/IntegrationTest/TestUtilities/Microsoft.VisualStudio.IntegrationTest.Utilities.csproj @@ -8,6 +8,12 @@ Microsoft.VisualStudio.IntegrationTest.Utilities net46 false + + + true + + Utility methods used to run Visual Studio integration tests. + @@ -36,6 +42,7 @@ + @@ -43,8 +50,10 @@ + + @@ -52,6 +61,7 @@ + + true + + A private package for the Razor team to grant access to certain internal APIs. + diff --git a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj index 1078d111535a0..b44a5ee28d015 100644 --- a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj +++ b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj @@ -299,5 +299,8 @@ + + + \ No newline at end of file diff --git a/src/VisualStudio/TestUtilities2/Microsoft.VisualStudio.LanguageServices.Test.Utilities2.vbproj b/src/VisualStudio/TestUtilities2/Microsoft.VisualStudio.LanguageServices.Test.Utilities2.vbproj index d094bb9fe0141..9674abba1da23 100644 --- a/src/VisualStudio/TestUtilities2/Microsoft.VisualStudio.LanguageServices.Test.Utilities2.vbproj +++ b/src/VisualStudio/TestUtilities2/Microsoft.VisualStudio.LanguageServices.Test.Utilities2.vbproj @@ -74,10 +74,12 @@ - + + + diff --git a/src/VisualStudio/VisualBasic/Impl/Microsoft.VisualStudio.LanguageServices.VisualBasic.vbproj b/src/VisualStudio/VisualBasic/Impl/Microsoft.VisualStudio.LanguageServices.VisualBasic.vbproj index 9ecc314dcc774..e777a57fc3853 100644 --- a/src/VisualStudio/VisualBasic/Impl/Microsoft.VisualStudio.LanguageServices.VisualBasic.vbproj +++ b/src/VisualStudio/VisualBasic/Impl/Microsoft.VisualStudio.LanguageServices.VisualBasic.vbproj @@ -49,12 +49,18 @@ + + + + + + diff --git a/src/VisualStudio/VisualBasic/Repl/Microsoft.VisualStudio.VisualBasic.Repl.vbproj b/src/VisualStudio/VisualBasic/Repl/Microsoft.VisualStudio.VisualBasic.Repl.vbproj index cdad14159bb45..fcb7969d16dad 100644 --- a/src/VisualStudio/VisualBasic/Repl/Microsoft.VisualStudio.VisualBasic.Repl.vbproj +++ b/src/VisualStudio/VisualBasic/Repl/Microsoft.VisualStudio.VisualBasic.Repl.vbproj @@ -41,6 +41,10 @@ + + + + diff --git a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj index 93edb928bd4b5..5df9b376b1a9b 100644 --- a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj +++ b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj @@ -76,6 +76,10 @@ + + + + diff --git a/src/VisualStudio/VisualStudioInteractiveComponents/Roslyn.VisualStudio.InteractiveComponents.csproj b/src/VisualStudio/VisualStudioInteractiveComponents/Roslyn.VisualStudio.InteractiveComponents.csproj index 107e6d88f5d15..16288553915ba 100644 --- a/src/VisualStudio/VisualStudioInteractiveComponents/Roslyn.VisualStudio.InteractiveComponents.csproj +++ b/src/VisualStudio/VisualStudioInteractiveComponents/Roslyn.VisualStudio.InteractiveComponents.csproj @@ -142,6 +142,8 @@ + + diff --git a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj index 2a802a3879616..3b2bc62a69a8e 100644 --- a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj +++ b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj @@ -8,7 +8,12 @@ Microsoft.CodeAnalysis.CSharp true netstandard1.3 - true + + + true + + .NET Compiler Platform ("Roslyn") support for analyzing C# projects and solutions. + diff --git a/src/NuGet/Microsoft.CodeAnalysis.Workspaces.Common.nuspec b/src/Workspaces/Core/Desktop/Microsoft.CodeAnalysis.Workspaces.Common.nuspec similarity index 72% rename from src/NuGet/Microsoft.CodeAnalysis.Workspaces.Common.nuspec rename to src/Workspaces/Core/Desktop/Microsoft.CodeAnalysis.Workspaces.Common.nuspec index 94d01872a9a0e..c6e83c7c50104 100644 --- a/src/NuGet/Microsoft.CodeAnalysis.Workspaces.Common.nuspec +++ b/src/Workspaces/Core/Desktop/Microsoft.CodeAnalysis.Workspaces.Common.nuspec @@ -1,18 +1,18 @@ - Microsoft.CodeAnalysis.Workspaces.Common - - A shared package used by the .NET Compiler Platform ("Roslyn") including support for analyzing projects and solutions. - - - A shared package used by the .NET Compiler Platform ("Roslyn") including support for analyzing projects and solutions. - Do not install this package manually, it will be added as a prerequisite by other packages that require it. - - More details at https://aka.ms/roslyn-packages - - $commitPathMessage$ - + $PackageId$ + $PackageDescription$ + $Version$ + $Authors$ + $RequireLicenseAcceptance$ + $PackageLicenseUrl$ + $PackageProjectUrl$ + $Copyright$ + $DevelopmentDependency$ + $PackageTags$ + $Serviceable$ + @@ -28,19 +28,10 @@ - - en-US - true - $version$ - $authors$ - $licenseUrlRedist$ - $projectUrl$ - $releaseNotes$ - $tags$ - true - + + @@ -51,7 +42,6 @@ - diff --git a/src/Workspaces/Core/Desktop/Microsoft.CodeAnalysis.Workspaces.Desktop.csproj b/src/Workspaces/Core/Desktop/Microsoft.CodeAnalysis.Workspaces.Desktop.csproj index 2e80a0070ae25..52db75b055258 100644 --- a/src/Workspaces/Core/Desktop/Microsoft.CodeAnalysis.Workspaces.Desktop.csproj +++ b/src/Workspaces/Core/Desktop/Microsoft.CodeAnalysis.Workspaces.Desktop.csproj @@ -9,17 +9,52 @@ true net46 $(DefineConstants);WORKSPACE_DESKTOP + + + true + + A shared package used by the .NET Compiler Platform ("Roslyn") including support for analyzing projects and solutions. + Do not install this package manually, it will be added as a prerequisite by other packages that require it. + + + + Microsoft.CodeAnalysis.Workspaces.Common + $(NuspecPackageId).nuspec + $(ArtifactsConfigurationDir) + + + false - - - + + + + + + + + + - + + + @@ -82,7 +117,9 @@ - + + + diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj index f68a82e984a4f..c20c8d5e88cc2 100644 --- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj @@ -9,6 +9,15 @@ true net46 $(DefineConstants);WORKSPACE_MSBUILD + + + true + + .NET Compiler Platform ("Roslyn") support for analyzing MSBuild projects and solutions. This should be used with at least one + of the following packages to add the appropriate language support: + - Microsoft.CodeAnalysis.CSharp.Workspaces + - Microsoft.CodeAnalysis.VisualBasic.Workspaces + diff --git a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj index 64bc12d38f58b..afd90d877140a 100644 --- a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj +++ b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj @@ -8,8 +8,19 @@ Microsoft.CodeAnalysis true netstandard1.3 - true $(DefineConstants);WORKSPACE + + + Microsoft.CodeAnalysis.Workspaces.Common diff --git a/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj b/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj index 036a2a193981e..516ac99ff8138 100644 --- a/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj +++ b/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj @@ -8,6 +8,13 @@ Microsoft.CodeAnalysis.Remote net46 true + + + true + + A shared package used by the .NET Compiler Platform ("Roslyn") including support for coordinating analysis of projects and solutions using a separate server process. + Do not install this package manually, it will be added as a prerequisite by other packages that require it. + @@ -20,7 +27,8 @@ - + + diff --git a/src/Workspaces/Remote/Razor/Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.csproj b/src/Workspaces/Remote/Razor/Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.csproj index a5baa9f0561e1..c677676363373 100644 --- a/src/Workspaces/Remote/Razor/Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.csproj +++ b/src/Workspaces/Remote/Razor/Microsoft.CodeAnalysis.Remote.Razor.ServiceHub.csproj @@ -7,6 +7,12 @@ Library Microsoft.CodeAnalysis.Remote.Razor.ServiceHub net46 + + + true + + A private package for the Razor team to grant access to certain internal APIs. + diff --git a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj index 01214bd679486..914b1ccb0646c 100644 --- a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj +++ b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj @@ -8,13 +8,21 @@ Microsoft.CodeAnalysis.Remote net46 true + + + true + + A shared package used by the .NET Compiler Platform ("Roslyn") including support for coordinating analysis of projects and solutions using a separate server process. + Do not install this package manually, it will be added as a prerequisite by other packages that require it. + - + + diff --git a/src/Workspaces/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj b/src/Workspaces/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj index e6bb68affcc24..29f0c9d97309d 100644 --- a/src/Workspaces/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj +++ b/src/Workspaces/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj @@ -6,8 +6,13 @@ AnyCPU Library netstandard1.3 - true + + + true + + .NET Compiler Platform ("Roslyn") support for analyzing Visual Basic projects and solutions. +