Skip to content

Commit 46b5fa7

Browse files
authored
Move DotNetBuild properties into the repo (#11720)
1 parent b96560a commit 46b5fa7

File tree

3 files changed

+10
-16
lines changed

3 files changed

+10
-16
lines changed

Diff for: Directory.Build.targets

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
<Description Condition="'$(Description)' == ''">$(TargetFileName)</Description>
88
</PropertyGroup>
99

10+
<!-- Disable package validation as source build filters out target frameworks. -->
11+
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
12+
<EnablePackageValidation>false</EnablePackageValidation>
13+
</PropertyGroup>
14+
1015
<ItemGroup Condition=" '$(IsPackable)' == 'true' ">
1116
<None Include="$(ThirdPartyNotice)" Pack="true" PackagePath="notices" Visible="false" />
1217
<None Include="README.md" Pack="true" PackagePath="\" />

Diff for: eng/Build.props

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
</PropertyGroup>
77

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

1617
</Project>

Diff for: eng/DotNetBuild.props

-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
11
<!-- When altering this file, include @dotnet/product-construction as a reviewer. -->
2-
32
<Project>
43

54
<PropertyGroup>
65
<GitHubRepositoryName>msbuild</GitHubRepositoryName>
76
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
87
</PropertyGroup>
98

10-
<Target Name="ConfigureInnerBuildArgs" BeforeTargets="GetSourceBuildCommandConfiguration"
11-
Condition="'$(DotNetBuildSourceOnly)' == 'true'">
12-
<PropertyGroup>
13-
<!-- Filter down projects aggressively in source-only modes. -->
14-
<InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)MSBuild.SourceBuild.slnf"</InnerBuildArgs>
15-
16-
<!-- Disable package validation as source build filters out target frameworks. -->
17-
<InnerBuildArgs>$(InnerBuildArgs) /p:EnablePackageValidation=false</InnerBuildArgs>
18-
</PropertyGroup>
19-
</Target>
20-
219
</Project>

0 commit comments

Comments
 (0)