Skip to content

Commit 7f1cbfd

Browse files
authored
Inline DotNetBuild.props settings into the repo (#48355)
1 parent 4c96873 commit 7f1cbfd

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

Diff for: Directory.Build.props

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<NoWarn>$(NoWarn);NU1701;NU1507;NU1202</NoWarn>
5454
<!-- do not enable analyzers on source build-->
5555
<EnforceCodeStyleInBuild Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</EnforceCodeStyleInBuild>
56+
<UseSharedCompilation Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</UseSharedCompilation>
5657
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
5758

5859
<DefineConstants Condition="'$(ContinuousIntegrationBuild)' == 'true'">$(DefineConstants);CI_BUILD</DefineConstants>

Diff for: eng/Build.props

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<Project>
22

3+
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
4+
<ProjectToBuild Include="$(RepoRoot)source-build.slnf" />
5+
</ItemGroup>
6+
37
<!-- For product build, build MSBuildExtensions and VSTemplateLocator in the second build pass on win-x64 as
48
they depend on assets from other verticals that are built in the first build pass. -->
59
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and

Diff for: eng/DotNetBuild.props

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

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

10-
<Target Name="ConfigureInnerBuildArg"
11-
BeforeTargets="GetSourceBuildCommandConfiguration"
12-
Condition="'$(DotNetBuildSourceOnly)' == 'true'">
13-
<PropertyGroup>
14-
<InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\source-build.slnf"</InnerBuildArgs>
15-
<InnerBuildArgs>$(InnerBuildArgs) /p:UseSharedCompilation=false</InnerBuildArgs>
16-
<InnerBuildArgs>$(InnerBuildArgs) /p:IncludeAdditionalSharedFrameworks=false</InnerBuildArgs>
17-
<InnerBuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:DISABLE_CROSSGEN=true</InnerBuildArgs>
18-
</PropertyGroup>
19-
</Target>
20-
219
</Project>

Diff for: src/Layout/redist/targets/Crossgen.targets

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
<PropertyGroup>
44
<!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR. -->
5-
<IsCrossgenSupported Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(TargetArchitecture)' != 's390x' AND '$(TargetArchitecture)' != 'ppc64le'">true</IsCrossgenSupported>
5+
<IsCrossgenSupported Condition="'$(DISABLE_CROSSGEN)' == '' and
6+
'$(TargetArchitecture)' != 's390x' and
7+
'$(TargetArchitecture)' != 'ppc64le' and
8+
'$(DotNetBuildUseMonoRuntime)' != 'true'">true</IsCrossgenSupported>
69

710
<Crossgen2Rid>$(HostOSName)-$(BuildArchitecture)</Crossgen2Rid>
811
<Crossgen2Rid Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(SharedFrameworkRid)</Crossgen2Rid>

0 commit comments

Comments
 (0)