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

Remove compile-time dependency from Workspace.MSBuild on Workspace.MSBuild.BuildHost #73393

Merged
merged 4 commits into from
May 8, 2024
Merged

Remove compile-time dependency from Workspace.MSBuild on Workspace.MSBuild.BuildHost #73393

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c261110
Remove compile-time dependency from Workspace.MSBuild on Workspace.MS…
tmat May 8, 2024
f7dc81b
Remove dependency on Microsoft.Extensions.Logging.Console from MSBuil…
tmat May 8, 2024
8b4fa54
Remove other dependencies on BuildHost
tmat May 8, 2024
d9610ad
Fix source build
tmat May 8, 2024
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
Prev Previous commit
Fix source build
  • Loading branch information
@tmat
tmat committed May 8, 2024
commit d9610ad722e29c7982f66dbbcf584f0baa73321a
2 changes: 1 addition & 1 deletion src/Workspaces/Core/MSBuild.BuildHost/BuildHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ private bool TryEnsureMSBuildLoaded(string projectOrSolutionFilePath)
#if NET472 || NET6_0 // If we're compiling against net472 or net6.0, we get our MemberNotNull from the workspaces assembly. It has it in the net6.0 case since we're consuming the netstandard2.0 version of Workspaces.
[workspaces::System.Diagnostics.CodeAnalysis.MemberNotNull(nameof(_buildManager))]
#else // If we're compiling against net7.0 or higher, then we're getting it staright from the framework.
[MemberNotNull(nameof(_buildManager))]
[System.Diagnostics.CodeAnalysis.MemberNotNull(nameof(_buildManager))]
#endif
[MethodImpl(MethodImplOptions.NoInlining)] // Do not inline this, since this creates MSBuild types which are being loaded by the caller
private void CreateBuildManager()
Expand Down
2 changes: 1 addition & 1 deletion ...kspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\Compilers\Core\Portable\InternalUtilities\CompilerFeatureRequiredAttribute.cs" Link="Utilities\CompilerFeatureRequiredAttribute.cs" />
<Compile Include="..\..\..\Compilers\Core\Portable\InternalUtilities\IsExternalInit.cs" Link="Utilities\IsExternalInit.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
<Compile Include="..\..\..\Compilers\Core\Portable\InternalUtilities\RequiredMemberAttribute.cs" Link="Utilities\RequiredMemberAttribute.cs" />
<Compile Include="..\..\..\Compilers\Core\Portable\InternalUtilities\IsExternalInit.cs" Link="Utilities\IsExternalInit.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
</ItemGroup>
<ItemGroup>
<PublicAPI Include="PublicAPI.Shipped.txt" />
Expand Down
Loading