Skip to content

Unify build entry-point between source-build and non-source-build #2585

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
Jun 20, 2025
Merged

Unify build entry-point between source-build and non-source-build #2585

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
1 change: 1 addition & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

<PropertyGroup Condition="'$(DisableArcade)' == '1' and $(MSBuildProjectName.EndsWith('.Tests'))">
<DefaultExcludesInProjectFolder>$(DefaultExcludesInProjectFolder);TestResults\**</DefaultExcludesInProjectFolder>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup Condition="'$(DisableArcade)' == '1' and $(MSBuildProjectName.EndsWith('.Tests'))">
Expand Down
10 changes: 0 additions & 10 deletions core.slnf
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions eng/Build.props
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions sourcebuild.slnf
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...ystem.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);IDE1006</NoWarn>
</PropertyGroup>

Expand Down
9 changes: 5 additions & 4 deletions src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<ProjectReference Include="..\..\System.CommandLine\System.CommandLine.csproj" />
</ItemGroup>

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
<IsTestUtilityProject>true</IsTestUtilityProject>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\System.CommandLine\System.CommandLine.csproj" />
</ItemGroup>

</Project>
9 changes: 0 additions & 9 deletions src/System.CommandLine.Suggest/Directory.Build.props
View file
Open in desktop

This file was deleted.

9 changes: 2 additions & 7 deletions src/System.CommandLine.Suggest/dotnet-suggest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,14 @@
<PackAsTool>true</PackAsTool>
<PackageId>dotnet-suggest</PackageId>
<ToolCommandName>dotnet-suggest</ToolCommandName>
<PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64;osx-arm64;linux-x64</PackAsToolShimRuntimeIdentifiers>
<PackAsToolShimRuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true'">win-x64;win-x86;osx-x64;osx-arm64;linux-x64</PackAsToolShimRuntimeIdentifiers>
<PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>

<DotnetSuggestBuildNumber>.1</DotnetSuggestBuildNumber>
<DotnetSuggestBuildNumber Condition="'$(VersionSuffixDateStamp)' != ''">.$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</DotnetSuggestBuildNumber>
<VersionPrefix>1.1$(DotnetSuggestBuildNumber)</VersionPrefix>
<PreReleaseVersionLabel />
<!-- Don't stabilize the version when building from the VMR as the package doesn't ship from there. -->
<VersionSuffix Condition="'$(DotNetBuild)' != 'true'" />
</PropertyGroup>

<PropertyGroup>
<!--No warning for the scripts, it is part of the content, not to execuate-->
<!-- No warning for the scripts, it is part of the content, not to execute -->
<NoWarn>$(NoWarn);NU5110;NU5111</NoWarn>
</PropertyGroup>

Expand Down
33 changes: 17 additions & 16 deletions src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
<!-- producing more detailed log output -->
<TrimmerSingleWarn>false</TrimmerSingleWarn>
<PublishAot>true</PublishAot>
<ControlFlowGuard>Guard</ControlFlowGuard>
</PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
<!-- producing more detailed log output -->
<TrimmerSingleWarn>false</TrimmerSingleWarn>
<PublishAot>true</PublishAot>
<ControlFlowGuard>Guard</ControlFlowGuard>
<IsTestUtilityProject>true</IsTestUtilityProject>
</PropertyGroup>

<PropertyGroup>
<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
</PropertyGroup>
<PropertyGroup>
<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
</PropertyGroup>

<ItemGroup>
<Reference Include="SystemCommandLineDll">
<HintPath>$(SystemCommandLineDllPath)</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Reference Include="SystemCommandLineDll">
<HintPath>$(SystemCommandLineDllPath)</HintPath>
</Reference>
</ItemGroup>

</Project>
37 changes: 19 additions & 18 deletions src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PublishTrimmed>true</PublishTrimmed>
<TrimmerSingleWarn>false</TrimmerSingleWarn>
</PropertyGroup>

<PropertyGroup>
<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
</PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PublishTrimmed>true</PublishTrimmed>
<TrimmerSingleWarn>false</TrimmerSingleWarn>
<IsTestUtilityProject>true</IsTestUtilityProject>
</PropertyGroup>

<ItemGroup>
<Reference Include="SystemCommandLineDll">
<HintPath>$(SystemCommandLineDllPath)</HintPath>
</Reference>
<TrimmerRootAssembly Include="System.CommandLine" />
</ItemGroup>
<PropertyGroup>
<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
</PropertyGroup>

<ItemGroup>
<Reference Include="SystemCommandLineDll">
<HintPath>$(SystemCommandLineDllPath)</HintPath>
</Reference>
<TrimmerRootAssembly Include="System.CommandLine" />
</ItemGroup>

</Project>