From 674f43ef9c2e84913362132d13acc482303dd742 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 20 Oct 2021 13:40:38 -0700 Subject: [PATCH 01/12] Add Features projects to SourceBuild --- Compilers.sln | 20 ++++++++++++++++++- ...rosoft.CodeAnalysis.CSharp.Features.csproj | 4 ++++ .../Microsoft.CodeAnalysis.Features.csproj | 11 ++++++++-- src/Features/Directory.Build.props | 3 --- ...odeAnalysis.LanguageServer.Protocol.csproj | 1 + ...s.LanguageServer.Protocol.UnitTests.csproj | 1 + ...LanguageServerIndexFormat.Generator.csproj | 1 + ...rverIndexFormat.Generator.UnitTests.vbproj | 1 + ...t.CodeAnalysis.VisualBasic.Features.vbproj | 4 ++++ 9 files changed, 40 insertions(+), 6 deletions(-) diff --git a/Compilers.sln b/Compilers.sln index 4e6a9c33d9dcc..b14d2ddba417b 100644 --- a/Compilers.sln +++ b/Compilers.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29519.87 MinimumVisualStudioVersion = 10.0.40219.1 @@ -152,6 +152,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Rebu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Rebuild.UnitTests", "src\Compilers\Core\RebuildTest\Microsoft.CodeAnalysis.Rebuild.UnitTests.csproj", "{FDBFBB64-5980-41C2-9E3E-FB8E2F700A5C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CodeAnalysis.Features", "src\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj", "{339D54BB-C365-43E6-A820-C9312965B5DE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CodeAnalysis.CSharp.Features", "src\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj", "{50EEFFF1-C60A-4EC0-8203-7A06BB3CD65C}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Microsoft.CodeAnalysis.VisualBasic.Features", "src\Features\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj", "{0278BAFC-CE64-406A-B51E-501D8C5F82C0}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5 @@ -421,6 +427,18 @@ Global {FDBFBB64-5980-41C2-9E3E-FB8E2F700A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU {FDBFBB64-5980-41C2-9E3E-FB8E2F700A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU {FDBFBB64-5980-41C2-9E3E-FB8E2F700A5C}.Release|Any CPU.Build.0 = Release|Any CPU + {339D54BB-C365-43E6-A820-C9312965B5DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {339D54BB-C365-43E6-A820-C9312965B5DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {339D54BB-C365-43E6-A820-C9312965B5DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {339D54BB-C365-43E6-A820-C9312965B5DE}.Release|Any CPU.Build.0 = Release|Any CPU + {50EEFFF1-C60A-4EC0-8203-7A06BB3CD65C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50EEFFF1-C60A-4EC0-8203-7A06BB3CD65C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50EEFFF1-C60A-4EC0-8203-7A06BB3CD65C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50EEFFF1-C60A-4EC0-8203-7A06BB3CD65C}.Release|Any CPU.Build.0 = Release|Any CPU + {0278BAFC-CE64-406A-B51E-501D8C5F82C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0278BAFC-CE64-406A-B51E-501D8C5F82C0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0278BAFC-CE64-406A-B51E-501D8C5F82C0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0278BAFC-CE64-406A-B51E-501D8C5F82C0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj index a82a820316c48..5205c9f0a8187 100644 --- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj +++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj @@ -60,6 +60,10 @@ InternalUtilities\LambdaUtilities.cs + + + + diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj index 1af351cc77bb2..f8888910e4e87 100644 --- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj @@ -7,7 +7,7 @@ netcoreapp3.1;netstandard2.0 full true - + true @@ -129,7 +129,14 @@ - + + + + + + + + diff --git a/src/Features/Directory.Build.props b/src/Features/Directory.Build.props index 6eef643958f56..12d9ad073ecd8 100644 --- a/src/Features/Directory.Build.props +++ b/src/Features/Directory.Build.props @@ -1,6 +1,3 @@ - - true - diff --git a/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj b/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj index a0d4e206c04a5..340abc73405fe 100644 --- a/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj +++ b/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj @@ -9,6 +9,7 @@ .NET Compiler Platform ("Roslyn") support for Language Server Protocol. + true diff --git a/src/Features/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj b/src/Features/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj index 19c77c14e8a2b..64bfabd3647d6 100644 --- a/src/Features/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj +++ b/src/Features/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj @@ -7,6 +7,7 @@ Library Microsoft.CodeAnalysis.LanguageServer.UnitTests UnitTest + true diff --git a/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj b/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj index 80e7b11f9eaa7..b59665c3db5ae 100644 --- a/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj +++ b/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj @@ -28,6 +28,7 @@ For more information about LSIF, see https://code.visualstudio.com/blogs/2019/02/19/lsif false + true diff --git a/src/Features/Lsif/GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj b/src/Features/Lsif/GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj index f4291c4359d13..c2ed6fad2a67f 100644 --- a/src/Features/Lsif/GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj +++ b/src/Features/Lsif/GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj @@ -7,6 +7,7 @@ Library UnitTest + true diff --git a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj index ac8c80c68fbea..41f580ac5d4c8 100644 --- a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj +++ b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj @@ -55,6 +55,10 @@ InternalUtilities\LambdaUtilities.vb + + + + From 32c506aecd56028bdaeb4c7bf1867255604961ef Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 20 Oct 2021 14:43:36 -0700 Subject: [PATCH 02/12] Fix Debugger.Contracts package condition --- .../Core/Portable/Microsoft.CodeAnalysis.Features.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj index f8888910e4e87..b69b2fd5bac0e 100644 --- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj @@ -1,4 +1,4 @@ - + @@ -129,7 +129,7 @@ - + From 0569f3d2bd3c700b62d0a2c1a5901b4f55d02f66 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 20 Oct 2021 15:05:51 -0700 Subject: [PATCH 03/12] Refine SourceBuild Features exclusions --- .../Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj | 3 ++- .../Core/Portable/Microsoft.CodeAnalysis.Features.csproj | 5 ++--- .../Microsoft.CodeAnalysis.VisualBasic.Features.vbproj | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj index 5205c9f0a8187..9dac307c856fe 100644 --- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj +++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj @@ -61,8 +61,9 @@ - + + diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj index b69b2fd5bac0e..943443c55bc33 100644 --- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj @@ -1,4 +1,4 @@ - + @@ -132,9 +132,8 @@ - - + diff --git a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj index 41f580ac5d4c8..d17a5d848023a 100644 --- a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj +++ b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj @@ -56,8 +56,8 @@ - + From 919237c10655e5029a92b77ab260f55e14db0ba1 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 14 Oct 2021 18:24:18 -0500 Subject: [PATCH 04/12] Build more projects during source-build Use Roslyn.sln, not Compilers.sln, to build more projects during source-build. Update ExcludeFromSourceBuild properties to include more projects and exclude a few projects that shouldn't be in source-build. The newly included projects are used by downstream repos. --- eng/SourceBuild.props | 2 +- .../Core/Tests}/Directory.Build.props | 0 .../CodeAnalysis.Debugging}/Directory.Build.props | 0 src/Dependencies/Microsoft.NetFX20/Directory.Build.props | 6 ++++++ src/Dependencies/PooledObjects/Directory.Build.props | 6 ++++++ src/Features/LanguageServer/Directory.Build.props | 6 ++++++ src/Features/Lsif/Directory.Build.props | 6 ++++++ src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ .../Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj | 2 -- 9 files changed, 31 insertions(+), 3 deletions(-) rename src/{Dependencies => CodeStyle/Core/Tests}/Directory.Build.props (100%) rename src/{Features => Dependencies/CodeAnalysis.Debugging}/Directory.Build.props (100%) create mode 100644 src/Dependencies/Microsoft.NetFX20/Directory.Build.props create mode 100644 src/Dependencies/PooledObjects/Directory.Build.props create mode 100644 src/Features/LanguageServer/Directory.Build.props create mode 100644 src/Features/Lsif/Directory.Build.props create mode 100644 src/NuGet/VisualStudio/Directory.Build.props diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 182f8a9cdb12b..92e316a47440b 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -11,7 +11,7 @@ --> - $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Compilers.sln" + $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" diff --git a/src/Dependencies/Directory.Build.props b/src/CodeStyle/Core/Tests/Directory.Build.props similarity index 100% rename from src/Dependencies/Directory.Build.props rename to src/CodeStyle/Core/Tests/Directory.Build.props diff --git a/src/Features/Directory.Build.props b/src/Dependencies/CodeAnalysis.Debugging/Directory.Build.props similarity index 100% rename from src/Features/Directory.Build.props rename to src/Dependencies/CodeAnalysis.Debugging/Directory.Build.props diff --git a/src/Dependencies/Microsoft.NetFX20/Directory.Build.props b/src/Dependencies/Microsoft.NetFX20/Directory.Build.props new file mode 100644 index 0000000000000..6eef643958f56 --- /dev/null +++ b/src/Dependencies/Microsoft.NetFX20/Directory.Build.props @@ -0,0 +1,6 @@ + + + + true + + diff --git a/src/Dependencies/PooledObjects/Directory.Build.props b/src/Dependencies/PooledObjects/Directory.Build.props new file mode 100644 index 0000000000000..6eef643958f56 --- /dev/null +++ b/src/Dependencies/PooledObjects/Directory.Build.props @@ -0,0 +1,6 @@ + + + + true + + diff --git a/src/Features/LanguageServer/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props new file mode 100644 index 0000000000000..6eef643958f56 --- /dev/null +++ b/src/Features/LanguageServer/Directory.Build.props @@ -0,0 +1,6 @@ + + + + true + + diff --git a/src/Features/Lsif/Directory.Build.props b/src/Features/Lsif/Directory.Build.props new file mode 100644 index 0000000000000..6eef643958f56 --- /dev/null +++ b/src/Features/Lsif/Directory.Build.props @@ -0,0 +1,6 @@ + + + + true + + diff --git a/src/NuGet/VisualStudio/Directory.Build.props b/src/NuGet/VisualStudio/Directory.Build.props new file mode 100644 index 0000000000000..6eef643958f56 --- /dev/null +++ b/src/NuGet/VisualStudio/Directory.Build.props @@ -0,0 +1,6 @@ + + + + true + + diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj index 3bd6d6398e3a0..2edf2da6d1af1 100644 --- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj @@ -7,8 +7,6 @@ true netcoreapp3.1;net472 $(DefineConstants);WORKSPACE_MSBUILD - true - true From 8b1f3cb695eaa5c7ee127c7766de0dc075409473 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 15 Oct 2021 02:41:32 -0500 Subject: [PATCH 05/12] Exclude src/Dependencies from source-build This makes source-build stop producing the Microsoft.CodeAnalysis.Collections package. Downstream repos (MSBuild) can't safely use a source-built version. --- .../{CodeAnalysis.Debugging => }/Directory.Build.props | 0 src/Dependencies/Microsoft.NetFX20/Directory.Build.props | 6 ------ src/Dependencies/PooledObjects/Directory.Build.props | 6 ------ 3 files changed, 12 deletions(-) rename src/Dependencies/{CodeAnalysis.Debugging => }/Directory.Build.props (100%) delete mode 100644 src/Dependencies/Microsoft.NetFX20/Directory.Build.props delete mode 100644 src/Dependencies/PooledObjects/Directory.Build.props diff --git a/src/Dependencies/CodeAnalysis.Debugging/Directory.Build.props b/src/Dependencies/Directory.Build.props similarity index 100% rename from src/Dependencies/CodeAnalysis.Debugging/Directory.Build.props rename to src/Dependencies/Directory.Build.props diff --git a/src/Dependencies/Microsoft.NetFX20/Directory.Build.props b/src/Dependencies/Microsoft.NetFX20/Directory.Build.props deleted file mode 100644 index 6eef643958f56..0000000000000 --- a/src/Dependencies/Microsoft.NetFX20/Directory.Build.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - true - - diff --git a/src/Dependencies/PooledObjects/Directory.Build.props b/src/Dependencies/PooledObjects/Directory.Build.props deleted file mode 100644 index 6eef643958f56..0000000000000 --- a/src/Dependencies/PooledObjects/Directory.Build.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - true - - From 8fa8561f2d0810de2b4882e8b2b706d8f81dfdb9 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 20 Oct 2021 15:33:17 -0700 Subject: [PATCH 06/12] Remove SourceBuild project excludes --- .../Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj | 1 - ...crosoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj | 1 - ...osoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj | 1 - ...Analysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj | 1 - 4 files changed, 4 deletions(-) diff --git a/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj b/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj index 340abc73405fe..a0d4e206c04a5 100644 --- a/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj +++ b/src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj @@ -9,7 +9,6 @@ .NET Compiler Platform ("Roslyn") support for Language Server Protocol. - true diff --git a/src/Features/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj b/src/Features/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj index 64bfabd3647d6..19c77c14e8a2b 100644 --- a/src/Features/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj +++ b/src/Features/LanguageServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj @@ -7,7 +7,6 @@ Library Microsoft.CodeAnalysis.LanguageServer.UnitTests UnitTest - true diff --git a/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj b/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj index b59665c3db5ae..80e7b11f9eaa7 100644 --- a/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj +++ b/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj @@ -28,7 +28,6 @@ For more information about LSIF, see https://code.visualstudio.com/blogs/2019/02/19/lsif false - true diff --git a/src/Features/Lsif/GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj b/src/Features/Lsif/GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj index c2ed6fad2a67f..f4291c4359d13 100644 --- a/src/Features/Lsif/GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj +++ b/src/Features/Lsif/GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj @@ -7,7 +7,6 @@ Library UnitTest - true From 4c513d46f90a3c0ced9cddcc78b0b1f9da486753 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 20 Oct 2021 16:09:11 -0700 Subject: [PATCH 07/12] Force Microsoft.Build dependencies to 16.5.0 with RefOnly prefix By default, the projects reference Microsoft.Build 16.5.0, which has netcoreapp2.1 and net472 support. The new 17.0.0-... version built during source-build only has net6.0. This causes Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj to fail. Adding 16.5.0 to SBRP and dodging the override by renaming each package version property is the safe way to fix it. --- eng/Versions.props | 13 ++++++++----- .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 6 +++--- ...rosoft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 2 +- .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 2 +- ...Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj | 6 +++--- ...CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- 8 files changed, 24 insertions(+), 21 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e835ef04d52d5..d432c9a6a961f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ 5.0.0-preview.1.20112.8 17.0.5133-g7b8c8bd49d 17.0.0-previews-4-31709-430 - 16.5.0 + 16.5.0 + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) 6.0.0-preview.0.15 16.10.23 $(NoWarn);CA1819 - + true Microsoft.CodeAnalysis.Build.Tasks @@ -51,8 +51,8 @@ - - + + diff --git a/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj b/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj index 9744f538e6d12..1d515f35f8168 100644 --- a/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj +++ b/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj @@ -27,9 +27,9 @@ - - - + + + diff --git a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj index 3644afb8c2f79..ed4259ec61bd6 100644 --- a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj +++ b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj @@ -115,9 +115,9 @@ - - - + + + diff --git a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj index 6e1cbe46285f7..8ca3cbb28f026 100644 --- a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj +++ b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj b/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj index 305f94cba1784..e2373f8a3d620 100644 --- a/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj +++ b/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj @@ -29,7 +29,7 @@ - + diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj index 2edf2da6d1af1..a65fc35f1c3bb 100644 --- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj @@ -22,9 +22,9 @@ - - - + + + diff --git a/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj b/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj index 3d0c6e993c0ab..06773c65e8d4f 100644 --- a/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj +++ b/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj @@ -27,8 +27,8 @@ - - + + From d6ceb3a1994762f5d19ce7b33bca949500b5de75 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 20 Oct 2021 16:12:19 -0700 Subject: [PATCH 08/12] Revert changes to Compilers.sln --- Compilers.sln | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/Compilers.sln b/Compilers.sln index b14d2ddba417b..4e6a9c33d9dcc 100644 --- a/Compilers.sln +++ b/Compilers.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29519.87 MinimumVisualStudioVersion = 10.0.40219.1 @@ -152,12 +152,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Rebu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Rebuild.UnitTests", "src\Compilers\Core\RebuildTest\Microsoft.CodeAnalysis.Rebuild.UnitTests.csproj", "{FDBFBB64-5980-41C2-9E3E-FB8E2F700A5C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CodeAnalysis.Features", "src\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj", "{339D54BB-C365-43E6-A820-C9312965B5DE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CodeAnalysis.CSharp.Features", "src\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj", "{50EEFFF1-C60A-4EC0-8203-7A06BB3CD65C}" -EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Microsoft.CodeAnalysis.VisualBasic.Features", "src\Features\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj", "{0278BAFC-CE64-406A-B51E-501D8C5F82C0}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5 @@ -427,18 +421,6 @@ Global {FDBFBB64-5980-41C2-9E3E-FB8E2F700A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU {FDBFBB64-5980-41C2-9E3E-FB8E2F700A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU {FDBFBB64-5980-41C2-9E3E-FB8E2F700A5C}.Release|Any CPU.Build.0 = Release|Any CPU - {339D54BB-C365-43E6-A820-C9312965B5DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {339D54BB-C365-43E6-A820-C9312965B5DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {339D54BB-C365-43E6-A820-C9312965B5DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {339D54BB-C365-43E6-A820-C9312965B5DE}.Release|Any CPU.Build.0 = Release|Any CPU - {50EEFFF1-C60A-4EC0-8203-7A06BB3CD65C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50EEFFF1-C60A-4EC0-8203-7A06BB3CD65C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50EEFFF1-C60A-4EC0-8203-7A06BB3CD65C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50EEFFF1-C60A-4EC0-8203-7A06BB3CD65C}.Release|Any CPU.Build.0 = Release|Any CPU - {0278BAFC-CE64-406A-B51E-501D8C5F82C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0278BAFC-CE64-406A-B51E-501D8C5F82C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0278BAFC-CE64-406A-B51E-501D8C5F82C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0278BAFC-CE64-406A-B51E-501D8C5F82C0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 3d8ae857d0a9e957e1a3312883efe9be27341361 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 20 Oct 2021 20:03:42 -0700 Subject: [PATCH 09/12] Allow RefOnly prefixed package versions to pass build boss. --- src/Tools/BuildBoss/ProjectCheckerUtil.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs index e571afede4a8b..0cb613b77a64f 100644 --- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs +++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs @@ -157,6 +157,7 @@ private IEnumerable GetAllowedPackageReferenceVersions(PackageReference var name = packageReference.Name.Replace(".", "").Replace("-", ""); yield return $"$({name}Version)"; yield return $"$({name}FixedVersion)"; + yield return $"$(RefOnly{name}Version)"; } } @@ -234,8 +235,8 @@ private bool CheckProjectReferencesComplete(TextWriter textWriter, IEnumerable

- /// Unit test projects should not reference each other. In order for unit tests to be run / F5 they must be - /// modeled as deployment projects. Having Unit Tests reference each other hurts that because it ends up + /// Unit test projects should not reference each other. In order for unit tests to be run / F5 they must be + /// modeled as deployment projects. Having Unit Tests reference each other hurts that because it ends up /// putting two copies of the unit test DLL into the UnitTest folder: /// /// 1. UnitTests\Current\TheUnitTest\TheUnitTest.dll @@ -244,7 +245,7 @@ private bool CheckProjectReferencesComplete(TextWriter textWriter, IEnumerable

Date: Wed, 20 Oct 2021 20:08:33 -0700 Subject: [PATCH 10/12] Update comment --- eng/Versions.props | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d432c9a6a961f..34cab5c4755b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,11 @@ 6.1.0.5902 1.2.6 $(RefOnlyMicrosoftBuildPackagesVersion) $(RefOnlyMicrosoftBuildPackagesVersion) From 76d7cf83cbd46c2863e0d064390c60af9d8a46fc Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 21 Oct 2021 13:50:18 -0700 Subject: [PATCH 11/12] Move source build condition to ItemGroups Co-authored-by: Eric Erhardt --- .../Microsoft.CodeAnalysis.CSharp.Features.csproj | 8 ++++---- .../Portable/Microsoft.CodeAnalysis.Features.csproj | 10 +++++----- .../Microsoft.CodeAnalysis.VisualBasic.Features.vbproj | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj index 9dac307c856fe..6e1cf3b12e7b1 100644 --- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj +++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj @@ -60,10 +60,10 @@ InternalUtilities\LambdaUtilities.cs - - - - + + + + diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj index 943443c55bc33..0cb129463eb3d 100644 --- a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +++ b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj @@ -131,11 +131,11 @@ - - - - - + + + + + diff --git a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj index d17a5d848023a..e5f1d2208aa4a 100644 --- a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj +++ b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj @@ -55,9 +55,9 @@ InternalUtilities\LambdaUtilities.vb - - - + + + From da9493329689f7cfa99525dfecfbe1e5c7df2d08 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 21 Oct 2021 14:20:24 -0700 Subject: [PATCH 12/12] Revert src/Dependencies/Directory.Build.props --- src/Dependencies/Directory.Build.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Dependencies/Directory.Build.props b/src/Dependencies/Directory.Build.props index 12d9ad073ecd8..6eef643958f56 100644 --- a/src/Dependencies/Directory.Build.props +++ b/src/Dependencies/Directory.Build.props @@ -1,3 +1,6 @@ + + true +