Skip to content

Commit

Permalink
Remove infobar from innerloop when it isn't explicitly included. (#3512)
Browse files Browse the repository at this point in the history
* Remove infobar from innerloop when it isn't explicitly included.

* Update InnerLoopAreas.props

Remove feature area from InnerLoopAreas

* add condition

* revert innerloop solution file

* revert innerloop solution file
  • Loading branch information
StephenLPeters committed Oct 29, 2020
1 parent 1c38850 commit 5e5c464
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions InnerLoopAreas.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Features to include for inner loop build for example:-->
<!-- <FeatureRepeaterEnabled>true</FeatureRepeaterEnabled> -->

<!-- Note that after modifying the file, you will need to close and reopen the solution -->
<!-- for changes to be picked up correctly by Visual Studio and MSBUILD -->
<PropertyGroup Condition="$(SolutionName) == 'MUXControlsInnerLoop'">
<!-- Features to include for inner loop build for example:-->
<!-- <FeatureRepeaterEnabled>true</FeatureRepeaterEnabled> -->

<!-- Note that after modifying the file, you will need to close and reopen the solution -->
<!-- for changes to be picked up correctly by Visual Studio and MSBUILD -->
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions MUXControlsInnerLoop.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29009.5
Expand Down Expand Up @@ -1142,4 +1142,4 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D93836AB-52D3-4DE2-AE25-23F26F55ECED}
EndGlobalSection
EndGlobal
EndGlobal
2 changes: 1 addition & 1 deletion dev/dll/Microsoft.UI.Xaml.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<Import Project="..\NumberBox\NumberBox.vcxitems" Label="Shared" Condition="$(FeatureNumberBoxEnabled) == 'true' Or $(FeatureNumberBoxEnabled) == 'productOnly'" />
<Import Project="..\RadialGradientBrush\RadialGradientBrush.vcxitems" Label="Shared" Condition="$(FeatureRadialGradientBrushEnabled) == 'true' Or $(FeatureRadialGradientBrushEnabled) == 'productOnly'" />
<Import Project="..\PagerControl\PagerControl.vcxitems" Label="Shared" Condition="$(FeaturePagerControlEnabled) == 'true' Or $(FeaturePagerControlEnabled) == 'productOnly'"/>
<Import Project="..\InfoBar\InfoBar.vcxitems" Label="Shared" />
<Import Project="..\InfoBar\InfoBar.vcxitems" Label="Shared" Condition="$(FeatureInfoBarEnabled) == 'true' Or $(FeatureInfoBarEnabled) == 'productOnly'"/>
</ImportGroup>
<ItemGroup>
<SharedPage Include="@(Page)" />
Expand Down

0 comments on commit 5e5c464

Please sign in to comment.