From a4299145418757cca6e7df7ad05a5f97352a00b6 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Wed, 20 Oct 2021 19:13:20 +0000 Subject: [PATCH 1/4] build Microsoft.CodeAnalysis.Features* in roslyn --- ...ld-more-projects-during-source-build.patch | 46 +------------------ 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch index 4ff812d6e..321db7037 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch @@ -13,20 +13,14 @@ See https://github.com/dotnet/roslyn/pull/57165 --- eng/SourceBuild.props | 2 +- .../Core/Tests}/Directory.Build.props | 0 - src/Features/CSharp/Portable/Directory.Build.props | 6 ++++++ - src/Features/Core/Portable/Directory.Build.props | 6 ++++++ src/Features/LanguageServer/Directory.Build.props | 6 ++++++ src/Features/Lsif/Directory.Build.props | 6 ++++++ - src/Features/VisualBasic/Portable/Directory.Build.props | 6 ++++++ src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ .../Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj | 2 -- - 9 files changed, 37 insertions(+), 3 deletions(-) + 6 files changed, 19 insertions(+), 3 deletions(-) rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) - create mode 100644 src/Features/CSharp/Portable/Directory.Build.props - create mode 100644 src/Features/Core/Portable/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/Features/VisualBasic/Portable/Directory.Build.props create mode 100644 src/NuGet/VisualStudio/Directory.Build.props diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props @@ -46,30 +40,6 @@ diff --git a/src/Features/Directory.Build.props b/src/CodeStyle/Core/Tests/Direc similarity index 100% rename from src/Features/Directory.Build.props rename to src/CodeStyle/Core/Tests/Directory.Build.props -diff --git a/src/Features/CSharp/Portable/Directory.Build.props b/src/Features/CSharp/Portable/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Features/CSharp/Portable/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ -diff --git a/src/Features/Core/Portable/Directory.Build.props b/src/Features/Core/Portable/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Features/Core/Portable/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 00000000000..6eef643958f @@ -94,18 +64,6 @@ index 00000000000..6eef643958f + true + + -diff --git a/src/Features/VisualBasic/Portable/Directory.Build.props b/src/Features/VisualBasic/Portable/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /dev/null -+++ b/src/Features/VisualBasic/Portable/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 00000000000..6eef643958f @@ -119,7 +77,7 @@ index 00000000000..6eef643958f + + diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj -index 76d0dc36da1..a65fc35f1c3 100644 +index 3bd6d6398e3..2edf2da6d1a 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 @@ From 375383b5faf3723327e9db3819653da710ed137c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 21 Oct 2021 00:55:46 +0000 Subject: [PATCH 2/4] Refactor patches to build additional projects --- ...dd-Features-projects-to-SourceBuild.patch} | 240 +++++++++++++----- ...-powered-source-build-patches-55823.patch} | 0 ...ld-more-projects-during-source-build.patch | 91 ------- 3 files changed, 178 insertions(+), 153 deletions(-) rename src/SourceBuild/tarball/patches/roslyn/{0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch => 0001-Add-Features-projects-to-SourceBuild.patch} (55%) rename src/SourceBuild/tarball/patches/roslyn/{0001-Apply-arcade-powered-source-build-patches-55823.patch => 0002-Apply-arcade-powered-source-build-patches-55823.patch} (100%) delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch similarity index 55% rename from src/SourceBuild/tarball/patches/roslyn/0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch rename to src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch index 59c21bd29..77ea3ffe0 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch @@ -1,29 +1,49 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell <36081148+lbussell@users.noreply.github.com> -Date: Tue, 19 Oct 2021 16:57:47 +0000 -Subject: [PATCH] force Microsoft.Build to 16.5.0 with RefOnly prefix - -PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 - -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. +From: Joey Robichaud +Date: Wed, 20 Oct 2021 13:40:38 -0700 +Subject: [PATCH] Add Features projects to SourceBuild +For additional details see https://github.com/dotnet/roslyn/issues/57270 +Patch created from: https://github.com/dotnet/roslyn/pull/57277 --- - eng/Versions.props | 15 +++++++++------ - .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 4 ++-- - ...soft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- - .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- - ...sis.LanguageServerIndexFormat.Generator.csproj | 2 +- - src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 4 ++-- - src/Tools/IdeBenchmarks/IdeBenchmarks.csproj | 2 +- - .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 4 ++-- - ...crosoft.CodeAnalysis.Workspaces.MSBuild.csproj | 6 +++--- - ...deAnalysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- - 10 files changed, 28 insertions(+), 25 deletions(-) + eng/SourceBuild.props | 2 +- + eng/Versions.props | 13 ++++++++----- + .../Core/Tests}/Directory.Build.props | 0 + .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 6 +++--- + ...rosoft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- + .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- + src/Dependencies/Directory.Build.props | 3 --- + .../Microsoft.CodeAnalysis.CSharp.Features.csproj | 5 +++++ + .../Portable/Microsoft.CodeAnalysis.Features.csproj | 10 ++++++++-- + src/Features/LanguageServer/Directory.Build.props | 6 ++++++ + src/Features/Lsif/Directory.Build.props | 6 ++++++ + ...crosoft.CodeAnalysis.VisualBasic.Features.vbproj | 4 ++++ + src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ + src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 2 +- + .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 2 +- + ...Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj | 8 +++----- + ...CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- + 17 files changed, 60 insertions(+), 29 deletions(-) + rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) + 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 182f8a9cdb1..92e316a4744 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/eng/Versions.props b/eng/Versions.props -index e835ef04d52..0eb674c462e 100644 +index e835ef04d52..d432c9a6a96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ @@ -41,7 +61,7 @@ index e835ef04d52..0eb674c462e 100644 6.1.0.5902 - $(MicrosoftBuildPackagesVersion) - $(MicrosoftBuildPackagesVersion) -- 1.2.6 + 1.2.6 - $(MicrosoftBuildPackagesVersion) - $(MicrosoftBuildPackagesVersion) + + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) -+ 1.2.6 + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) 6.0.0-preview.0.15 16.10.23 + $(NoWarn);CA1819 +- ++ + + true + Microsoft.CodeAnalysis.Build.Tasks @@ -51,8 +51,8 @@ @@ -104,68 +136,152 @@ index 3644afb8c2f..ed4259ec61b 100644 -diff --git a/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj b/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj -index 80e7b11f9ea..8e1cb47fb98 100644 ---- a/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj -+++ b/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj -@@ -42,7 +42,7 @@ - - - -- -+ - - +diff --git a/src/Dependencies/Directory.Build.props b/src/Dependencies/Directory.Build.props +index 6eef643958f..12d9ad073ec 100644 +--- a/src/Dependencies/Directory.Build.props ++++ b/src/Dependencies/Directory.Build.props +@@ -1,6 +1,3 @@ + + +- +- true +- + +diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj +index a82a820316c..9dac307c856 100644 +--- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj ++++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj +@@ -60,6 +60,11 @@ + InternalUtilities\LambdaUtilities.cs + ++ ++ ++ ++ ++ + + + +diff --git a/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj b/src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj +index 1af351cc77b..943443c55bc 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,13 @@ + + + +- ++ ++ ++ ++ ++ ++ ++ + + + +diff --git a/src/Features/LanguageServer/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /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 00000000000..6eef643958f +--- /dev/null ++++ b/src/Features/Lsif/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ +diff --git a/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj b/src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj +index ac8c80c68fb..d17a5d84802 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 + + ++ ++ ++ ++ + + + +diff --git a/src/NuGet/VisualStudio/Directory.Build.props b/src/NuGet/VisualStudio/Directory.Build.props +new file mode 100644 +index 00000000000..6eef643958f +--- /dev/null ++++ b/src/NuGet/VisualStudio/Directory.Build.props +@@ -0,0 +1,6 @@ ++ ++ ++ ++ true ++ ++ diff --git a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj -index 6e1cbe46285..c0826b08af6 100644 +index 6e1cbe46285..8ca3cbb28f0 100644 --- a/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj +++ b/src/Tools/AnalyzerRunner/AnalyzerRunner.csproj -@@ -23,8 +23,8 @@ +@@ -23,7 +23,7 @@ - -- + -+ + - -diff --git a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj -index b6ab0e38e59..34e6a5f22fe 100644 ---- a/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj -+++ b/src/Tools/IdeBenchmarks/IdeBenchmarks.csproj -@@ -12,7 +12,7 @@ - - - -- -+ - - - diff --git a/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj b/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj -index 305f94cba17..7e156fc302d 100644 +index 305f94cba17..e2373f8a3d6 100644 --- a/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj +++ b/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj -@@ -29,9 +29,9 @@ +@@ -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 3bd6d6398e3..76d0dc36da1 100644 +index 3bd6d6398e3..a65fc35f1c3 100644 --- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj -@@ -24,9 +24,9 @@ +@@ -7,8 +7,6 @@ + true + netcoreapp3.1;net472 + $(DefineConstants);WORKSPACE_MSBUILD +- true +- + + true + +@@ -24,9 +22,9 @@ diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch b/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch similarity index 100% rename from src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch rename to src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch deleted file mode 100644 index 321db7037..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Thu, 14 Oct 2021 18:24:18 -0500 -Subject: [PATCH] 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. - -See https://github.com/dotnet/roslyn/pull/57165 ---- - eng/SourceBuild.props | 2 +- - .../Core/Tests}/Directory.Build.props | 0 - 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 -- - 6 files changed, 19 insertions(+), 3 deletions(-) - rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) - 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 182f8a9cdb1..92e316a4744 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/Features/Directory.Build.props b/src/CodeStyle/Core/Tests/Directory.Build.props -similarity index 100% -rename from src/Features/Directory.Build.props -rename to src/CodeStyle/Core/Tests/Directory.Build.props -diff --git a/src/Features/LanguageServer/Directory.Build.props b/src/Features/LanguageServer/Directory.Build.props -new file mode 100644 -index 00000000000..6eef643958f ---- /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 00000000000..6eef643958f ---- /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 00000000000..6eef643958f ---- /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 3bd6d6398e3..2edf2da6d1a 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 16d51bd2aaa643515adb3e8ca6741a347ca3fa19 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 21 Oct 2021 03:14:32 +0000 Subject: [PATCH 3/4] Patch edits --- ...Add-Features-projects-to-SourceBuild.patch | 104 ++++++++++++------ 1 file changed, 70 insertions(+), 34 deletions(-) diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch index 77ea3ffe0..e2f3e2782 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch @@ -3,27 +3,26 @@ From: Joey Robichaud Date: Wed, 20 Oct 2021 13:40:38 -0700 Subject: [PATCH] Add Features projects to SourceBuild -For additional details see https://github.com/dotnet/roslyn/issues/57270 -Patch created from: https://github.com/dotnet/roslyn/pull/57277 --- - eng/SourceBuild.props | 2 +- - eng/Versions.props | 13 ++++++++----- - .../Core/Tests}/Directory.Build.props | 0 - .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 6 +++--- - ...rosoft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- - .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- - src/Dependencies/Directory.Build.props | 3 --- - .../Microsoft.CodeAnalysis.CSharp.Features.csproj | 5 +++++ - .../Portable/Microsoft.CodeAnalysis.Features.csproj | 10 ++++++++-- - src/Features/LanguageServer/Directory.Build.props | 6 ++++++ - src/Features/Lsif/Directory.Build.props | 6 ++++++ - ...crosoft.CodeAnalysis.VisualBasic.Features.vbproj | 4 ++++ - src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ - src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 2 +- - .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 2 +- - ...Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj | 8 +++----- - ...CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- - 17 files changed, 60 insertions(+), 29 deletions(-) + eng/SourceBuild.props | 2 +- + eng/Versions.props | 17 ++++++++++++----- + .../Core/Tests}/Directory.Build.props | 0 + .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 6 +++--- + ...ft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- + .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- + ...soft.CodeAnalysis.Collections.Package.csproj | 1 + + ...icrosoft.CodeAnalysis.CSharp.Features.csproj | 5 +++++ + .../Microsoft.CodeAnalysis.Features.csproj | 10 ++++++++-- + .../LanguageServer/Directory.Build.props | 6 ++++++ + src/Features/Lsif/Directory.Build.props | 6 ++++++ + ...oft.CodeAnalysis.VisualBasic.Features.vbproj | 4 ++++ + src/NuGet/VisualStudio/Directory.Build.props | 6 ++++++ + src/Tools/AnalyzerRunner/AnalyzerRunner.csproj | 2 +- + src/Tools/BuildBoss/ProjectCheckerUtil.cs | 7 ++++--- + .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 2 +- + ...osoft.CodeAnalysis.Workspaces.MSBuild.csproj | 8 +++----- + ...Analysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- + 18 files changed, 69 insertions(+), 29 deletions(-) rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) create mode 100644 src/Features/LanguageServer/Directory.Build.props create mode 100644 src/Features/Lsif/Directory.Build.props @@ -43,7 +42,7 @@ index 182f8a9cdb1..92e316a4744 100644 diff --git a/eng/Versions.props b/eng/Versions.props -index e835ef04d52..d432c9a6a96 100644 +index e835ef04d52..34cab5c4755 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ @@ -55,7 +54,7 @@ index e835ef04d52..d432c9a6a96 100644 + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) @@ -136,17 +139,18 @@ index 3644afb8c2f..ed4259ec61b 100644 -diff --git a/src/Dependencies/Directory.Build.props b/src/Dependencies/Directory.Build.props -index 6eef643958f..12d9ad073ec 100644 ---- a/src/Dependencies/Directory.Build.props -+++ b/src/Dependencies/Directory.Build.props -@@ -1,6 +1,3 @@ - - -- -- true -- - +diff --git a/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj b/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj +index 22cab2f5f03..cfc79989175 100644 +--- a/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj ++++ b/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj +@@ -7,6 +7,7 @@ + none + false + true ++ false + + + true diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj index a82a820316c..9dac307c856 100644 --- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj @@ -255,6 +259,38 @@ index 6e1cbe46285..8ca3cbb28f0 100644 +diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs +index e571afede4a..0cb613b77a6 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: Thu, 21 Oct 2021 12:26:21 +0000 Subject: [PATCH 4/4] Update to not include CA.Collection package in source-build --- ...001-Add-Features-projects-to-SourceBuild.patch | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch index e2f3e2782..3a783fa63 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch @@ -10,7 +10,6 @@ Subject: [PATCH] Add Features projects to SourceBuild .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 6 +++--- ...ft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 6 +++--- .../Extension/Roslyn.Compilers.Extension.csproj | 6 +++--- - ...soft.CodeAnalysis.Collections.Package.csproj | 1 + ...icrosoft.CodeAnalysis.CSharp.Features.csproj | 5 +++++ .../Microsoft.CodeAnalysis.Features.csproj | 10 ++++++++-- .../LanguageServer/Directory.Build.props | 6 ++++++ @@ -22,7 +21,7 @@ Subject: [PATCH] Add Features projects to SourceBuild .../IdeCoreBenchmarks/IdeCoreBenchmarks.csproj | 2 +- ...osoft.CodeAnalysis.Workspaces.MSBuild.csproj | 8 +++----- ...Analysis.Workspaces.MSBuild.UnitTests.csproj | 4 ++-- - 18 files changed, 69 insertions(+), 29 deletions(-) + 17 files changed, 68 insertions(+), 29 deletions(-) rename src/{Features => CodeStyle/Core/Tests}/Directory.Build.props (100%) create mode 100644 src/Features/LanguageServer/Directory.Build.props create mode 100644 src/Features/Lsif/Directory.Build.props @@ -139,18 +138,6 @@ index 3644afb8c2f..ed4259ec61b 100644 -diff --git a/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj b/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj -index 22cab2f5f03..cfc79989175 100644 ---- a/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj -+++ b/src/Dependencies/Collections/Microsoft.CodeAnalysis.Collections.Package.csproj -@@ -7,6 +7,7 @@ - none - false - true -+ false - - - true diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj index a82a820316c..9dac307c856 100644 --- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj