Skip to content

Add a source package that can be used to connect to the roslyn build server #78986

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
merged 6 commits into from
Jul 2, 2025
Merged

Add a source package that can be used to connect to the roslyn build server #78986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0b46306
Add BuildClient package
jjonescz Jun 16, 2025
f0494fa
Allow sdk passing compiler hash
jjonescz Jun 16, 2025
0f82cda
Reuse in Replay
jjonescz Jun 17, 2025
3ff6ebb
Add a bit how we can and will break the APIs
jjonescz Jun 18, 2025
0558174
Move more files to the shared folder
jjonescz Jun 18, 2025
14fcc76
Use shared file list in build task
jjonescz Jun 23, 2025
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
1 change: 1 addition & 0 deletions Compilers.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"src\\ExpressionEvaluator\\Core\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.ExpressionCompiler.csproj",
"src\\ExpressionEvaluator\\VisualBasic\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.vbproj",
"src\\Interactive\\csi\\csi.csproj",
"src\\NuGet\\Microsoft.CodeAnalysis.BuildClient.Package\\Microsoft.CodeAnalysis.BuildClient.Package.csproj",
"src\\NuGet\\Microsoft.CodeAnalysis.Compilers.Package\\Microsoft.CodeAnalysis.Compilers.Package.csproj",
"src\\NuGet\\Microsoft.CodeAnalysis.Package\\Microsoft.CodeAnalysis.Package.csproj",
"src\\NuGet\\Microsoft.Net.Compilers.Toolset\\AnyCpu\\Microsoft.Net.Compilers.Toolset.Package.csproj",
Expand Down
7 changes: 7 additions & 0 deletions Roslyn.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Tasks.CodeA
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Tasks.CodeAnalysis.Sdk.UnitTests", "src\Compilers\Core\SdkTaskTests\Microsoft.Build.Tasks.CodeAnalysis.Sdk.UnitTests.csproj", "{5399BBCC-417F-C710-46DE-EB0C0074C34D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.BuildClient.Package", "src\NuGet\Microsoft.CodeAnalysis.BuildClient.Package\Microsoft.CodeAnalysis.BuildClient.Package.csproj", "{5E4F7448-B00B-4F5B-859F-6ED0354253D5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1807,6 +1809,10 @@ Global
{5399BBCC-417F-C710-46DE-EB0C0074C34D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5399BBCC-417F-C710-46DE-EB0C0074C34D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5399BBCC-417F-C710-46DE-EB0C0074C34D}.Release|Any CPU.Build.0 = Release|Any CPU
{5E4F7448-B00B-4F5B-859F-6ED0354253D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E4F7448-B00B-4F5B-859F-6ED0354253D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E4F7448-B00B-4F5B-859F-6ED0354253D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E4F7448-B00B-4F5B-859F-6ED0354253D5}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2150,6 +2156,7 @@ Global
{1B4AC233-B345-123F-E004-DAA28DE1CB08} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{91F9EAA4-ACA2-87EE-868E-6CC3B73D6A11} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{5399BBCC-417F-C710-46DE-EB0C0074C34D} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{5E4F7448-B00B-4F5B-859F-6ED0354253D5} = {C52D8057-43AF-40E6-A01B-6CDBB7301985}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {604E6B91-7BC0-4126-AE07-D4D2FEFC3D29}
Expand Down
1 change: 1 addition & 0 deletions eng/config/PublishData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"Microsoft.Net.Compilers.Toolset.Arm64": "arcade",
"Microsoft.Net.Compilers.Toolset.Framework": "arcade",
"Microsoft.NETCore.Compilers": "arcade",
"Microsoft.CodeAnalysis.BuildClient": "arcade",
"Microsoft.CodeAnalysis.Contracts": "arcade",
"Microsoft.CodeAnalysis.Debugging": "arcade",
"Microsoft.CodeAnalysis.PooledObjects": "arcade",
Expand Down
14 changes: 7 additions & 7 deletions src/Compilers/CSharp/csc/CscCommandLine.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
<Import_RootNamespace>CommandLine</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)..\..\Core\CommandLine\BuildProtocol.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Core\CommandLine\ConsoleUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Core\CommandLine\NativeMethods.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Core\CommandLine\CompilerServerLogger.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\RuntimeHostInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\NamedPipeUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\BuildClient.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\BuildProtocol.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\BuildServerConnection.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\ExitingTraceListener.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\CompilerServerLogger.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\ConsoleUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\Csc.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\ExitingTraceListener.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\NamedPipeUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\NativeMethods.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\RuntimeHostInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Program.cs" />

<None Include="$(MSBuildThisFileDirectory)App.config" Condition="'$(TargetFramework)' == 'net472'" />
Expand Down
13 changes: 3 additions & 10 deletions src/Compilers/Core/MSBuildTask/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,9 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\NamedPipeUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\BuildServerConnection.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\RuntimeHostInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\CommandLine\BuildProtocol.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\CommandLine\ConsoleUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\CommandLine\NativeMethods.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\CommandLine\CompilerServerLogger.cs" />
Copy link
Member

@jaredpar jaredpar Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we didn't have effectively the following instead of manually listig the files?

<Import Project="..\..\NuGet\Microsoft.CodeAnalysis.BuildClient.Package\Microsoft.CodeAnalysis.BuildClient.targets" />

Copy link
Member Author

@jjonescz jjonescz Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that can be done here. But for example in VBCSCompilerCommandLine.projitems which also shares some of these files, it can't be done since there would be conflicts (because it doesn't currently share all these files and some of the types it gets from the referenced projects, maybe that could be avoided as well, but it seems to be a deep rabbit hole).

<Compile Include="$(MSBuildThisFileDirectory)..\Portable\CommitHashAttribute.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\ConsoleUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\Portable\InternalUtilities\CommandLineUtilities.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\Portable\InternalUtilities\CompilerOptionParseUtilities.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\Portable\InternalUtilities\Debug.cs" Link="Debug.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\Portable\InternalUtilities\PlatformInformation.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\Portable\InternalUtilities\ReflectionUtilities.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\Portable\InternalUtilities\RoslynString.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\Portable\InternalUtilities\UnicodeCharacterUtilities.cs" />
Expand Down Expand Up @@ -68,4 +59,6 @@
<PackagePath>contentFiles\any\any</PackagePath>
</Content>
</ItemGroup>

<Import Project="$(MSBuildThisFileDirectory)..\..\..\NuGet\Microsoft.CodeAnalysis.BuildClient.Package\Microsoft.CodeAnalysis.BuildClient.targets" />
</Project>
2 changes: 2 additions & 0 deletions src/Compilers/Core/Portable/InternalUtilities/Debug.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#nullable enable

using System;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
Expand Down
2 changes: 2 additions & 0 deletions src/Compilers/Core/Portable/InternalUtilities/PlatformInformation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#nullable enable

using System;
using System.IO;
using System.Runtime.Versioning;
Expand Down
12 changes: 6 additions & 6 deletions src/Compilers/Server/VBCSCompiler/VBCSCompilerCommandLine.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
</PropertyGroup>
<ItemGroup>
<!-- Shared items -->
<Compile Include="$(MSBuildThisFileDirectory)..\..\Core\CommandLine\BuildProtocol.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Core\CommandLine\ConsoleUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Core\CommandLine\NativeMethods.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Core\CommandLine\CompilerServerLogger.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\RuntimeHostInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\NamedPipeUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\BuildClient.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\BuildProtocol.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\BuildServerConnection.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\CompilerServerLogger.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\ConsoleUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\ExitingTraceListener.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\NamedPipeUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\NativeMethods.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\RuntimeHostInfo.cs" />

<Compile Include="$(MSBuildThisFileDirectory)AnalyzerConsistencyChecker.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Assembly.cs" />
Expand Down
2 changes: 2 additions & 0 deletions ...mpilers/Core/CommandLine/BuildProtocol.cs → src/Compilers/Shared/BuildProtocol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#nullable enable

using Roslyn.Utilities;
using System;
using System.Collections.Generic;
Expand Down
13 changes: 5 additions & 8 deletions src/Compilers/Shared/BuildServerConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#nullable enable

using System;
using System.Collections.Generic;
using System.Diagnostics;
Expand Down Expand Up @@ -63,7 +65,8 @@ internal static BuildRequest CreateBuildRequest(
string workingDirectory,
string? tempDirectory,
string? keepAlive,
string? libDirectory)
string? libDirectory,
string? compilerHash = null)
{
Debug.Assert(workingDirectory is object);

Expand All @@ -72,7 +75,7 @@ internal static BuildRequest CreateBuildRequest(
arguments,
workingDirectory: workingDirectory,
tempDirectory: tempDirectory,
compilerHash: BuildProtocolConstants.GetCommitHash() ?? "",
compilerHash: compilerHash ?? BuildProtocolConstants.GetCommitHash() ?? "",
Copy link
Member

@chsienki chsienki Jun 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is it intended for the SDK to get the compiler hash?

Copy link
Member Author

@jjonescz jjonescz Jun 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similarly to how BuildProtocolConstants.GetCommitHash would do it (look for CommitHashAttribute on a compiler dll). BuildProtocolConstants.GetCommitHash itself didn't work because this is a source package so the assembly is not the C# assembly but now I realized I can probably make that utility work by changing the assembly it looks at and then remove this parameter.

Copy link
Member Author

@jjonescz jjonescz Jun 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now I realized I can probably make that utility work by changing the assembly it looks at and then remove this parameter.

I take this back, the utility is included as source in different projects and it's not possible to make it grab the CommitHash attribute from one assembly which all would reference, so probably best to keep as I have it now.

requestId: requestId,
keepAlive: keepAlive,
libDirectory: libDirectory);
Expand Down Expand Up @@ -178,12 +181,6 @@ internal static async Task<BuildResponse> RunServerBuildRequestAsync(
{
Debug.Assert(pipeName is object);

// early check for the build hash. If we can't find it something is wrong; no point even trying to go to the server
if (string.IsNullOrWhiteSpace(BuildProtocolConstants.GetCommitHash()))
{
return new IncorrectHashBuildResponse();
}

using var pipe = await tryConnectToServerAsync(pipeName, timeoutOverride, logger, tryCreateServerFunc, cancellationToken).ConfigureAwait(false);
if (pipe is null)
{
Expand Down
2 changes: 2 additions & 0 deletions .../Core/CommandLine/CompilerServerLogger.cs → src/Compilers/Shared/CompilerServerLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#nullable enable

using Roslyn.Utilities;
using System;
using System.Collections.Generic;
Expand Down
0 ...Compilers/Core/CommandLine/ConsoleUtil.cs → src/Compilers/Shared/ConsoleUtil.cs
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions src/Compilers/Shared/NamedPipeUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#nullable enable

using System;
using System.IO;
using System.IO.Pipes;
Expand Down
2 changes: 2 additions & 0 deletions ...mpilers/Core/CommandLine/NativeMethods.cs → src/Compilers/Shared/NativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#nullable enable

using System;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;
Expand Down
2 changes: 2 additions & 0 deletions src/Compilers/Shared/RuntimeHostInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#nullable enable

using System;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
Expand Down
12 changes: 6 additions & 6 deletions src/Compilers/VisualBasic/vbc/VbcCommandLine.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
<Import_RootNamespace>CommandLine</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)..\..\Core\CommandLine\BuildProtocol.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Core\CommandLine\ConsoleUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Core\CommandLine\NativeMethods.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Core\CommandLine\CompilerServerLogger.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\RuntimeHostInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\NamedPipeUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\BuildClient.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\BuildProtocol.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\BuildServerConnection.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\CompilerServerLogger.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\ConsoleUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\ExitingTraceListener.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\NamedPipeUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\NativeMethods.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\RuntimeHostInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\Vbc.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Program.cs" />

Expand Down
21 changes: 21 additions & 0 deletions ...rosoft.CodeAnalysis.BuildClient.Package/Microsoft.CodeAnalysis.BuildClient.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(NetRoslynSourceBuild)</TargetFrameworks>

<!-- NuGet -->
<IsPackable>true</IsPackable>
<IsSourcePackage>true</IsSourcePackage>
<PackageId>Microsoft.CodeAnalysis.BuildClient</PackageId>
<IncludeBuildOutput>false</IncludeBuildOutput>
<PackageDescription>
Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") build client API. For internal use only.
Copy link
Member

@jaredpar jaredpar Jun 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a bit how we can and will break the APIs here.

Relying on APIs from this package is explicitly not supported, they can and will break on a regular basis.
</PackageDescription>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)Microsoft.CodeAnalysis.BuildClient.targets" />

</Project>
13 changes: 13 additions & 0 deletions ...Get/Microsoft.CodeAnalysis.BuildClient.Package/Microsoft.CodeAnalysis.BuildClient.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)..\..\Compilers\Core\Portable\CommitHashAttribute.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Compilers\Core\Portable\InternalUtilities\Debug.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Compilers\Core\Portable\InternalUtilities\PlatformInformation.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Compilers\Shared\BuildProtocol.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Compilers\Shared\BuildServerConnection.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Compilers\Shared\CompilerServerLogger.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Compilers\Shared\NamedPipeUtil.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Compilers\Shared\NativeMethods.cs" />
<Compile Include="$(MSBuildThisFileDirectory)..\..\Compilers\Shared\RuntimeHostInfo.cs" />
Copy link
Member

@jaredpar jaredpar Jun 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's always bugged me how this logic is spread out among so many files in different directories. Did you consider as part of this pulling it into a singe isolation directory?

Copy link
Member Author

@jjonescz jjonescz Jun 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, I can move them all to the Shared directory.

Not sure if I should move those being shared from Compilers\Core\Portable as well - especially the InternalUtilities are referenced from many other projects and there is a lot of them (63 .cs files in InternalUtilities) and I'd expect we either move all or none of them. But now the Shared folder contains mostly build server protocol related files, but with InternalUtilities moved in this nice separation would be lost.

</ItemGroup>
</Project>
11 changes: 1 addition & 10 deletions src/Tools/Replay/Replay.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,6 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\Compilers\Core\CommandLine\BuildProtocol.cs" />
<Compile Include="..\..\Compilers\Core\CommandLine\CompilerServerLogger.cs" />
<Compile Include="..\..\Compilers\Core\CommandLine\NativeMethods.cs" />
<Compile Include="..\..\Compilers\Core\Portable\CommitHashAttribute.cs" />
<Compile Include="..\..\Compilers\Core\Portable\InternalUtilities\PlatformInformation.cs" />
<Compile Include="..\..\Compilers\Core\Portable\InternalUtilities\Debug.cs" />
<Compile Include="..\..\Compilers\Shared\BuildServerConnection.cs" />
<Compile Include="..\..\Compilers\Shared\NamedPipeUtil.cs" />
<Compile Include="..\..\Compilers\Shared\RuntimeHostInfo.cs" />

<ProjectReference Include="..\..\Compilers\CSharp\csc\AnyCpu\csc.csproj">
<Aliases>csc</Aliases>
</ProjectReference>
Expand All @@ -41,4 +31,5 @@
</ItemGroup>

<Import Project="..\..\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.projitems" Label="Shared" />
<Import Project="..\..\NuGet\Microsoft.CodeAnalysis.BuildClient.Package\Microsoft.CodeAnalysis.BuildClient.targets" />
</Project>