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

fix new project script and update feature area props file. #1843

Merged
merged 4 commits into from
Jan 15, 2020
Merged

fix new project script and update feature area props file. #1843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8733a2
fix new project script and update feature area props file.
ranjeshj Jan 14, 2020
cd01fd2
couple of fixes
ranjeshj Jan 14, 2020
d4d6bb7
minor refactor to target files so we the comments make sense after th…
ranjeshj Jan 14, 2020
36fda2c
Merge branch 'master' into user/ranjeshj/fixscript
ranjeshj Jan 14, 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
50 changes: 3 additions & 47 deletions FeatureAreas.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,24 @@
<?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">
<!-- Feature to include for inner loop build -->
<PropertyGroup Condition="$(SolutionName) == 'MUXControlsInnerLoop'">
<!-- Feature to include for inner loop build. Please update InnerLoopAreas.props for local workflow.
The features here are required in order to build the project. Ideally, these should be factored
along with other feature flags or the feature flag should be removed -->
<FeatureMaterialsEnabled>productOnly</FeatureMaterialsEnabled>
<FeatureLightsEnabled>productOnly</FeatureLightsEnabled>
<FeatureEffectsEnabled>productOnly</FeatureEffectsEnabled>
<FeatureResourceHelperEnabled>productOnly</FeatureResourceHelperEnabled>
<FeatureCollectionsEnabled>productOnly</FeatureCollectionsEnabled>
<FeatureColorPickerEnabled>false</FeatureColorPickerEnabled>
<FeatureTabViewEnabled>false</FeatureTabViewEnabled>
<FeatureAnimatedVisualPlayerEnabled>false</FeatureAnimatedVisualPlayerEnabled>
<FeatureAutoSuggestBoxEnabled>false</FeatureAutoSuggestBoxEnabled>
<FeatureCalendarDatePickerEnabled>false</FeatureCalendarDatePickerEnabled>
<FeatureCalendarViewEnabled>false</FeatureCalendarViewEnabled>
<FeatureCheckBoxEnabled>false</FeatureCheckBoxEnabled>
<FeatureCollectionsEnabled>productOnly</FeatureCollectionsEnabled>
<FeatureColorPickerEnabled>false</FeatureColorPickerEnabled>
<FeatureComboBoxEnabled>false</FeatureComboBoxEnabled>
<FeatureCommandBarFlyoutEnabled>false</FeatureCommandBarFlyoutEnabled>
<FeatureCommonStylesEnabled>productOnly</FeatureCommonStylesEnabled>
<FeatureContentDialogEnabled>false</FeatureContentDialogEnabled>
<FeatureDatePickerEnabled>false</FeatureDatePickerEnabled>
<FeatureDropDownButtonEnabled>productOnly</FeatureDropDownButtonEnabled>
<FeatureEffectsEnabled>productOnly</FeatureEffectsEnabled>
<FeatureFlipViewEnabled>false</FeatureFlipViewEnabled>
<FeatureIconSourceEnabled>productOnly</FeatureIconSourceEnabled>
<FeatureInteractionsEnabled>false</FeatureInteractionsEnabled>
<FeatureLayoutPanelEnabled>false</FeatureLayoutPanelEnabled>
<FeatureLightsEnabled>productOnly</FeatureLightsEnabled>
<FeatureMaterialsEnabled>productOnly</FeatureMaterialsEnabled>
<FeatureMenuBarEnabled>false</FeatureMenuBarEnabled>
<FeatureMenuFlyoutEnabled>false</FeatureMenuFlyoutEnabled>
<FeatureNavigationViewEnabled>false</FeatureNavigationViewEnabled>
<FeatureNumberBoxEnabled>false</FeatureNumberBoxEnabled>
<FeatureParallaxViewEnabled>false</FeatureParallaxViewEnabled>
<FeaturePersonPictureEnabled>false</FeaturePersonPictureEnabled>
<FeaturePivotEnabled>false</FeaturePivotEnabled>
<FeaturePullToRefreshEnabled>false</FeaturePullToRefreshEnabled>
<FeatureRadioButtonsEnabled>false</FeatureRadioButtonsEnabled>
<FeatureRadioMenuFlyoutItemEnabled>false</FeatureRadioMenuFlyoutItemEnabled>
<FeatureRatingControlEnabled>false</FeatureRatingControlEnabled>
<FeatureRepeaterEnabled>false</FeatureRepeaterEnabled>
<FeatureResourceHelperEnabled>productOnly</FeatureResourceHelperEnabled>
<FeatureScrollBarEnabled>false</FeatureScrollBarEnabled>
<FeatureScrollerEnabled>false</FeatureScrollerEnabled>
<FeatureScrollViewerEnabled>false</FeatureScrollViewerEnabled>
<FeatureSliderEnabled>false</FeatureSliderEnabled>
<FeatureSplitButtonEnabled>productOnly</FeatureSplitButtonEnabled>
<FeatureSplitViewEnabled>false</FeatureSplitViewEnabled>
<FeatureSwipeControlEnabled>false</FeatureSwipeControlEnabled>
<FeatureTabViewEnabled>false</FeatureTabViewEnabled>
<FeatureTeachingTipEnabled>false</FeatureTeachingTipEnabled>
<FeatureTimePickerEnabled>false</FeatureTimePickerEnabled>
<FeatureToolTipEnabled>false</FeatureToolTipEnabled>
<FeatureTreeViewEnabled>false</FeatureTreeViewEnabled>
<FeatureTwoPaneViewEnabled>false</FeatureTwoPaneViewEnabled>
<FeatureCommonStylesEnabled>productOnly</FeatureCommonStylesEnabled>
<FeatureContentDialogEnabled>false</FeatureContentDialogEnabled>
<FeatureCalendarViewEnabled>false</FeatureCalendarViewEnabled>
<FeatureSplitViewEnabled>false</FeatureSplitViewEnabled>
<FeatureProgressBarEnabled>false</FeatureProgressBarEnabled>
<FeatureProgressRingEnabled>false</FeatureProgressRingEnabled>
<FeatureRadialGradientBrushEnabled>false</FeatureRadialGradientBrushEnabled>
</PropertyGroup>
<!-- Import this after inner loop features are declared so that it overrides those properties -->
<Import Project="InnerLoopAreas.props" Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop'" />
Expand Down
13 changes: 8 additions & 5 deletions test/MUXControls.Test/MUXControls.Test.Shared.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)\..\..\FeatureAreas.props" />

<!-- These two depend on the type InteractionBase, which is behind the Velocity feature Feature_Xaml2018 in the OS repo.
We can't compile them without attaching the same feature annotation, and MIDL doesn't let us attach feature attributes
to non-public types. So for now we'll just exclude these from the OS repo. -->
<Import Project="..\..\dev\Interactions\ButtonInteraction\InteractionTests\ButtonInteraction_InteractionTests.projitems" Label="Shared" Condition="$(FeatureInteractionsEnabled) == 'true'" />
<Import Project="..\..\dev\Interactions\SliderInteraction\InteractionTests\SliderInteraction_InteractionTests.projitems" Label="Shared" Condition="$(FeatureInteractionsEnabled) == 'true'" />
<!-- -->

<Import Project="..\..\dev\CommonManaged\CommonManaged.projitems" Label="Shared" />
<Import Project="..\..\dev\ColorPicker\InteractionTests\ColorPicker_InteractionTests.projitems" Label="Shared" Condition="$(FeatureColorPickerEnabled) == 'true'" />
<Import Project="..\..\dev\RatingControl\InteractionTests\RatingControl_InteractionTests.projitems" Label="Shared" Condition="$(FeatureRatingControlEnabled) == 'true'" />
Expand Down Expand Up @@ -33,9 +41,4 @@
<Import Project="..\..\dev\TabView\InteractionTests\TabView_InteractionTests.projitems" Label="Shared" Condition="$(FeatureTabViewEnabled) == 'true'" />
<Import Project="..\..\dev\NumberBox\InteractionTests\NumberBox_InteractionTests.projitems" Label="Shared" Condition="$(FeatureNumberBoxEnabled) == 'true'" />
<Import Project="..\..\dev\RadialGradientBrush\InteractionTests\RadialGradientBrush_InteractionTests.projitems" Label="Shared" Condition="$(FeatureRadialGradientBrushEnabled) == 'true'" />
<!-- These two depend on the type InteractionBase, which is behind the Velocity feature Feature_Xaml2018 in the OS repo.
We can't compile them without attaching the same feature annotation, and MIDL doesn't let us attach feature attributes
to non-public types. So for now we'll just exclude these from the OS repo. -->
<Import Project="..\..\dev\Interactions\ButtonInteraction\InteractionTests\ButtonInteraction_InteractionTests.projitems" Label="Shared" Condition="$(FeatureInteractionsEnabled) == 'true'" />
<Import Project="..\..\dev\Interactions\SliderInteraction\InteractionTests\SliderInteraction_InteractionTests.projitems" Label="Shared" Condition="$(FeatureInteractionsEnabled) == 'true'" />
</Project>
19 changes: 11 additions & 8 deletions test/MUXControlsTestApp/MUXControlsTestApp.Shared.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
<?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="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!-- These depend on the type InteractionBase, which is behind the Velocity feature Feature_Xaml2018 in the OS repo.
We can't compile them without attaching the same feature annotation, and MIDL doesn't let us attach feature attributes
to non-public types. So for now we'll just exclude these from the OS repo. -->
<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\Interactions\ButtonInteraction\TestUI\ButtonInteraction_TestUI.projitems" Label="Shared" Condition="$(FeatureInteractionsEnabled) == 'true' And $(UseInternalSDK) == 'true'" />
<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\Interactions\SliderInteraction\TestUI\SliderInteraction_TestUI.projitems" Label="Shared" Condition="$(FeatureInteractionsEnabled) == 'true' And $(UseInternalSDK) == 'true'" />
<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\Interactions\ButtonInteraction\APITests\ButtonInteraction_APITests.projitems" Label="Shared" Condition="$(FeatureInteractionsEnabled) == 'true' And $(UseInternalSDK) == 'true'" />
<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\Interactions\SliderInteraction\APITests\SliderInteraction_APITests.projitems" Label="Shared" Condition="$(FeatureInteractionsEnabled) == 'true' And $(UseInternalSDK) == 'true'" />
<!-- -->

<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\CommonManaged\CommonManaged.projitems" Label="Shared" />
<Import Project="$(MSBuildThisFileDirectory)\..\TestAppUtils\TestAppUtils.projitems" Label="Shared" />
<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\ColorPicker\TestUI\ColorPicker_TestUI.projitems" Label="Shared" Condition="$(FeatureColorPickerEnabled) == 'true'" />
Expand Down Expand Up @@ -74,11 +84,4 @@
<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\ProgressBar\TestUI\ProgressBar_TestUI.projitems" Label="Shared" Condition="$(FeatureProgressBarEnabled) == 'true'" />
<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\ProgressRing\TestUI\ProgressRing_TestUI.projitems" Label="Shared" Condition="$(FeatureProgressRingEnabled) == 'true'" />
<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\RadialGradientBrush\TestUI\RadialGradientBrush_TestUI.projitems" Label="Shared" Condition="$(FeatureRadialGradientBrushEnabled) == 'true'" />
<!-- These depend on the type InteractionBase, which is behind the Velocity feature Feature_Xaml2018 in the OS repo.
We can't compile them without attaching the same feature annotation, and MIDL doesn't let us attach feature attributes
to non-public types. So for now we'll just exclude these from the OS repo. -->
<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\Interactions\ButtonInteraction\TestUI\ButtonInteraction_TestUI.projitems" Label="Shared" Condition="$(FeatureInteractionsEnabled) == 'true' And $(UseInternalSDK) == 'true'" />
<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\Interactions\SliderInteraction\TestUI\SliderInteraction_TestUI.projitems" Label="Shared" Condition="$(FeatureInteractionsEnabled) == 'true' And $(UseInternalSDK) == 'true'" />
<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\Interactions\ButtonInteraction\APITests\ButtonInteraction_APITests.projitems" Label="Shared" Condition="$(FeatureInteractionsEnabled) == 'true' And $(UseInternalSDK) == 'true'" />
<Import Project="$(MSBuildThisFileDirectory)\..\..\dev\Interactions\SliderInteraction\APITests\SliderInteraction_APITests.projitems" Label="Shared" Condition="$(FeatureInteractionsEnabled) == 'true' And $(UseInternalSDK) == 'true'" />
</Project>
</Project>
2 changes: 1 addition & 1 deletion tools/GenerateNewControlProject.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ $featureAreasProps = $muxControlsDir + "\FeatureAreas.props";
[xml]$xml = Get-Content $featureAreasProps
foreach ($group in $xml.Project.PropertyGroup)
{
if ($group.Attributes['Condition'].Value.Contains("SolutionName"))
if ($group.Attributes['Condition'].Value -ne $null -and $group.Attributes['Condition'].Value.Contains("(SolutionName) != 'MUXControlsInnerLoop'"))
{
$featureEnabledName = "Feature" + $controlName + "Enabled"
$enabled = $xml.CreateElement($featureEnabledName, $xml.Project.NamespaceURI);
Expand Down