From 407de8d99d24e00d38160de65c38e69ff5f32891 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Fri, 15 Oct 2021 20:56:31 +0000 Subject: [PATCH 1/5] add patches for building more roslyn projects --- ...ld-more-projects-during-source-build.patch | 125 ++++++++++++++++++ ...e-src-Dependencies-from-source-build.patch | 45 +++++++ 2 files changed, 170 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch create mode 100644 src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.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 new file mode 100644 index 000000000..4cd594d3d --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch @@ -0,0 +1,125 @@ +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. + +PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 +--- + 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 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/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 00000000000..6eef643958f +--- /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 00000000000..6eef643958f +--- /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 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 + diff --git a/src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch new file mode 100644 index 000000000..0d7e959a3 --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Fri, 15 Oct 2021 02:41:32 -0500 +Subject: [PATCH] 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. + +PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 +--- + .../{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 6eef643958f..00000000000 +--- 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 6eef643958f..00000000000 +--- a/src/Dependencies/PooledObjects/Directory.Build.props ++++ /dev/null +@@ -1,6 +0,0 @@ +- +- +- +- true +- +- From 35104750bce8e349a76beab8be28a0af724cd516 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Tue, 19 Oct 2021 17:25:33 +0000 Subject: [PATCH 2/5] add patch for forcing roslyn Microsoft.Build to 16.5.0 --- ....Build-to-16.5.0-with-RefOnly-prefix.patch | 189 ++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch b/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch new file mode 100644 index 000000000..d76584b50 --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch @@ -0,0 +1,189 @@ +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 + +--- + 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(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index e835ef04d52..0eb674c462e 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) ++ 1.2.6 ++ $(RefOnlyMicrosoftBuildPackagesVersion) ++ $(RefOnlyMicrosoftBuildPackagesVersion) + 6.0.0-preview.0.15 + 16.10.23 + + +- ++ + +- ++ + + + +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 +--- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj ++++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj +@@ -24,9 +24,9 @@ + + + +- +- +- ++ ++ ++ + + + +diff --git a/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj b/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj +index 3d0c6e993c0..06773c65e8d 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 15aa160465e212789084613a0530743581ae1e41 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Tue, 19 Oct 2021 21:22:47 +0000 Subject: [PATCH 3/5] add description to roslyn Microsoft.Build patch --- ...orce-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch b/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch index d76584b50..59c21bd29 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch @@ -3,6 +3,12 @@ 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. + --- eng/Versions.props | 15 +++++++++------ .../Microsoft.Build.Tasks.CodeAnalysis.csproj | 4 ++-- From 83689bbca813a7fbcda47877337a3c7a8dd9dfb0 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Tue, 19 Oct 2021 21:38:10 +0000 Subject: [PATCH 4/5] squash roslyn patches --- ...ld-more-projects-during-source-build.patch | 44 +++--------------- ...e-src-Dependencies-from-source-build.patch | 45 ------------------- ...Build-to-16.5.0-with-RefOnly-prefix.patch} | 0 3 files changed, 5 insertions(+), 84 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch rename src/SourceBuild/tarball/patches/roslyn/{0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch => 0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch} (100%) 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 4cd594d3d..fb40b3383 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,18 +13,12 @@ PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 --- 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 + 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 @@ -42,38 +36,10 @@ index 182f8a9cdb1..92e316a4744 100644 -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 +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/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 00000000000..6eef643958f ---- /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 00000000000..6eef643958f ---- /dev/null -+++ b/src/Dependencies/PooledObjects/Directory.Build.props -@@ -0,0 +1,6 @@ -+ -+ -+ -+ true -+ -+ +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 @@ -111,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 3bd6d6398e3..2edf2da6d1a 100644 +index 76d0dc36da1..a65fc35f1c3 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 @@ diff --git a/src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch deleted file mode 100644 index 0d7e959a3..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0005-Exclude-src-Dependencies-from-source-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Fri, 15 Oct 2021 02:41:32 -0500 -Subject: [PATCH] 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. - -PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 ---- - .../{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 6eef643958f..00000000000 ---- 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 6eef643958f..00000000000 ---- a/src/Dependencies/PooledObjects/Directory.Build.props -+++ /dev/null -@@ -1,6 +0,0 @@ -- -- -- -- true -- -- diff --git a/src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch b/src/SourceBuild/tarball/patches/roslyn/0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch similarity index 100% rename from src/SourceBuild/tarball/patches/roslyn/0006-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch rename to src/SourceBuild/tarball/patches/roslyn/0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch From fa57d106cc37c59a4fd498b616a73ba56534e0bc Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Wed, 20 Oct 2021 00:35:53 +0000 Subject: [PATCH 5/5] don't build Microsoft.CodeAnalysis.Features* in source-build --- ...ld-more-projects-during-source-build.patch | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 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 fb40b3383..4ff812d6e 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 @@ -9,18 +9,24 @@ projects and exclude a few projects that shouldn't be in source-build. The newly included projects are used by downstream repos. -PR for applying this patch: https://github.com/dotnet/roslyn/pull/57165 +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 -- - 6 files changed, 19 insertions(+), 3 deletions(-) + 9 files changed, 37 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 @@ -40,6 +46,30 @@ 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 @@ -64,6 +94,18 @@ 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