Skip to content

Move DotNetBuild.props logic into repo #61485

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 3 commits into from
Apr 14, 2025
Merged

Move DotNetBuild.props logic into repo #61485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
245e974
Move DotNetBuild.props logic into repo
ViktorHofer Apr 14, 2025
f5f770c
Delete unnecessary settings
ViktorHofer Apr 14, 2025
b48f3d7
Add target to remove inner .globalconfig file
ViktorHofer Apr 14, 2025
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
2 changes: 2 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@

<IncludeSymbols>true</IncludeSymbols>
<DefaultNetFxTargetFramework>net462</DefaultNetFxTargetFramework>

<CrossgenOutput Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">false</CrossgenOutput>
</PropertyGroup>

<!-- Warnings and errors -->
Expand Down
48 changes: 0 additions & 48 deletions eng/DotNetBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<PropertyGroup>
<GitHubRepositoryName>aspnetcore</GitHubRepositoryName>
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
<SourceBuildTargetFrameworkFilter>netstandard2.0%3bnetstandard2.1%3bnetcoreapp2.1%3bnetcoreapp3.1%3bnet5.0%3bnet6.0%3bnet7.0%3bnet8.0%3bnet9.0%3bnet10.0</SourceBuildTargetFrameworkFilter>
Copy link
Member

@wtgodbe wtgodbe Apr 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember needing to set this when we updated the TFM to net10.0 to work around it being missing in Arcade or some such - is that workaround no longer needed?

Copy link
Member Author

@ViktorHofer ViktorHofer Apr 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can drive this centrally from the Arcade/VMR this time when we move to net11.0. It's currently not needed.

</PropertyGroup>

<!--
Expand Down Expand Up @@ -60,14 +59,6 @@
Condition="'$(OS)' == 'Windows_NT'" />
</Target>

<Target Name="CustomizeInnerBuildArgs"
BeforeTargets="GetSourceBuildCommandConfiguration">

<PropertyGroup>
<InnerBuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:CrossgenOutput=false</InnerBuildArgs>
</PropertyGroup>
</Target>

<Target Name="GetAspnetcoreCategorizedIntermediateNupkgContents"
BeforeTargets="GetCategorizedIntermediateNupkgContents">
<PropertyGroup>
Expand All @@ -84,43 +75,4 @@
</ItemGroup>
</Target>

<Target Name="RestoreNpmPackages"
Condition="'$(BuildNodeJS)' == 'true' and '$(DotNetBuildSourceOnly)' == 'true'"
BeforeTargets="RunInnerSourceBuildCommand">

<Message Text="Checking node version..." Importance="high" />
<Exec
Command="node --version"
WorkingDirectory="$(InnerSourceBuildRepoRoot)" />

<Message Text="Checking npm version..." Importance="high" />
<Exec
Command="npm --version"
WorkingDirectory="$(InnerSourceBuildRepoRoot)" />

<PropertyGroup>
<!-- Disable installing puppeteer browsers when running in source build -->
<_AdditionalEnvironmentVariable Condition="$(DotNetBuildSourceOnly) == 'true'">PUPPETEER_SKIP_DOWNLOAD=1</_AdditionalEnvironmentVariable>
</PropertyGroup>

<Exec
Command="npm ci"
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
EnvironmentVariables="$(_AdditionalEnvironmentVariable)" />

</Target>

<Target Name="BuildNpmFiles"
Condition="'$(BuildNodeJS)' == 'true' and '$(DotNetBuildSourceOnly)' == 'true'"
DependsOnTargets="RestoreNpmPackages"
BeforeTargets="RunInnerSourceBuildCommand">

<Message Text="Building Node JS files..." Importance="high" />

<Exec
Command="npm run build"
WorkingDirectory="$(InnerSourceBuildRepoRoot)" />

</Target>

</Project>
Loading