Syncing content from committish release/1.5-experimental2

.vsconfig

@@ -13,11 +13,9 @@
     "Microsoft.VisualStudio.Component.CoreEditor",
     "Microsoft.VisualStudio.Workload.CoreEditor",
     "Microsoft.VisualStudio.Component.VC.CoreIde",
-    "Microsoft.VisualStudio.Component.Windows10SDK",
     "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
     "Microsoft.VisualStudio.Component.Windows11SDK.22000",
-    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
-    "Microsoft.VisualStudio.Component.Windows10SDK.18362",
+    "Microsoft.VisualStudio.Component.Windows11SDK.22621",
     "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
     "Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
     "Microsoft.VisualStudio.Component.VC.Tools.ARM64",

.vsconfig_buildtools

@@ -19,10 +19,7 @@
     "Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
     "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
     "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-    "Microsoft.VisualStudio.Component.Windows11SDK.22000",
-    "Microsoft.VisualStudio.Component.Windows10SDK",
-    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
-    "Microsoft.VisualStudio.Component.Windows10SDK.18362",
+    "Microsoft.VisualStudio.Component.Windows11SDK.22621",
     "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
     "Microsoft.VisualStudio.ComponentGroup.UWP.BuildTools",
     "Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools",

Directory.Build.targets

@@ -9,7 +9,7 @@
         </Link>
     </ItemDefinitionGroup>
     <Import Project="eng\sdkconfig.targets" />
-    <Import Project="eng\crtstl.targets" Condition="'$(UseLocalSDK)' != 'true'" />
+    <Import Project="eng\crtstl.targets" Condition="'$(UseLocalSDK)' != 'true' and '$(ResourceOnlyDll)' != 'true'" />
     <Import Project="eng\winuidetails.targets" />
     <Import Project="eng\binplace.targets"/>
     <Import Project="eng\externalbinaries.targets"/>
@@ -21,4 +21,5 @@
     <Import Project="eng\adhocapp.targets" Condition="'$(AdHocApp)'=='true'"/>
     <Import Project="eng\graph.targets" Condition="'$(IsGraphBuild)' == 'true'" />
     <Import Project="eng\projectcaching.targets" />
+    <Import Project="eng\lightup.targets" />
 </Project>

controls/CppWinRT.props

@@ -6,25 +6,25 @@
     <CppWinRTAddXamlMetaDataProviderIdl>false</CppWinRTAddXamlMetaDataProviderIdl>
     <CppWinRTPackage>true</CppWinRTPackage>
     <CppWinRTEnableComponentProjection>true</CppWinRTEnableComponentProjection>
-    <!-- In release builds our "experimental" features are under feature velocity as AlwaysDisabled. C++/WinRT assumes that
-         AlwaysDisabled features should be excluded by default, but we need them included for our component implementation.
-         Use -ignore_velocity to have the feature attributes be ignored by the tool.
-         -->
-    <CppWinRTParameters>-ignore_velocity</CppWinRTParameters>
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTHeapEnforcement>true</CppWinRTHeapEnforcement>
     <BuildPassReferences>true</BuildPassReferences>
     <!-- Reference the private MUX metadata -->
     <IncludePrivateMetadata>true</IncludePrivateMetadata>
-  </PropertyGroup>
+    <CppWinRTUsePrefixes>false</CppWinRTUsePrefixes>
+    <CppWinRTAddXamlMetaDataProviderIdl>false</CppWinRTAddXamlMetaDataProviderIdl>
 
-  <!-- C++/WinRT uses these files as inputs to their targets, but doesn't actually modify them if their content hasn't changed.
-       As a result, incremental builds fail, since we always detect that the unmerged WinMD file from IDL is more recent than
-       these files.  We'll touch these files to update their timestamps in order to ensure incremental building works properly. -->
-  <Target Name="UpdateCppWinRTResponseFileTimestamps" AfterTargets="CppWinRTMakeProjections;CppWinRTMergeProjectWinMDInputs">
-    <Touch Files="$(IntDir)cppwinrt_plat.rsp" Condition="Exists('$(IntDir)cppwinrt_plat.rsp')" />
-    <Touch Files="$(IntDir)cppwinrt_ref.rsp" Condition="Exists('$(IntDir)cppwinrt_ref.rsp')" />
-    <Touch Files="$(IntDir)cppwinrt_comp.rsp" Condition="Exists('$(IntDir)cppwinrt_comp.rsp')" />
-    <Touch Files="$(IntDir)mdmerge.rsp" Condition="Exists('$(IntDir)mdmerge.rsp')" />
-  </Target>
+    <!-- There's a C++/WinRT generation bug that includes all types that start with ScrollView*
+         despite the fact that only "ScrollView" exactly is the type we want from MUXC:
+
+             https://github.com/microsoft/cppwinrt/issues/835
+
+         This -exclude directive is needed until that issue is fixed. -->
+    <CppWinRTParameters>$(CppWinRTParameters) -exclude Microsoft.UI.Xaml.Controls.ScrollViewer</CppWinRTParameters>
+    <!-- In release builds our "experimental" features are under feature velocity as AlwaysDisabled. C++/WinRT assumes that
+         AlwaysDisabled features should be excluded by default, but we need them included for our component implementation.
+         Use -ignore_velocity to have the feature attributes be ignored by the tool.
+         -->
+    <CppWinRTParameters>$(CppWinRTParameters) -ignore_velocity</CppWinRTParameters>
+  </PropertyGroup>
 </Project>

controls/FeatureAreas.props

@@ -213,6 +213,12 @@
   <!-- Dependencies for AnnotatedScrollBar -->
   <PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureAnnotatedScrollBarEnabled) == 'true'">
   </PropertyGroup>
+  <!-- Dependencies for MapControl -->
+  <PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureMapControlEnabled) == 'true'">
+  </PropertyGroup>
+  <!-- Dependencies for SelectorBar -->
+  <PropertyGroup Condition="Exists('InnerLoopAreas.props') And $(SolutionName) == 'MUXControlsInnerLoop' And $(FeatureSelectorBarEnabled) == 'true'">
+  </PropertyGroup>
   <!-- Features to include for official build (should be all features) -->
   <PropertyGroup Condition="$(SolutionName) != 'MUXControlsInnerLoop'">
     <FeatureAnimatedVisualPlayerEnabled>true</FeatureAnimatedVisualPlayerEnabled>
@@ -272,10 +278,12 @@
     <FeatureWebView2Enabled>true</FeatureWebView2Enabled>
     <FeatureItemContainerEnabled>true</FeatureItemContainerEnabled>
     <FeatureAnnotatedScrollBarEnabled>true</FeatureAnnotatedScrollBarEnabled>
+    <FeatureMapControlEnabled>true</FeatureMapControlEnabled>
+    <FeatureSelectorBarEnabled>true</FeatureSelectorBarEnabled>
   </PropertyGroup>
   <PropertyGroup>
     <DefineConstants Condition="$(FeatureScrollPresenterEnabled) =='true'">$(DefineConstants);FEATURE_SCROLLPRESENTER_ENABLED</DefineConstants>
     <DefineConstants Condition="$(FeatureNavigationViewEnabled) =='true'">$(DefineConstants);FEATURE_NAVIGATIONVIEW_ENABLED</DefineConstants>
     <DefineConstants Condition="$(SolutionName) == 'MUXControlsInnerLoop'">$(DefineConstants);INNERLOOP_BUILD</DefineConstants>
   </PropertyGroup>
-</Project>
+</Project>

controls/MUXControls.sln

@@ -644,6 +644,15 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "AnnotatedScrollBar_APITests
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.WinUI", "..\src\projection\Microsoft.WinUI.csproj", "{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MapControl", "MapControl", "{7E6C90B5-DD3F-4EFE-978B-E0BD4E031655}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MapControl", "dev\MapControl\MapControl.vcxitems", "{7C60C2AE-6ABC-4762-A0EF-1F50CDD0BA1E}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MapControl_APITests", "dev\MapControl\APITests\MapControl_APITests.shproj", "{F350D71A-A980-4D63-A38A-8A2035DC4EF2}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MapControl_TestUI", "dev\MapControl\TestUI\MapControl_TestUI.shproj", "{8C2F2FA6-5639-4C01-84D0-06E037824689}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MapControl_InteractionTests", "dev\MapControl\InteractionTests\MapControl_InteractionTests.shproj", "{189F0B87-4CA1-4F77-8195-FC6DC714157A}"
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DesktopAcrylicBackdrop", "DesktopAcrylicBackdrop", "{0BEED10A-70BC-4103-8BC8-84D83A14EF75}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicaBackdrop", "MicaBackdrop", "{AAEE68EF-8CB5-40D2-8BC8-9A00FB0A1B6A}"
@@ -674,6 +683,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "private", "private", "{E3E0
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.WinUI", "..\src\projection\private\Microsoft.WinUI.csproj", "{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SelectorBar", "SelectorBar", "{BC59C0F9-07AC-44B2-BDF1-6533A1371BB2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SelectorBar", "dev\SelectorBar\SelectorBar.vcxitems", "{4C34195D-5F31-40A3-92AF-4CB8E5A762E0}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SelectorBar_InteractionTests", "dev\SelectorBar\InteractionTests\SelectorBar_InteractionTests.shproj", "{4BE74739-227A-4367-8DBA-AEC2769562C8}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SelectorBar_TestUI", "dev\SelectorBar\TestUI\SelectorBar_TestUI.shproj", "{1C950F53-542E-4CC4-9281-D9E36072A743}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SelectorBar_APITests", "dev\SelectorBar\APITests\SelectorBar_APITests.shproj", "{F778ACAE-150F-4D7D-83C1-5BF2E1ACB399}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_test|Any CPU = Debug_test|Any CPU
@@ -1686,11 +1705,21 @@ Global
 		{A1434CF9-0E2E-4F32-AC6B-F82816BFB936} = {6B593C05-B992-4B19-8FCE-2E078E72528A}
 		{A1553559-5786-4B44-AB9E-94AB95C86D4D} = {6B593C05-B992-4B19-8FCE-2E078E72528A}
 		{8FC55E63-37E7-4656-89BD-E3D78B31E2D4} = {6B593C05-B992-4B19-8FCE-2E078E72528A}
-		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96} = {3411D086-E07C-4C83-AEA7-930C51CB2518}
+		{10F93BC6-DE0F-4B8D-A4C0-7A807935FD96} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
+		{7E6C90B5-DD3F-4EFE-978B-E0BD4E031655} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
+		{7C60C2AE-6ABC-4762-A0EF-1F50CDD0BA1E} = {7E6C90B5-DD3F-4EFE-978B-E0BD4E031655}
+		{F350D71A-A980-4D63-A38A-8A2035DC4EF2} = {7E6C90B5-DD3F-4EFE-978B-E0BD4E031655}
+		{8C2F2FA6-5639-4C01-84D0-06E037824689} = {7E6C90B5-DD3F-4EFE-978B-E0BD4E031655}
+		{189F0B87-4CA1-4F77-8195-FC6DC714157A} = {7E6C90B5-DD3F-4EFE-978B-E0BD4E031655}
 		{0BEED10A-70BC-4103-8BC8-84D83A14EF75} = {414D2AE4-5B65-43E1-9C11-D94817835B3D}
 		{AAEE68EF-8CB5-40D2-8BC8-9A00FB0A1B6A} = {414D2AE4-5B65-43E1-9C11-D94817835B3D}
 		{E3E05AF9-A9DA-4777-B335-684664BC403E} = {3411D086-E07C-4C83-AEA7-930C51CB2518}
 		{DCDF77D5-B709-4052-B0D3-DD68BC9D3D5D} = {E3E05AF9-A9DA-4777-B335-684664BC403E}
+		{BC59C0F9-07AC-44B2-BDF1-6533A1371BB2} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
+		{4C34195D-5F31-40A3-92AF-4CB8E5A762E0} = {BC59C0F9-07AC-44B2-BDF1-6533A1371BB2}
+		{4BE74739-227A-4367-8DBA-AEC2769562C8} = {BC59C0F9-07AC-44B2-BDF1-6533A1371BB2}
+		{1C950F53-542E-4CC4-9281-D9E36072A743} = {BC59C0F9-07AC-44B2-BDF1-6533A1371BB2}
+		{F778ACAE-150F-4D7D-83C1-5BF2E1ACB399} = {BC59C0F9-07AC-44B2-BDF1-6533A1371BB2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D93836AB-52D3-4DE2-AE25-23F26F55ECED}
@@ -1714,10 +1743,12 @@ Global
 		dev\MenuBar\MenuBar_InteractionTests\MenuBar_InteractionTests.projitems*{1440a7b7-d3ca-4390-8c85-e1e9a7df8542}*SharedItemsImports = 13
 		dev\Effects\Microsoft.UI.Private.Composition.Effects.vcxitems*{1522a856-17ce-4178-a6b3-0692f90d7c55}*SharedItemsImports = 9
 		dev\CommandBarFlyout\InteractionTests\CommandBarFlyout_InteractionTests.projitems*{16f32f80-a8b6-44e0-9d99-0e1c2c8e0579}*SharedItemsImports = 13
+		dev\MapControl\InteractionTests\MapControl_InteractionTests.projitems*{189f0b87-4ca1-4f77-8195-fc6dc714157a}*SharedItemsImports = 13
 		dev\TeachingTip\APITests\TeachingTip_APITests.projitems*{18f1db69-7457-461c-9d19-7f42bffc0803}*SharedItemsImports = 13
 		dev\IconSource\IconSource.vcxitems*{19ffff77-4814-4ad6-acd7-42c6a50ab0d8}*SharedItemsImports = 9
 		dev\ProgressBar\TestUI\ProgressBar_TestUI.projitems*{1a5321f3-b837-4eb6-9547-37cc70088ea9}*SharedItemsImports = 13
 		dev\NavigationView\NavigationView.vcxitems*{1b8ef049-a38e-43e4-b88e-f1ebfcef07d2}*SharedItemsImports = 9
+		dev\SelectorBar\TestUI\SelectorBar_TestUI.projitems*{1c950f53-542e-4cc4-9281-d9e36072a743}*SharedItemsImports = 13
 		dev\TabView\TestUI\TabView_TestUI.projitems*{1d87aac7-1e11-40fc-90a7-b6ce1c4567ae}*SharedItemsImports = 13
 		dev\Materials\Reveal\InteractionTests\Reveal_InteractionTests\Reveal_InteractionTests.projitems*{1f2872e7-28c9-4c01-88ed-73c43ee1c9a4}*SharedItemsImports = 13
 		dev\InfoBadge\TestUI\InfoBadge_TestUI.projitems*{1f30cac6-7efb-4ce9-b119-64821c117cb9}*SharedItemsImports = 13
@@ -1762,6 +1793,8 @@ Global
 		dev\Materials\Reveal\RevealBrush.vcxitems*{4993a99d-57ae-4ee7-a3c1-0840ed127608}*SharedItemsImports = 9
 		dev\TeachingTip\TeachingTip.vcxitems*{499b8bf7-bca1-4c23-baa7-59e2c551be4b}*SharedItemsImports = 9
 		dev\ColorPicker\TestUI\ColorPicker_TestUI.projitems*{4a87b4f1-4b6f-435a-950e-b2bb32a16001}*SharedItemsImports = 13
+		dev\SelectorBar\InteractionTests\SelectorBar_InteractionTests.projitems*{4be74739-227a-4367-8dba-aec2769562c8}*SharedItemsImports = 13
+		dev\SelectorBar\SelectorBar.vcxitems*{4c34195d-5f31-40a3-92af-4cb8e5a762e0}*SharedItemsImports = 9
 		dev\AnimatedVisualPlayer\InteractionTests\AnimatedVisualPlayer_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\AnnotatedScrollBar\InteractionTests\AnnotatedScrollBar_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\AutoSuggestBox\InteractionTests\AutoSuggestBox_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
@@ -1778,6 +1811,8 @@ Global
 		dev\Interactions\SliderInteraction\InteractionTests\SliderInteraction_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\ItemContainer\InteractionTests\ItemContainer_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\ItemsView\InteractionTests\ItemsView_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
+		dev\MapControl\InteractionTests\MapControl_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
+		dev\SelectorBar\InteractionTests\SelectorBar_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\Materials\Acrylic\InteractionTests\AcrylicBrush_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\Materials\Reveal\InteractionTests\Reveal_InteractionTests\Reveal_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
 		dev\MenuBar\MenuBar_InteractionTests\MenuBar_InteractionTests.projitems*{4d8c5d1b-f982-44a1-b744-dd0e51651bf2}*SharedItemsImports = 5
@@ -1837,6 +1872,10 @@ Global
 		dev\ItemsView\APITests\ItemsView_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\ItemsView\TestUI\ItemsView_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\LayoutPanel\APITests\LayoutPanel_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
+		dev\MapControl\APITests\MapControl_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
+		dev\MapControl\TestUI\MapControl_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
+		dev\SelectorBar\APITests\SelectorBar_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
+		dev\SelectorBar\TestUI\SelectorBar_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\Materials\Acrylic\APITests\AcrylicBrush_ApiTests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\Materials\Acrylic\TestUI\AcrylicBrush_TestUI.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
 		dev\Materials\Reveal\APITests\Reveal_APITests.projitems*{4e6f8103-9e20-40dd-8fe0-1e73964bb800}*SharedItemsImports = 5
@@ -1916,6 +1955,7 @@ Global
 		dev\NumberBox\InteractionTests\NumberBox_InteractionTests.projitems*{773f7592-e7b3-42fc-a14a-e815afd6a0cb}*SharedItemsImports = 13
 		dev\PullToRefresh\ScrollViewerIRefreshInfoProviderAdapter\InteractionTests\ScrollViewerAdapter_InteractionTests.projitems*{79863454-1dbf-45bb-b3d3-420b8f5e8705}*SharedItemsImports = 13
 		dev\ItemsView\ItemsView.vcxitems*{7b5f5ca3-084c-58a0-97da-b8c488cc3e30}*SharedItemsImports = 9
+		dev\MapControl\MapControl.vcxitems*{7c60c2ae-6abc-4762-a0ef-1f50cdd0ba1e}*SharedItemsImports = 9
 		dev\PullToRefresh\ScrollViewerIRefreshInfoProviderAdapter\TestUI\ScrollViewerAdapter_TestUI.projitems*{7dc019ed-239f-4a84-b623-3e377db02a70}*SharedItemsImports = 13
 		dev\NavigationView\TestUI\NavigationView_TestUI.projitems*{7ee5e585-090a-44bf-a950-80636e242327}*SharedItemsImports = 13
 		dev\Common\Common.vcxitems*{80ad7f51-8997-47b9-bb41-078b81cff9b0}*SharedItemsImports = 9
@@ -1933,6 +1973,7 @@ Global
 		dev\RadialGradientBrush\RadialGradientBrush.vcxitems*{8b056b8f-c1ab-4a80-bd17-deace9897e6a}*SharedItemsImports = 9
 		dev\MenuBar\MenuBar.vcxitems*{8bc9ceb8-8b4a-11d0-8d11-00a0c91bc942}*SharedItemsImports = 9
 		dev\ProgressRing\InteractionTests\ProgressRing_InteractionTests.projitems*{8c2d60af-44bc-47da-8e44-d62e639bfc0a}*SharedItemsImports = 13
+		dev\MapControl\TestUI\MapControl_TestUI.projitems*{8c2f2fa6-5639-4c01-84d0-06e037824689}*SharedItemsImports = 13
 		dev\TwoPaneView\TwoPaneView.vcxitems*{8d0e4610-b51d-45c1-8b82-240bd2f73a92}*SharedItemsImports = 9
 		dev\Repeater\APITests\Repeater_APITests.projitems*{8d2da979-6313-49e2-8cf3-b568436d2944}*SharedItemsImports = 13
 		dev\Interactions\ButtonInteraction\APITests\ButtonInteraction_APITests.projitems*{8dc0ea14-d850-4c6e-8918-beeb89e877bd}*SharedItemsImports = 13
@@ -2016,10 +2057,12 @@ Global
 		dev\ImageIcon\InteractionTests\ImageIcon_InteractionTests.projitems*{f14fb632-e705-44bc-9415-75b539f483e1}*SharedItemsImports = 13
 		dev\AnimatedIcon\AnimatedIcon.vcxitems*{f1c8a5a1-b1b0-4095-8849-e550fcf2ebf6}*SharedItemsImports = 9
 		dev\PullToRefresh\RefreshContainer\InteractionTests\RefreshContainer_InteractionTests.projitems*{f30fe0d3-2e44-405e-8519-ec3ab098c41f}*SharedItemsImports = 13
+		dev\MapControl\APITests\MapControl_APITests.projitems*{f350d71a-a980-4d63-a38a-8a2035dc4ef2}*SharedItemsImports = 13
 		dev\InfoBar\InteractionTests\InfoBar_InteractionTests.projitems*{f470a64e-780e-45aa-abb7-73a8734e51d7}*SharedItemsImports = 13
 		dev\InfoBadge\InteractionTests\InfoBadge_InteractionTests.projitems*{f55ab8bf-f828-4a2e-bcdf-68f22aed35c3}*SharedItemsImports = 13
 		dev\SplitView\SplitView.vcxitems*{f567d0a2-9c61-4793-ae79-12da915ac11f}*SharedItemsImports = 9
 		dev\Materials\Acrylic\InteractionTests\AcrylicBrush_InteractionTests.projitems*{f601284a-00c1-49f9-99b3-70d45585f784}*SharedItemsImports = 13
+		dev\SelectorBar\APITests\SelectorBar_APITests.projitems*{f778acae-150f-4d7d-83c1-5bf2e1acb399}*SharedItemsImports = 13
 		dev\SplitButton\SplitButton.vcxitems*{faf114dd-af1f-4d9f-a511-354c19912aad}*SharedItemsImports = 9
 		test\TestAppUtils\TestAppUtils.projitems*{fb0d3053-3135-403f-b542-977f3b781673}*SharedItemsImports = 13
 		dev\CommonManaged\CommonManaged.projitems*{fcc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4