Skip to content

Commit 5c1f724

Browse files
authored
Add support for 9.0 VMR controls (#2488)
These have an effect when building from the VMR and allow us to remove the old control schema (DotNetBuildFrom*, ExcludeFromSourceBuild, etc.) in 10.0 arcade.
1 parent a140d1b commit 5c1f724

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

eng/SourceBuild.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<Target Name="ConfigureInnerBuildArg"
1111
BeforeTargets="GetSourceBuildCommandConfiguration"
12-
Condition="'$(ArcadeBuildFromSource)' == 'true'">
12+
Condition="'$(ArcadeBuildFromSource)' == 'true' or '$(DotNetBuild)' == 'true'">
1313
<PropertyGroup>
1414
<InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)sourcebuild.slnf"</InnerBuildArgs>
1515
</PropertyGroup>

src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFrameworks>$(TargetFrameworkForNETSDK);$(NetFrameworkCurrent)</TargetFrameworks>
55
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
66
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
7+
<ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
78
<Nullable>enable</Nullable>
89
</PropertyGroup>
910

src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj

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

1313
<PropertyGroup>
1414
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
15+
<ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
1516
</PropertyGroup>
1617

1718
<ItemGroup>

0 commit comments

Comments
 (0)