Skip to content
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

Jump to bottom

Add Features projects to SourceBuild #57277

Merged
merged 12 commits into from
Oct 22, 2021
Merged

Add Features projects to SourceBuild #57277

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
674f43e
Add Features projects to SourceBuild
JoeRobich Oct 20, 2021
32c506a
Fix Debugger.Contracts package condition
JoeRobich Oct 20, 2021
0569f3d
Refine SourceBuild Features exclusions
JoeRobich Oct 20, 2021
919237c
Build more projects during source-build
dagood Oct 14, 2021
8b1f3cb
Exclude src/Dependencies from source-build
dagood Oct 15, 2021
8fa8561
Remove SourceBuild project excludes
JoeRobich Oct 20, 2021
4c513d4
Force Microsoft.Build dependencies to 16.5.0 with RefOnly prefix
JoeRobich Oct 20, 2021
d6ceb3a
Revert changes to Compilers.sln
JoeRobich Oct 20, 2021
3d8ae85
Allow RefOnly prefixed package versions to pass build boss.
JoeRobich Oct 21, 2021
df8a913
Update comment
JoeRobich Oct 21, 2021
76d7cf8
Move source build condition to ItemGroups
JoeRobich Oct 21, 2021
da94933
Revert src/Dependencies/Directory.Build.props
JoeRobich Oct 21, 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
20 changes: 19 additions & 1 deletion Compilers.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
JoeRobich marked this conversation as resolved.
Show resolved Hide resolved
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'" />
JoeRobich marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="CSharpFeaturesResources.resx" GenerateSource="true" />
</ItemGroup>
Expand Down
10 changes: 8 additions & 2 deletions src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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'" />
JoeRobich marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>
<Import Project="..\..\..\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems" Label="Shared" />
<Import Project="..\..\..\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems" Label="Shared" />
Expand Down
3 changes: 0 additions & 3 deletions src/Features/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions src/Features/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<PackageDescription>
.NET Compiler Platform ("Roslyn") support for Language Server Protocol.
</PackageDescription>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
JoeRobich marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>

<ItemGroup Label="Project References">
Expand Down
1 change: 1 addition & 0 deletions ...eServer/ProtocolUnitTests/Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.CodeAnalysis.LanguageServer.UnitTests</RootNamespace>
<RoslynProjectType>UnitTest</RoslynProjectType>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup>

<ItemGroup Label="Project References">
Expand Down
1 change: 1 addition & 0 deletions ...Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
For more information about LSIF, see https://code.visualstudio.com/blogs/2019/02/19/lsif</PackageDescription>

<IsShipping>false</IsShipping>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup>

<Target Name="_GetFilesToPackage" DependsOnTargets="ResolveReferences">
Expand Down
1 change: 1 addition & 0 deletions ...GeneratorTest/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.UnitTests.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace></RootNamespace>
<RoslynProjectType>UnitTest</RoslynProjectType>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\EditorFeatures\TestUtilities\Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities.csproj" />
Expand Down
4 changes: 4 additions & 0 deletions src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'" />
JoeRobich marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="VBFeaturesResources.resx" GenerateSource="true" Namespace="Microsoft.CodeAnalysis.VisualBasic" />
</ItemGroup>
Expand Down