mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #12465 from lbussell/build-roslyn-ca-features

Browse source 
[ArPow] Re-enable building Microsoft.CodeAnalysis.Features* in roslyn source-build
This commit is contained in:
Michael Simons 2021-10-21 15:41:26 -05:00 • committed by GitHub
commit c6594de659
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 203 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

267
src/SourceBuild/tarball/patches/roslyn/0005-force-Microsoft.Build-to-16.5.0-with-RefOnly-prefix.patch → src/SourceBuild/tarball/patches/roslyn/0001-Add-Features-projects-to-SourceBuild.patch
View file

@ -1,29 +1,47 @@
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 <jorobich@microsoft.com>
Date: Wed, 20 Oct 2021 13:40:38 -0700
Subject: [PATCH] Add Features projects to SourceBuild
---
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 | 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 +++---
...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 ++--
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
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/eng/Versions.props b/eng/Versions.props
index e835ef04d52..0eb674c462e 100644
index e835ef04d52..34cab5c4755 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -38,7 +38,7 @@
@ -35,30 +53,46 @@ index e835ef04d52..0eb674c462e 100644
<!-- The version of Roslyn we build Source Generators against that are built in this
repository. This must be lower than MicrosoftNetCompilersToolsetVersion,
but not higher than our minimum dogfoodable Visual Studio version, or else
@@ -60,11 +60,14 @@
@@ -60,11 +60,18 @@
<FakeSignVersion>0.9.2</FakeSignVersion>
<HumanizerCoreVersion>2.2.0</HumanizerCoreVersion>
<ICSharpCodeDecompilerVersion>6.1.0.5902</ICSharpCodeDecompilerVersion>
- <MicrosoftBuildVersion>$(MicrosoftBuildPackagesVersion)</MicrosoftBuildVersion>
- <MicrosoftBuildFrameworkVersion>$(MicrosoftBuildPackagesVersion)</MicrosoftBuildFrameworkVersion>
- <MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
<MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
- <MicrosoftBuildRuntimeVersion>$(MicrosoftBuildPackagesVersion)</MicrosoftBuildRuntimeVersion>
- <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildPackagesVersion)</MicrosoftBuildTasksCoreVersion>
+ <!--
+ These are used as reference assemblies only, so they must have a "RefOnly" prefix to avoid assignment via PVP.
+ SourceBuild will requires that all dependencies also be source buildable. We are referencing a
+ version of MSBuild that is not SourceBuild compatible, which makes our build incompatible. Since we only
+ use these dependencies as reference assemblies, we can opt them out of this behavior by having their
+ version variable be prefixed with `RefOnly`. This will allow us to reference these libraries and remain
+ Source Build compatible.
+ -->
+ <RefOnlyMicrosoftBuildVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildVersion>
+ <RefOnlyMicrosoftBuildFrameworkVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildFrameworkVersion>
+ <RefOnlyMicrosoftBuildLocatorVersion>1.2.6</RefOnlyMicrosoftBuildLocatorVersion>
+ <RefOnlyMicrosoftBuildRuntimeVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildRuntimeVersion>
+ <RefOnlyMicrosoftBuildTasksCoreVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildTasksCoreVersion>
<NuGetVisualStudioContractsVersion>6.0.0-preview.0.15</NuGetVisualStudioContractsVersion>
<MicrosoftVisualStudioRpcContractsVersion>16.10.23</MicrosoftVisualStudioRpcContractsVersion>
<!--
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/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj
index 8c6bb122fb2..c00d19d4d29 100644
index 8c6bb122fb2..cc743d09032 100644
--- a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj
+++ b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj
@@ -11,7 +11,7 @@
<AssemblyVersion/>
<!-- CA1819 (Properties should not return arrays) disabled as it is very common across this project. -->
<NoWarn>$(NoWarn);CA1819</NoWarn>
-
+
<!-- NuGet -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.CodeAnalysis.Build.Tasks</PackageId>
@@ -51,8 +51,8 @@
<EmbeddedResource Update="ErrorString.resx" GenerateSource="true" />
</ItemGroup>
@ -104,68 +138,173 @@ index 3644afb8c2f..ed4259ec61b 100644
<PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers" Version="$(MicrosoftVisualStudioSDKAnalyzersVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="$(MicrosoftVisualStudioValidationVersion)" />
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 @@
</Target>
<ItemGroup>
- <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
+ <PackageReference Include="Microsoft.Build.Locator" Version="$(RefOnlyMicrosoftBuildLocatorVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="System.CommandLine.Experimental" Version="$(SystemCommandLineExperimentalVersion)" />
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 @@
<Link>InternalUtilities\LambdaUtilities.cs</Link>
</Compile>
</ItemGroup>
+ <ItemGroup>
+ <Compile Remove="EditAndContinue\**\*.cs" Condition="'$(DotNetBuildFromSource)' == 'true'" />
+ <Compile Include="EditAndContinue\BreakpointSpans.cs" Condition="'$(DotNetBuildFromSource)' == 'true'" />
+ <Compile Include="EditAndContinue\SyntaxUtilities.cs" Condition="'$(DotNetBuildFromSource)' == 'true'" />
+ </ItemGroup>
<ItemGroup>
<EmbeddedResource Update="CSharpFeaturesResources.resx" GenerateSource="true" />
</ItemGroup>
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 @@
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<ApplyNgenOptimization Condition="'$(TargetFramework)' == 'netstandard2.0'">full</ApplyNgenOptimization>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
+
<!-- NuGet -->
<IsPackable>true</IsPackable>
<PackageDescription>
@@ -129,7 +129,13 @@
<PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
<PackageReference Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.AnalyzerUtilities" Version="$(MicrosoftCodeAnalysisAnalyzerUtilitiesVersion)" />
- <PackageReference Include="Microsoft.VisualStudio.Debugger.Contracts" Version="$(MicrosoftVisualStudioDebuggerContractsVersion)" />
+ <PackageReference Include="Microsoft.VisualStudio.Debugger.Contracts" Version="$(MicrosoftVisualStudioDebuggerContractsVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Remove="EditAndContinue\**\*.cs" Condition="'$(DotNetBuildFromSource)' == 'true'" />
+ <Compile Include="EditAndContinue\EditAndContinueMethodDebugInfoReader.cs" Condition="'$(DotNetBuildFromSource)' == 'true'" />
+ <Compile Remove="ExternalAccess\UnitTesting\API\UnitTestingHotReloadService.cs" Condition="'$(DotNetBuildFromSource)' == 'true'" />
+ <Compile Remove="ExternalAccess\Watch\Api\WatchHotReloadService.cs" Condition="'$(DotNetBuildFromSource)' == 'true'" />
</ItemGroup>
<Import Project="..\..\..\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems" Label="Shared" />
<Import Project="..\..\..\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems" Label="Shared" />
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/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 @@
<Link>InternalUtilities\LambdaUtilities.vb</Link>
</Compile>
</ItemGroup>
+ <ItemGroup>
+ <Compile Remove="EditAndContinue\**\*.vb" Condition="'$(DotNetBuildFromSource)' == 'true'" />
+ <Compile Include="EditAndContinue\BreakpointSpans.vb" Condition="'$(DotNetBuildFromSource)' == 'true'" />
+ </ItemGroup>
<ItemGroup>
<EmbeddedResource Update="VBFeaturesResources.resx" GenerateSource="true" Namespace="Microsoft.CodeAnalysis.VisualBasic" />
</ItemGroup>
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/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 @@
<ItemGroup>
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="$(SQLitePCLRawbundle_greenVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)" />
- <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
- <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
+ <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
+ <PackageReference Include="Microsoft.Build.Locator" Version="$(RefOnlyMicrosoftBuildLocatorVersion)" />
<PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
<PackageReference Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionVersion)" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowVersion)" />
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 @@
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="$(BenchmarkDotNetDiagnosticsWindowsVersion)" />
- <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
+ <PackageReference Include="Microsoft.Build.Locator" Version="$(RefOnlyMicrosoftBuildLocatorVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="$(MicrosoftVisualStudioImagingInterop140DesignTimeVersion)" />
</ItemGroup>
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<string> 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<P
}
/// <summary>
- /// 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<P
/// TheOtherTests.dll
///
/// This is problematic as all of our tools do directory based searches for unit test DLLs. Hence they end up
- /// getting counted twice.
+ /// getting counted twice.
///
/// Consideration was given to fixing up all of the tools but it felt like fighting against the grain. Pretty
/// much every repo has this practice.
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 @@
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="$(BenchmarkDotNetDiagnosticsWindowsVersion)" />
<!-- This is to avoid a version conflict during build -->
<PackageReference Include="System.CodeDom" Version="$(SystemCodeDomVersion)" />
- <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
+ <PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)" />
- <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
+ <PackageReference Include="Microsoft.Build.Locator" Version="$(RefOnlyMicrosoftBuildLocatorVersion)" />
<PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
<PackageReference Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionVersion)" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowVersion)" />
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 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<DefineConstants>$(DefineConstants);WORKSPACE_MSBUILD</DefineConstants>
- <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
-
<!-- NuGet -->
<IsPackable>true</IsPackable>
<PackageDescription>
@@ -24,9 +22,9 @@
</Compile>
</ItemGroup>
<ItemGroup>

0
src/SourceBuild/tarball/patches/roslyn/0001-Apply-arcade-powered-source-build-patches-55823.patch → src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch
View file

133
src/SourceBuild/tarball/patches/roslyn/0004-Build-more-projects-during-source-build.patch
View file

@ -1,133 +0,0 @@
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>