Skip to content

[ArPow] Add patches for building more roslyn projects #12397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichaelSimons merged 5 commits into from
Oct 20, 2021
Merged

[ArPow] Add patches for building more roslyn projects #12397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
407de8d
add patches for building more roslyn projects
lbussell Oct 15, 2021
3510475
add patch for forcing roslyn Microsoft.Build to 16.5.0
lbussell Oct 19, 2021
15aa160
add description to roslyn Microsoft.Build patch
lbussell Oct 19, 2021
83689bb
squash roslyn patches
lbussell Oct 19, 2021
fa57d10
don't build Microsoft.CodeAnalysis.Features* in source-build
lbussell Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 133 additions & 0 deletions src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
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/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(-)
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
index 182f8a9cdb1..92e316a4744 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -11,7 +11,7 @@
-->
<Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
<PropertyGroup>
- <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Compilers.sln"</InnerBuildArgs>
+ <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln"</InnerBuildArgs>
</PropertyGroup>
</Target>

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/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 @@
+<Project>
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+ <PropertyGroup>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+ </PropertyGroup>
+</Project>
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 @@
+<Project>
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+ <PropertyGroup>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+ </PropertyGroup>
+</Project>
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 @@
+<Project>
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+ <PropertyGroup>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+ </PropertyGroup>
+</Project>
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 @@
+<Project>
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+ <PropertyGroup>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+ </PropertyGroup>
+</Project>
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 @@
+<Project>
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+ <PropertyGroup>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+ </PropertyGroup>
+</Project>
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 @@
+<Project>
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+ <PropertyGroup>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+ </PropertyGroup>
+</Project>
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
--- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj
+++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj
@@ -7,8 +7,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<DefineConstants>$(DefineConstants);WORKSPACE_MSBUILD</DefineConstants>
- <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
-
<!-- NuGet -->
<IsPackable>true</IsPackable>
<PackageDescription>
Loading