Skip to content

Commit 9a70cb4

Browse files
marcelwgnmarcelwgn
authored
Improve innerloop workflow (#2238)
* First bundle of dependency fixes * Second bundle of dependencies * Add last dependencies * Add support for interaction tests in innerloop * Cleanup * Improve handling of missing styles * Add innerloopareas prop file to innerloop solution
1 parent ec9e47d commit 9a70cb4

File tree

6 files changed

+220
-43
lines changed

6 files changed

+220
-43
lines changed

‎FeatureAreas.props

+179
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,184 @@
2222
</PropertyGroup>
2323
<!-- Import this after inner loop features are declared so that it overrides those properties -->
2424
<Import Project="InnerLoopAreas.props" Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop'" />
25+
<!--**** Dependencies for InnerLoop builds **** -->
26+
<!-- Dependencies for AnimatedVisualPlayer -->
27+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureAnimatedVisualPlayerEnabled) == 'true'">
28+
<!-- We need the MyControl type from SplitButton test -->
29+
<FeatureSplitButtonEnabled>true</FeatureSplitButtonEnabled>
30+
</PropertyGroup>
31+
<!-- Dependencies for AutoSuggestBox -->
32+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureAutoSuggestBoxEnabled) == 'true'">
33+
</PropertyGroup>
34+
<!-- Dependencies for CalendarDatePicker -->
35+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureCalendarDatePickerEnabled) == 'true'">
36+
</PropertyGroup>
37+
<!-- Dependencies for CalendarView -->
38+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureCalendarViewEnabled) == 'true'">
39+
</PropertyGroup>
40+
<!-- Dependencies for CheckBox -->
41+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureCheckBoxEnabled) == 'true'">
42+
</PropertyGroup>
43+
<!-- Dependencies for Collections -->
44+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureCollectionsEnabled) == 'true'">
45+
</PropertyGroup>
46+
<!-- Dependencies for ColorPicker -->
47+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureColorPickerEnabled) == 'true'">
48+
</PropertyGroup>
49+
<!-- Dependencies for ComboBox -->
50+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureComboBoxEnabled) == 'true'">
51+
</PropertyGroup>
52+
<!-- Dependencies for CommandBarFlyout -->
53+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureCommandBarFlyoutEnabled) == 'true'">
54+
</PropertyGroup>
55+
<!-- Dependencies for CommonStyles -->
56+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureCommonStylesEnabled) == 'true'">
57+
<!-- Compact sizing uses these controls for testing -->
58+
<FeatureNavigationViewEnabled>productOnly</FeatureNavigationViewEnabled>
59+
<FeatureTreeViewEnabled>productOnly</FeatureTreeViewEnabled>
60+
<FeatureRepeaterEnabled>productOnly</FeatureRepeaterEnabled>
61+
<FeatureColorPickerEnabled>productOnly</FeatureColorPickerEnabled>
62+
<FeatureMenuBarEnabled>productOnly</FeatureMenuBarEnabled>
63+
<FeatureScrollerEnabled>productOnly</FeatureScrollerEnabled>
64+
<FeatureScrollViewerEnabled>productOnly</FeatureScrollViewerEnabled>
65+
</PropertyGroup>
66+
<!-- Dependencies for ContentDialog -->
67+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureContentDialogEnabled) == 'true'">
68+
</PropertyGroup>
69+
<!-- Dependencies for DatePicker -->
70+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureDatePickerEnabled) == 'true'">
71+
</PropertyGroup>
72+
<!-- Dependencies for DropDownButton -->
73+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureDropDownButtonEnabled) == 'true'">
74+
<!-- We need the MyControl type from SplitButton test -->
75+
<FeatureSplitButtonEnabled>true</FeatureSplitButtonEnabled>
76+
</PropertyGroup>
77+
<!-- Dependencies for Effects -->
78+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureEffectsEnabled) == 'true'">
79+
</PropertyGroup>
80+
<!-- Dependencies for FlipView -->
81+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureFlipViewEnabled) == 'true'">
82+
</PropertyGroup>
83+
<!-- Dependencies for IconSource -->
84+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureIconSourceEnabled) == 'true'">
85+
</PropertyGroup>
86+
<!-- Dependencies for Interactions -->
87+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureInteractionsEnabled) == 'true'">
88+
</PropertyGroup>
89+
<!-- Dependencies for LayoutPanel -->
90+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureLayoutPanelEnabled) == 'true'">
91+
<FeatureRepeaterEnabled>productOnly</FeatureRepeaterEnabled>
92+
</PropertyGroup>
93+
<!-- Dependencies for Lights -->
94+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureLightsEnabled) == 'true'">
95+
</PropertyGroup>
96+
<!-- Dependencies for Materials -->
97+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureMaterialsEnabled) == 'true'">
98+
<FeatureColorPickerEnabled>productOnly</FeatureColorPickerEnabled>
99+
</PropertyGroup>
100+
<!-- Dependencies for MenuBar -->
101+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureMenuBarEnabled) == 'true'">
102+
</PropertyGroup>
103+
<!-- Dependencies for MenuFlyout -->
104+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureMenuFlyoutEnabled) == 'true'">
105+
</PropertyGroup>
106+
<!-- Dependencies for NavigationView -->
107+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureNavigationViewEnabled) == 'true'">
108+
<FeatureRepeaterEnabled>productOnly</FeatureRepeaterEnabled>
109+
</PropertyGroup>
110+
<!-- Dependencies for ParallaxView -->
111+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureParallaxViewEnabled) == 'true'">
112+
<FeatureScrollerEnabled>productOnly</FeatureScrollerEnabled>
113+
<FeatureScrollViewerEnabled>productOnly</FeatureScrollViewerEnabled>
114+
</PropertyGroup>
115+
<!-- Dependencies for PersonPicture -->
116+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeaturePersonPictureEnabled) == 'true'">
117+
</PropertyGroup>
118+
<!-- Dependencies for Pivot -->
119+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeaturePivotEnabled) == 'true'">
120+
</PropertyGroup>
121+
<!-- Dependencies for PullToRefresh -->
122+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeaturePullToRefreshEnabled) == 'true'">
123+
<FeatureTreeViewEnabled>productOnly</FeatureTreeViewEnabled>
124+
</PropertyGroup>
125+
<!-- Dependencies for RadioButtons -->
126+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureRadioButtonsEnabled) == 'true'">
127+
<FeatureRepeaterEnabled>productOnly</FeatureRepeaterEnabled>
128+
</PropertyGroup>
129+
<!-- Dependencies for RadioMenuFlyoutItem -->
130+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureRadioMenuFlyoutItemEnabled) == 'true'">
131+
</PropertyGroup>
132+
<!-- Dependencies for RatingControl -->
133+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureRatingControlEnabled) == 'true'">
134+
</PropertyGroup>
135+
<!-- Dependencies for Repeater -->
136+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureRepeaterEnabled) == 'true'">
137+
<FeatureLayoutPanelEnabled>true</FeatureLayoutPanelEnabled>
138+
<FeatureScrollBarEnabled>productOnly</FeatureScrollBarEnabled>
139+
<FeatureScrollerEnabled>productOnly</FeatureScrollerEnabled>
140+
<FeatureScrollViewerEnabled>productOnly</FeatureScrollViewerEnabled>
141+
</PropertyGroup>
142+
<!-- Dependencies for ResourceHelper -->
143+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureResourceHelperEnabled) == 'true'">
144+
<FeatureRepeaterEnabled>productOnly</FeatureRepeaterEnabled>
145+
</PropertyGroup>
146+
<!-- Dependencies for ScrollBar -->
147+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureScrollBarEnabled) == 'true'">
148+
</PropertyGroup>
149+
<!-- Dependencies for Scroller -->
150+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureScrollerEnabled) == 'true'">
151+
<FeatureScrollBarEnabled>productOnly</FeatureScrollBarEnabled>
152+
<FeatureScrollViewerEnabled>productOnly</FeatureScrollViewerEnabled>
153+
<FeatureRepeaterEnabled>true</FeatureRepeaterEnabled>
154+
<FeatureLayoutPanelEnabled>true</FeatureLayoutPanelEnabled>
155+
</PropertyGroup>
156+
<!-- Dependencies for ScrollViewer -->
157+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureScrollViewerEnabled) == 'true'">
158+
</PropertyGroup>
159+
<!-- Dependencies for Slider -->
160+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureSliderEnabled) == 'true'">
161+
</PropertyGroup>
162+
<!-- Dependencies for SplitButton -->
163+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureSplitButtonEnabled) == 'true'">
164+
</PropertyGroup>
165+
<!-- Dependencies for SplitView -->
166+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureSplitViewEnabled) == 'true'">
167+
</PropertyGroup>
168+
<!-- Dependencies for SwipeControl -->
169+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureSwipeControlEnabled) == 'true'">
170+
<FeatureColorPickerEnabled>productOnly</FeatureColorPickerEnabled>
171+
</PropertyGroup>
172+
<!-- Dependencies for TabView -->
173+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureTabViewEnabled) == 'true'">
174+
</PropertyGroup>
175+
<!-- Dependencies for TeachingTip -->
176+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureTeachingTipEnabled) == 'true'">
177+
</PropertyGroup>
178+
<!-- Dependencies for TimePicker -->
179+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureTimePickerEnabled) == 'true'">
180+
</PropertyGroup>
181+
<!-- Dependencies for ToolTip -->
182+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureToolTipEnabled) == 'true'">
183+
</PropertyGroup>
184+
<!-- Dependencies for TreeView -->
185+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureTreeViewEnabled) == 'true'">
186+
<FeatureRepeaterEnabled>productOnly</FeatureRepeaterEnabled>
187+
</PropertyGroup>
188+
<!-- Dependencies for TwoPaneView -->
189+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureTwoPaneViewEnabled) == 'true'">
190+
</PropertyGroup>
191+
<!-- Dependencies for ProgressBar -->
192+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureProgressBarEnabled) == 'true'">
193+
</PropertyGroup>
194+
<!-- Dependencies for ProgressRing -->
195+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureProgressRingEnabled) == 'true'">
196+
<FeatureProgressBarEnabled>true</FeatureProgressBarEnabled>
197+
<FeatureAnimatedVisualPlayerEnabled>productOnly</FeatureAnimatedVisualPlayerEnabled>
198+
</PropertyGroup>
199+
<!-- Dependencies for RadialGradientBrush -->
200+
<PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureRadialGradientBrushEnabled) == 'true'">
201+
</PropertyGroup>
202+
25203
<!-- Features to include for official build (should be all features) -->
26204
<PropertyGroup Condition="$(SolutionName) != 'MUXControlsInnerLoop'">
27205
<FeatureAnimatedVisualPlayerEnabled>true</FeatureAnimatedVisualPlayerEnabled>
@@ -79,6 +257,7 @@
79257
<FeatureRadialGradientBrushEnabled>true</FeatureRadialGradientBrushEnabled>
80258
</PropertyGroup>
81259
<PropertyGroup>
260+
<DefineConstants Condition="$(FeatureScrollerEnabled) =='true'">$(DefineConstants);FEATURE_SCROLLER_ENABLED</DefineConstants>
82261
<DefineConstants Condition="$(FeatureNavigationViewEnabled) =='true'">$(DefineConstants);FEATURE_NAVIGATIONVIEW_ENABLED</DefineConstants>
83262
<DefineConstants Condition="$(SolutionName) == 'MUXControlsInnerLoop'">$(DefineConstants);INNERLOOP_BUILD</DefineConstants>
84263
</PropertyGroup>

‎InnerLoopAreas.props

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<!-- Feature to include for inner loop build -->
55
<PropertyGroup Condition="$(SolutionName) == 'MUXControlsInnerLoop'">
6-
<FeatureRadialGradientBrushEnabled>true</FeatureRadialGradientBrushEnabled>
76
</PropertyGroup>
87
</Project>

0 commit comments

Comments
 (0)