Skip to content

Move DotNetBuild properties into the repo #11720

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 1 commit into from
Apr 11, 2025
Merged

Move DotNetBuild properties into the repo #11720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
<Description Condition="'$(Description)' == ''">$(TargetFileName)</Description>
</PropertyGroup>

<!-- Disable package validation as source build filters out target frameworks. -->
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
<EnablePackageValidation>false</EnablePackageValidation>
</PropertyGroup>

<ItemGroup Condition=" '$(IsPackable)' == 'true' ">
<None Include="$(ThirdPartyNotice)" Pack="true" PackagePath="notices" Visible="false" />
<None Include="README.md" Pack="true" PackagePath="\" />
Expand Down
9 changes: 5 additions & 4 deletions eng/Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
</PropertyGroup>

<ItemGroup>
<!-- Remove all sln files globbed by arcade so far and add only MSBuild.sln to the build.
Without this, arcade tries to build all three MSBuild solution at once, which leads to
locked file errors. -->
<!-- Remove all sln files globbed by arcade so far and add only MSBuild.sln to the build.
Without this, arcade tries to build all three MSBuild solution at once, which leads to
locked file errors. -->
<ProjectToBuild Remove="@(ProjectToBuild)" />
<ProjectToBuild Include="$(RepoRoot)MSBuild.sln" />
<ProjectToBuild Include="$(RepoRoot)MSBuild.sln" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
<ProjectToBuild Include="$(RepoRoot)MSBuild.SourceBuild.slnf" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
</ItemGroup>

</Project>
12 changes: 0 additions & 12 deletions eng/DotNetBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
<!-- When altering this file, include @dotnet/product-construction as a reviewer. -->

<Project>

<PropertyGroup>
<GitHubRepositoryName>msbuild</GitHubRepositoryName>
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
</PropertyGroup>

<Target Name="ConfigureInnerBuildArgs" BeforeTargets="GetSourceBuildCommandConfiguration"
Condition="'$(DotNetBuildSourceOnly)' == 'true'">
<PropertyGroup>
<!-- Filter down projects aggressively in source-only modes. -->
<InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)MSBuild.SourceBuild.slnf"</InnerBuildArgs>

<!-- Disable package validation as source build filters out target frameworks. -->
<InnerBuildArgs>$(InnerBuildArgs) /p:EnablePackageValidation=false</InnerBuildArgs>
</PropertyGroup>
</Target>

</Project>