Switch to C++/WinRT -optimized (#1737)

build/FrameworkPackage/FrameworkPackageContents/AppxManifest.xml

@@ -22,7 +22,7 @@ $(ActivatableTypes)
           <Path>Microsoft.UI.Xaml.dll</Path>
           <!-- Special type that we manually list here which is not part of the Nuget dll distribution package. 
                This is our breadcrumb that we leave to be able to detect at runtime that we're using the framework package. -->
-          <ActivatableClass ActivatableClassId="Microsoft.UI.Xaml.Controls.Internal.FrameworkPackageDetector" ThreadingModel="both" />
+          <ActivatableClass ActivatableClassId="Microsoft.UI.Private.Controls.FrameworkPackageDetector" ThreadingModel="both" />
         </InProcessServer>
       </Extension>
     </Extensions>

dev/AnimatedVisualPlayer/AnimatedVisualPlayerAutomationPeer.cpp

@@ -1,9 +1,10 @@
-#include "pch.h"
+#include "pch.h"
 #include "common.h"
 #include "AnimatedVisualPlayerAutomationPeer.h"
-
 #include "AnimatedVisualPlayer.h"
 
+#include "AnimatedVisualPlayerAutomationPeer.properties.cpp"
+
 AnimatedVisualPlayerAutomationPeer::AnimatedVisualPlayerAutomationPeer(winrt::AnimatedVisualPlayer const& owner)
     : ReferenceTracker(owner)
 {

dev/AnimatedVisualPlayer/AnimatedVisualPlayerAutomationPeer.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "AnimatedVisualPlayer.h"
 
@@ -14,5 +14,3 @@ class AnimatedVisualPlayerAutomationPeer :
     hstring GetClassNameCore();
     winrt::AutomationControlType GetAutomationControlTypeCore();
 };
-
-CppWinRTActivatableClassWithBasicFactory(AnimatedVisualPlayerAutomationPeer)

dev/ColorPicker/ColorPickerSliderAutomationPeer.cpp

@@ -9,6 +9,8 @@
 #include "ResourceAccessor.h"
 #include "Utils.h"
 
+#include "ColorPickerSliderAutomationPeer.properties.cpp"
+
 ColorPickerSliderAutomationPeer::ColorPickerSliderAutomationPeer(winrt::ColorPickerSlider const& owner)
     : ReferenceTracker(owner)
 {
@@ -115,4 +117,4 @@ winrt::hstring ColorPickerSliderAutomationPeer::GetValueString(winrt::Color colo
             resourceStringWithoutName,
             value);
     }
-}
+}

dev/ColorPicker/ColorPickerSliderAutomationPeer.h

@@ -27,4 +27,3 @@ class ColorPickerSliderAutomationPeer :
     winrt::hstring GetValueString(winrt::Color color, int value);
 };
 
-CppWinRTActivatableClassWithBasicFactory(ColorPickerSliderAutomationPeer)

dev/ColorPicker/ColorSpectrumAutomationPeer.cpp

@@ -8,6 +8,8 @@
 #include "ResourceAccessor.h"
 #include "Utils.h"
 
+#include "ColorSpectrumAutomationPeer.properties.cpp"
+
 ColorSpectrumAutomationPeer::ColorSpectrumAutomationPeer(winrt::ColorSpectrum const& owner) :
     ReferenceTracker(owner)
 {
@@ -124,4 +126,4 @@ winrt::hstring ColorSpectrumAutomationPeer::GetValueString(winrt::Color color, w
             ResourceAccessor::GetLocalizedStringResource(SR_ValueStringColorSpectrumWithoutColorName),
             hue, saturation, value);
     }
-}
+}

dev/ColorPicker/ColorSpectrumAutomationPeer.h

@@ -33,5 +33,3 @@ class ColorSpectrumAutomationPeer :
 private:
     static winrt::hstring GetValueString(winrt::Color color, winrt::float4 hsvColor);
 };
-
-CppWinRTActivatableClassWithBasicFactory(ColorSpectrumAutomationPeer)

dev/CommandBarFlyout/CommandBarFlyout.cpp

@@ -8,6 +8,8 @@
 #include "Vector.h"
 #include "RuntimeProfiler.h"
 
+#include "CommandBarFlyout.properties.cpp"
+
 // Change to 'true' to turn on debugging outputs in Output window
 bool CommandBarFlyoutTrace::s_IsDebugOutputEnabled{ false };
 bool CommandBarFlyoutTrace::s_IsVerboseDebugOutputEnabled{ false };

dev/CommandBarFlyout/CommandBarFlyout.h

@@ -42,4 +42,3 @@ class CommandBarFlyout :
     bool m_isClosingAfterCloseAnimation{ false };
 }; 
 
-CppWinRTActivatableClassWithBasicFactory(CommandBarFlyout);

dev/CommandBarFlyout/TextCommandBarFlyout.cpp

@@ -8,6 +8,8 @@
 #include "ResourceAccessor.h"
 #include "RuntimeProfiler.h"
 
+#include "TextCommandBarFlyout.properties.cpp"
+
 TextCommandBarFlyout::TextCommandBarFlyout()
 {
     __RP_Marker_ClassById(RuntimeProfiler::ProfId_TextCommandBarFlyout);

dev/CommandBarFlyout/TextCommandBarFlyout.h

@@ -92,4 +92,3 @@ class TextCommandBarFlyout :
     bool m_isSettingToggleButtonState = false;
 };
 
-CppWinRTActivatableClassWithBasicFactory(TextCommandBarFlyout);

dev/DropDownButton/DropDownButton.cpp

@@ -8,6 +8,8 @@
 #include "RuntimeProfiler.h"
 #include "ResourceAccessor.h"
 
+#include "DropDownButton.properties.cpp"
+
 DropDownButton::DropDownButton()
 {
     __RP_Marker_ClassById(RuntimeProfiler::ProfId_DropDownButton);

dev/DropDownButton/DropDownButton.h

@@ -40,4 +40,3 @@ class DropDownButton :
     winrt::FlyoutBase::Closed_revoker m_flyoutClosedRevoker{};
 };
 
-CppWinRTActivatableClassWithBasicFactory(DropDownButton);

dev/DropDownButton/DropDownButtonAutomationPeer.cpp

@@ -8,6 +8,9 @@
 #include "DropDownButtonAutomationPeer.h"
 #include "Utils.h"
 
+
+#include "DropDownButtonAutomationPeer.properties.cpp"
+
 DropDownButtonAutomationPeer::DropDownButtonAutomationPeer(winrt::DropDownButton const& owner)
     : ReferenceTracker(owner)
 {

dev/DropDownButton/DropDownButtonAutomationPeer.h

@@ -25,5 +25,3 @@ class DropDownButtonAutomationPeer :
 private:
     com_ptr<DropDownButton> GetImpl();
 };
-
-CppWinRTActivatableClassWithBasicFactory(DropDownButtonAutomationPeer);

dev/Generated/AcrylicTestApi.properties.cpp

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
+#include "pch.h"
+#include "common.h"
+#include "AcrylicTestApi.h"
+
+namespace winrt::Microsoft::UI::Private::Media
+{
+    CppWinRTActivatableClassWithBasicFactory(AcrylicTestApi)
+}
+
+#include "AcrylicTestApi.g.cpp"
+
+

dev/Generated/AnimatedVisualPlayer.properties.cpp

@@ -6,7 +6,12 @@
 #include "common.h"
 #include "AnimatedVisualPlayer.h"
 
-CppWinRTActivatableClassWithDPFactory(AnimatedVisualPlayer)
+namespace winrt::Microsoft::UI::Xaml::Controls
+{
+    CppWinRTActivatableClassWithDPFactory(AnimatedVisualPlayer)
+}
+
+#include "AnimatedVisualPlayer.g.cpp"
 
 GlobalDependencyProperty AnimatedVisualPlayerProperties::s_AutoPlayProperty{ nullptr };
 GlobalDependencyProperty AnimatedVisualPlayerProperties::s_DiagnosticsProperty{ nullptr };

dev/Generated/AnimatedVisualPlayerAutomationPeer.properties.cpp

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
+#include "pch.h"
+#include "common.h"
+#include "AnimatedVisualPlayerAutomationPeer.h"
+
+namespace winrt::Microsoft::UI::Xaml::Automation::Peers
+{
+    CppWinRTActivatableClassWithBasicFactory(AnimatedVisualPlayerAutomationPeer)
+}
+
+#include "AnimatedVisualPlayerAutomationPeer.g.cpp"
+
+

dev/Generated/AutoSuggestBoxHelper.properties.cpp

@@ -6,7 +6,12 @@
 #include "common.h"
 #include "AutoSuggestBoxHelper.h"
 
-CppWinRTActivatableClassWithDPFactory(AutoSuggestBoxHelper)
+namespace winrt::Microsoft::UI::Xaml::Controls::Primitives
+{
+    CppWinRTActivatableClassWithDPFactory(AutoSuggestBoxHelper)
+}
+
+#include "AutoSuggestBoxHelper.g.cpp"
 
 GlobalDependencyProperty AutoSuggestBoxHelperProperties::s_KeepInteriorCornersSquareProperty{ nullptr };
 

dev/Generated/BitmapIconSource.properties.cpp

@@ -6,7 +6,12 @@
 #include "common.h"
 #include "BitmapIconSource.h"
 
-CppWinRTActivatableClassWithDPFactory(BitmapIconSource)
+namespace winrt::Microsoft::UI::Xaml::Controls
+{
+    CppWinRTActivatableClassWithDPFactory(BitmapIconSource)
+}
+
+#include "BitmapIconSource.g.cpp"
 
 GlobalDependencyProperty BitmapIconSourceProperties::s_ShowAsMonochromeProperty{ nullptr };
 GlobalDependencyProperty BitmapIconSourceProperties::s_UriSourceProperty{ nullptr };

dev/Generated/ButtonInteraction.properties.cpp

@@ -6,7 +6,12 @@
 #include "common.h"
 #include "ButtonInteraction.h"
 
-CppWinRTActivatableClassWithBasicFactory(ButtonInteraction)
+namespace winrt::Microsoft::UI::Private::Controls
+{
+    CppWinRTActivatableClassWithBasicFactory(ButtonInteraction)
+}
+
+#include "ButtonInteraction.g.cpp"
 
 
 ButtonInteractionProperties::ButtonInteractionProperties()

dev/Generated/ColorPicker.properties.cpp

@@ -6,7 +6,12 @@
 #include "common.h"
 #include "ColorPicker.h"
 
-CppWinRTActivatableClassWithDPFactory(ColorPicker)
+namespace winrt::Microsoft::UI::Xaml::Controls
+{
+    CppWinRTActivatableClassWithDPFactory(ColorPicker)
+}
+
+#include "ColorPicker.g.cpp"
 
 GlobalDependencyProperty ColorPickerProperties::s_ColorProperty{ nullptr };
 GlobalDependencyProperty ColorPickerProperties::s_ColorSpectrumComponentsProperty{ nullptr };

dev/Generated/ColorPickerSlider.properties.cpp

@@ -6,7 +6,12 @@
 #include "common.h"
 #include "ColorPickerSlider.h"
 
-CppWinRTActivatableClassWithDPFactory(ColorPickerSlider)
+namespace winrt::Microsoft::UI::Xaml::Controls::Primitives
+{
+    CppWinRTActivatableClassWithDPFactory(ColorPickerSlider)
+}
+
+#include "ColorPickerSlider.g.cpp"
 
 GlobalDependencyProperty ColorPickerSliderProperties::s_ColorChannelProperty{ nullptr };
 

dev/Generated/ColorPickerSliderAutomationPeer.properties.cpp

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
+#include "pch.h"
+#include "common.h"
+#include "ColorPickerSliderAutomationPeer.h"
+
+namespace winrt::Microsoft::UI::Xaml::Automation::Peers
+{
+    CppWinRTActivatableClassWithBasicFactory(ColorPickerSliderAutomationPeer)
+}
+
+#include "ColorPickerSliderAutomationPeer.g.cpp"
+
+

dev/Generated/ColorSpectrum.properties.cpp

@@ -6,7 +6,12 @@
 #include "common.h"
 #include "ColorSpectrum.h"
 
-CppWinRTActivatableClassWithDPFactory(ColorSpectrum)
+namespace winrt::Microsoft::UI::Xaml::Controls::Primitives
+{
+    CppWinRTActivatableClassWithDPFactory(ColorSpectrum)
+}
+
+#include "ColorSpectrum.g.cpp"
 
 GlobalDependencyProperty ColorSpectrumProperties::s_ColorProperty{ nullptr };
 GlobalDependencyProperty ColorSpectrumProperties::s_ComponentsProperty{ nullptr };

dev/Generated/ColorSpectrumAutomationPeer.properties.cpp

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
+#include "pch.h"
+#include "common.h"
+#include "ColorSpectrumAutomationPeer.h"
+
+namespace winrt::Microsoft::UI::Xaml::Automation::Peers
+{
+    CppWinRTActivatableClassWithBasicFactory(ColorSpectrumAutomationPeer)
+}
+
+#include "ColorSpectrumAutomationPeer.g.cpp"
+
+

dev/Generated/ColumnMajorUniformToLargestGridLayout.properties.cpp

@@ -6,7 +6,12 @@
 #include "common.h"
 #include "ColumnMajorUniformToLargestGridLayout.h"
 
-CppWinRTActivatableClassWithDPFactory(ColumnMajorUniformToLargestGridLayout)
+namespace winrt::Microsoft::UI::Xaml::Controls::Primitives
+{
+    CppWinRTActivatableClassWithDPFactory(ColumnMajorUniformToLargestGridLayout)
+}
+
+#include "ColumnMajorUniformToLargestGridLayout.g.cpp"
 
 GlobalDependencyProperty ColumnMajorUniformToLargestGridLayoutProperties::s_ColumnSpacingProperty{ nullptr };
 GlobalDependencyProperty ColumnMajorUniformToLargestGridLayoutProperties::s_MaxColumnsProperty{ nullptr };

dev/Generated/ComboBoxHelper.properties.cpp

@@ -6,7 +6,12 @@
 #include "common.h"
 #include "ComboBoxHelper.h"
 
-CppWinRTActivatableClassWithDPFactory(ComboBoxHelper)
+namespace winrt::Microsoft::UI::Xaml::Controls::Primitives
+{
+    CppWinRTActivatableClassWithDPFactory(ComboBoxHelper)
+}
+
+#include "ComboBoxHelper.g.cpp"
 
 GlobalDependencyProperty ComboBoxHelperProperties::s_KeepInteriorCornersSquareProperty{ nullptr };
 

dev/Generated/CommandBarFlyout.properties.cpp

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
+#include "pch.h"
+#include "common.h"
+#include "CommandBarFlyout.h"
+
+namespace winrt::Microsoft::UI::Xaml::Controls
+{
+    CppWinRTActivatableClassWithBasicFactory(CommandBarFlyout)
+}
+
+#include "CommandBarFlyout.g.cpp"
+
+

dev/Generated/CommandBarFlyoutCommandBar.properties.cpp

@@ -6,7 +6,12 @@
 #include "common.h"
 #include "CommandBarFlyoutCommandBar.h"
 
-CppWinRTActivatableClassWithDPFactory(CommandBarFlyoutCommandBar)
+namespace winrt::Microsoft::UI::Xaml::Controls::Primitives
+{
+    CppWinRTActivatableClassWithDPFactory(CommandBarFlyoutCommandBar)
+}
+
+#include "CommandBarFlyoutCommandBar.g.cpp"
 
 GlobalDependencyProperty CommandBarFlyoutCommandBarProperties::s_FlyoutTemplateSettingsProperty{ nullptr };
 

dev/Generated/CornerRadiusFilterConverter.properties.cpp

@@ -6,7 +6,12 @@
 #include "common.h"
 #include "CornerRadiusFilterConverter.h"
 
-CppWinRTActivatableClassWithDPFactory(CornerRadiusFilterConverter)
+namespace winrt::Microsoft::UI::Xaml::Controls::Primitives
+{
+    CppWinRTActivatableClassWithDPFactory(CornerRadiusFilterConverter)
+}
+
+#include "CornerRadiusFilterConverter.g.cpp"
 
 GlobalDependencyProperty CornerRadiusFilterConverterProperties::s_FilterProperty{ nullptr };
 GlobalDependencyProperty CornerRadiusFilterConverterProperties::s_ScaleProperty{ nullptr };

dev/Generated/CornerRadiusToThicknessConverter.properties.cpp

@@ -6,7 +6,12 @@
 #include "common.h"
 #include "CornerRadiusToThicknessConverter.h"
 
-CppWinRTActivatableClassWithDPFactory(CornerRadiusToThicknessConverter)
+namespace winrt::Microsoft::UI::Xaml::Controls::Primitives
+{
+    CppWinRTActivatableClassWithDPFactory(CornerRadiusToThicknessConverter)
+}
+
+#include "CornerRadiusToThicknessConverter.g.cpp"
 
 GlobalDependencyProperty CornerRadiusToThicknessConverterProperties::s_ConversionKindProperty{ nullptr };