Skip to content

Commit 180e83c

Browse files
ViktorHoferViktorHofer
authored
Unify build entry-point between source-build and non-source-build (#2585)
Now that the repository content is reduced, SB's entry point can and should be consolidated.
1 parent 3225be9 commit 180e83c

File tree

10 files changed

+44
-80
lines changed

10 files changed

+44
-80
lines changed

‎Directory.Build.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

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

1112
<ItemGroup Condition="'$(DisableArcade)' == '1' and $(MSBuildProjectName.EndsWith('.Tests'))">

‎core.slnf

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎eng/Build.props

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎sourcebuild.slnf

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
5-
<IsPackable>false</IsPackable>
65
<NoWarn>$(NoWarn);IDE1006</NoWarn>
76
</PropertyGroup>
87

‎src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<ItemGroup>
4-
<ProjectReference Include="..\..\System.CommandLine\System.CommandLine.csproj" />
5-
</ItemGroup>
6-
73
<PropertyGroup>
84
<OutputType>Exe</OutputType>
95
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
106
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
7+
<IsTestUtilityProject>true</IsTestUtilityProject>
118
</PropertyGroup>
129

10+
<ItemGroup>
11+
<ProjectReference Include="..\..\System.CommandLine\System.CommandLine.csproj" />
12+
</ItemGroup>
13+
1314
</Project>

‎src/System.CommandLine.Suggest/Directory.Build.props

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/System.CommandLine.Suggest/dotnet-suggest.csproj

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,14 @@
77
<PackAsTool>true</PackAsTool>
88
<PackageId>dotnet-suggest</PackageId>
99
<ToolCommandName>dotnet-suggest</ToolCommandName>
10-
<PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64;osx-arm64;linux-x64</PackAsToolShimRuntimeIdentifiers>
10+
<PackAsToolShimRuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true'">win-x64;win-x86;osx-x64;osx-arm64;linux-x64</PackAsToolShimRuntimeIdentifiers>
1111
<PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
1212

1313
<DotnetSuggestBuildNumber>.1</DotnetSuggestBuildNumber>
1414
<DotnetSuggestBuildNumber Condition="'$(VersionSuffixDateStamp)' != ''">.$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</DotnetSuggestBuildNumber>
1515
<VersionPrefix>1.1$(DotnetSuggestBuildNumber)</VersionPrefix>
1616
<PreReleaseVersionLabel />
17-
<!-- Don't stabilize the version when building from the VMR as the package doesn't ship from there. -->
18-
<VersionSuffix Condition="'$(DotNetBuild)' != 'true'" />
19-
</PropertyGroup>
20-
21-
<PropertyGroup>
22-
<!--No warning for the scripts, it is part of the content, not to execuate-->
17+
<!-- No warning for the scripts, it is part of the content, not to execute -->
2318
<NoWarn>$(NoWarn);NU5110;NU5111</NoWarn>
2419
</PropertyGroup>
2520

‎src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
6-
<!-- producing more detailed log output -->
7-
<TrimmerSingleWarn>false</TrimmerSingleWarn>
8-
<PublishAot>true</PublishAot>
9-
<ControlFlowGuard>Guard</ControlFlowGuard>
10-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
6+
<!-- producing more detailed log output -->
7+
<TrimmerSingleWarn>false</TrimmerSingleWarn>
8+
<PublishAot>true</PublishAot>
9+
<ControlFlowGuard>Guard</ControlFlowGuard>
10+
<IsTestUtilityProject>true</IsTestUtilityProject>
11+
</PropertyGroup>
1112

12-
<PropertyGroup>
13-
<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
14-
</PropertyGroup>
13+
<PropertyGroup>
14+
<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
15+
</PropertyGroup>
1516

16-
<ItemGroup>
17-
<Reference Include="SystemCommandLineDll">
18-
<HintPath>$(SystemCommandLineDllPath)</HintPath>
19-
</Reference>
20-
</ItemGroup>
17+
<ItemGroup>
18+
<Reference Include="SystemCommandLineDll">
19+
<HintPath>$(SystemCommandLineDllPath)</HintPath>
20+
</Reference>
21+
</ItemGroup>
2122

2223
</Project>

‎src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
8-
<PublishTrimmed>true</PublishTrimmed>
9-
<TrimmerSingleWarn>false</TrimmerSingleWarn>
10-
</PropertyGroup>
112

12-
<PropertyGroup>
13-
<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
14-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
<PublishTrimmed>true</PublishTrimmed>
9+
<TrimmerSingleWarn>false</TrimmerSingleWarn>
10+
<IsTestUtilityProject>true</IsTestUtilityProject>
11+
</PropertyGroup>
1512

16-
<ItemGroup>
17-
<Reference Include="SystemCommandLineDll">
18-
<HintPath>$(SystemCommandLineDllPath)</HintPath>
19-
</Reference>
20-
<TrimmerRootAssembly Include="System.CommandLine" />
21-
</ItemGroup>
13+
<PropertyGroup>
14+
<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
15+
</PropertyGroup>
16+
17+
<ItemGroup>
18+
<Reference Include="SystemCommandLineDll">
19+
<HintPath>$(SystemCommandLineDllPath)</HintPath>
20+
</Reference>
21+
<TrimmerRootAssembly Include="System.CommandLine" />
22+
</ItemGroup>
2223

2324
</Project>

0 commit comments

Comments
 (0)