Skip to content

Commit a7a1857

Browse files
authored
Move DotNetBuild.props logic into repo (#61485)
* Move DotNetBuild.props logic into repo Also remove the TargetFrameworkFilter which isn't necessary as defined centrally by Arcade with the same value. * Delete unnecessary settings * Add target to remove inner .globalconfig file
1 parent 3308ad7 commit a7a1857

File tree

2 files changed

+2
-48
lines changed

2 files changed

+2
-48
lines changed

Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@
107107

108108
<IncludeSymbols>true</IncludeSymbols>
109109
<DefaultNetFxTargetFramework>net462</DefaultNetFxTargetFramework>
110+
111+
<CrossgenOutput Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">false</CrossgenOutput>
110112
</PropertyGroup>
111113

112114
<!-- Warnings and errors -->

eng/DotNetBuild.props

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<PropertyGroup>
66
<GitHubRepositoryName>aspnetcore</GitHubRepositoryName>
77
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
8-
<SourceBuildTargetFrameworkFilter>netstandard2.0%3bnetstandard2.1%3bnetcoreapp2.1%3bnetcoreapp3.1%3bnet5.0%3bnet6.0%3bnet7.0%3bnet8.0%3bnet9.0%3bnet10.0</SourceBuildTargetFrameworkFilter>
98
</PropertyGroup>
109

1110
<!--
@@ -60,14 +59,6 @@
6059
Condition="'$(OS)' == 'Windows_NT'" />
6160
</Target>
6261

63-
<Target Name="CustomizeInnerBuildArgs"
64-
BeforeTargets="GetSourceBuildCommandConfiguration">
65-
66-
<PropertyGroup>
67-
<InnerBuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:CrossgenOutput=false</InnerBuildArgs>
68-
</PropertyGroup>
69-
</Target>
70-
7162
<Target Name="GetAspnetcoreCategorizedIntermediateNupkgContents"
7263
BeforeTargets="GetCategorizedIntermediateNupkgContents">
7364
<PropertyGroup>
@@ -84,43 +75,4 @@
8475
</ItemGroup>
8576
</Target>
8677

87-
<Target Name="RestoreNpmPackages"
88-
Condition="'$(BuildNodeJS)' == 'true' and '$(DotNetBuildSourceOnly)' == 'true'"
89-
BeforeTargets="RunInnerSourceBuildCommand">
90-
91-
<Message Text="Checking node version..." Importance="high" />
92-
<Exec
93-
Command="node --version"
94-
WorkingDirectory="$(InnerSourceBuildRepoRoot)" />
95-
96-
<Message Text="Checking npm version..." Importance="high" />
97-
<Exec
98-
Command="npm --version"
99-
WorkingDirectory="$(InnerSourceBuildRepoRoot)" />
100-
101-
<PropertyGroup>
102-
<!-- Disable installing puppeteer browsers when running in source build -->
103-
<_AdditionalEnvironmentVariable Condition="$(DotNetBuildSourceOnly) == 'true'">PUPPETEER_SKIP_DOWNLOAD=1</_AdditionalEnvironmentVariable>
104-
</PropertyGroup>
105-
106-
<Exec
107-
Command="npm ci"
108-
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
109-
EnvironmentVariables="$(_AdditionalEnvironmentVariable)" />
110-
111-
</Target>
112-
113-
<Target Name="BuildNpmFiles"
114-
Condition="'$(BuildNodeJS)' == 'true' and '$(DotNetBuildSourceOnly)' == 'true'"
115-
DependsOnTargets="RestoreNpmPackages"
116-
BeforeTargets="RunInnerSourceBuildCommand">
117-
118-
<Message Text="Building Node JS files..." Importance="high" />
119-
120-
<Exec
121-
Command="npm run build"
122-
WorkingDirectory="$(InnerSourceBuildRepoRoot)" />
123-
124-
</Target>
125-
12678
</Project>

0 commit comments

Comments
 (0)