Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove infobar from innerloop when it isn't explicitly included. #3512

Merged
merged 6 commits into from
Oct 29, 2020
Merged

Remove infobar from innerloop when it isn't explicitly included. #3512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba86a42
Remove infobar from innerloop when it isn't explicitly included.
StephenLPeters Oct 28, 2020
14648f3
Update InnerLoopAreas.props
StephenLPeters Oct 28, 2020
2c0e3ed
add condition
StephenLPeters Oct 28, 2020
77002be
Merge branch 'FixInfoBarProjectFiles' of https://github.com/microsoft…
StephenLPeters Oct 28, 2020
c35cf15
revert innerloop solution file
StephenLPeters Oct 28, 2020
1f51099
revert innerloop solution file
StephenLPeters Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions InnerLoopAreas.props
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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