Skip to content

Commit dda13b3

Browse files
authored
Make ExperimentalFeatures overridable through props files (#14501)
* Make ExperimentalFeatures overridable through props files * Change files * Update CsWinRT packages.lock * Place exp. feature overrides in the correct order
1 parent b54b8b2 commit dda13b3

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Make ExperimentalFeatures overridable through props files",
4+
"packageName": "react-native-windows",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

vnext/ExperimentalFeatures.props

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<Project>
2-
<PropertyGroup>
3-
<RnwNewArch>false</RnwNewArch>
4-
<UseFabric>false</UseFabric>
5-
<UseWinUI3>false</UseWinUI3>
6-
<ReactExperimentalFeaturesSet>true</ReactExperimentalFeaturesSet>
7-
</PropertyGroup>
82
<PropertyGroup Condition="'$(SolutionName)'=='ReactWindows-Desktop'">
9-
<RnwNewArch>true</RnwNewArch>
10-
<UseFabric>true</UseFabric>
11-
<UseWinUI3>true</UseWinUI3>
12-
<UseExperimentalWinUI3>true</UseExperimentalWinUI3>
3+
<RnwNewArch Condition="'$(RnwNewArch)' == ''">true</RnwNewArch>
4+
<UseFabric Condition="'$(UseFabric)' == ''">true</UseFabric>
5+
<UseWinUI3 Condition="'$(UseWinUI3)' == ''">true</UseWinUI3>
6+
<UseExperimentalWinUI3 Condition="'$(UseExperimentalWinUI3)' == ''">true</UseExperimentalWinUI3>
137
</PropertyGroup>
148
<PropertyGroup Condition="'$(SolutionName)'=='Microsoft.ReactNative.NewArch'">
15-
<RnwNewArch>true</RnwNewArch>
16-
<UseFabric>true</UseFabric>
17-
<UseWinUI3>true</UseWinUI3>
9+
<RnwNewArch Condition="'$(RnwNewArch)' == ''">true</RnwNewArch>
10+
<UseFabric Condition="'$(UseFabric)' == ''">true</UseFabric>
11+
<UseWinUI3 Condition="'$(UseWinUI3)' == ''">true</UseWinUI3>
12+
</PropertyGroup>
13+
<!-- Declare the unconditional group last so it does not supersede solution-specific assignments -->
14+
<PropertyGroup>
15+
<RnwNewArch Condition="'$(RnwNewArch)' == ''">false</RnwNewArch>
16+
<UseFabric Condition="'$(UseFabric)' == ''">false</UseFabric>
17+
<UseWinUI3 Condition="'$(UseWinUI3)' == ''">false</UseWinUI3>
18+
<ReactExperimentalFeaturesSet Condition="'$(ReactExperimentalFeaturesSet)' == ''">true</ReactExperimentalFeaturesSet>
1819
</PropertyGroup>
1920
</Project>

0 commit comments

Comments
 (0)