Remove SAL annotations and cleanup BUILD_WINDOWS

dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp

@@ -558,10 +558,10 @@ winrt::Size AnimatedVisualPlayer::ArrangeOverride(winrt::Size const& finalSize)
 }
 
 winrt::DependencyProperty InitializeDp(
-    _In_ wstring_view const& propertyNameString,
-    _In_ wstring_view const& propertyTypeNameString,
-    _In_opt_ const winrt::IInspectable& defaultValue,
-    _In_opt_ const winrt::PropertyChangedCallback& propertyChangedCallback = nullptr)
+    wstring_view const& propertyNameString,
+    wstring_view const& propertyTypeNameString,
+    winrt::IInspectable const& defaultValue,
+    winrt::PropertyChangedCallback const& propertyChangedCallback = nullptr)
 {
     // There are no attached properties.
     auto isAttached = false;

dev/AnimatedVisualPlayer/InteractionTests/AnimatedVisualPlayerTests.cs

@@ -18,19 +18,11 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
 #endif
 
-#if BUILD_WINDOWS
-using System.Windows.Automation;
-using MS.Internal.Mita.Foundation;
-using MS.Internal.Mita.Foundation.Controls;
-using MS.Internal.Mita.Foundation.Waiters;
-#else
 using Microsoft.Windows.Apps.Test.Automation;
 using Microsoft.Windows.Apps.Test.Foundation;
 using Microsoft.Windows.Apps.Test.Foundation.Controls;
 using Microsoft.Windows.Apps.Test.Foundation.Patterns;
 using Microsoft.Windows.Apps.Test.Foundation.Waiters;
-#endif
-
 
 // CatGates requires that test namespaces begin with "Windows.UI.Xaml.Tests",
 // so we need to make sure that our test namespace begins with that to ensure that we get picked up.

dev/ColorPicker/APITests/ColorPickerTests.cs

@@ -26,14 +26,12 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
 #endif
 
-#if !BUILD_WINDOWS
 using ColorSpectrumShape = Microsoft.UI.Xaml.Controls.ColorSpectrumShape;
 using ColorSpectrumComponents = Microsoft.UI.Xaml.Controls.ColorSpectrumComponents;
 using ColorPicker = Microsoft.UI.Xaml.Controls.ColorPicker;
 using ColorChangedEventArgs = Microsoft.UI.Xaml.Controls.ColorChangedEventArgs;
 using ColorSpectrum = Microsoft.UI.Xaml.Controls.Primitives.ColorSpectrum;
 using XamlControlsXamlMetaDataProvider = Microsoft.UI.Xaml.XamlTypeInfo.XamlControlsXamlMetaDataProvider;
-#endif
 
 namespace Windows.UI.Xaml.Tests.MUXControls.ApiTests
 {
@@ -268,7 +266,6 @@ public void ValidateFractionalWidthDoesNotCrash()
 
         // XamlControlsXamlMetaDataProvider does not exist in the OS repo,
         // so we can't execute this test as authored there.
-#if !BUILD_WINDOWS
         [TestMethod]
         public void VerifyColorPropertyMetadata()
         {
@@ -281,7 +278,6 @@ public void VerifyColorPropertyMetadata()
                 Verify.AreEqual(memberType.BaseType.FullName, "ValueType");
             });
         }
-#endif
 
         // This takes a FrameworkElement parameter so you can pass in either a ColorPicker or a ColorSpectrum.
         private void SetAsRootAndWaitForColorSpectrumFill(FrameworkElement element)

dev/ColorPicker/ColorPicker.cpp

@@ -805,9 +805,10 @@ void ColorPicker::OnRgbTextChanging(winrt::TextBox const& sender, winrt::TextBox
 
     // We'll respond to the text change if the user has entered a valid value.
     // Otherwise, we'll do nothing except mark the text box's contents as invalid.
-    unsigned long componentValue;
-
-    if (TryParseInt(sender.Text(), &componentValue) == false || componentValue < 0 || componentValue > 255)
+    auto componentValue = TryParseInt(sender.Text());
+    if (!componentValue.has_value() || 
+        componentValue.value() < 0 || 
+        componentValue.value() > 255)
     {
         m_isFocusedTextBoxValid = false;
     }
@@ -830,12 +831,10 @@ void ColorPicker::OnHueTextChanging(winrt::TextBox const& /*sender*/, winrt::Tex
 
     // We'll respond to the text change if the user has entered a valid value.
     // Otherwise, we'll do nothing except mark the text box's contents as invalid.
-    unsigned long hueValue;
-
-    int minHue = MinHue();
-    int maxHue = MaxHue();
-
-    if (TryParseInt(m_hueTextBox.Text(), &hueValue) == false || hueValue < static_cast<unsigned long>(minHue) || hueValue > static_cast<unsigned long>(maxHue))
+    auto hueValue = TryParseInt(m_hueTextBox.Text());
+    if (!hueValue.has_value() ||
+        hueValue.value() < static_cast<unsigned long>(MinHue()) || 
+        hueValue.value() > static_cast<unsigned long>(MaxHue()))
     {
         m_isFocusedTextBoxValid = false;
     }
@@ -858,12 +857,10 @@ void ColorPicker::OnSaturationTextChanging(winrt::TextBox const& /*sender*/, win
 
     // We'll respond to the text change if the user has entered a valid value.
     // Otherwise, we'll do nothing except mark the text box's contents as invalid.
-    unsigned long saturationValue;
-
-    int minSaturation = MinSaturation();
-    int maxSaturation = MaxSaturation();
-
-    if (TryParseInt(m_saturationTextBox.Text(), &saturationValue) == false || saturationValue < static_cast<unsigned long>(minSaturation) || saturationValue > static_cast<unsigned long>(maxSaturation))
+    auto saturationValue = TryParseInt(m_saturationTextBox.Text());
+    if (!saturationValue.has_value() ||
+        saturationValue.value() < static_cast<unsigned long>(MinSaturation()) || 
+        saturationValue.value() > static_cast<unsigned long>(MaxSaturation()))
     {
         m_isFocusedTextBoxValid = false;
     }
@@ -886,12 +883,10 @@ void ColorPicker::OnValueTextChanging(winrt::TextBox const& /*sender*/, winrt::T
 
     // We'll respond to the text change if the user has entered a valid value.
     // Otherwise, we'll do nothing except mark the text box's contents as invalid.
-    unsigned long valueValue;
-
-    int minValue = MinValue();
-    int maxValue = MaxValue();
-
-    if (TryParseInt(m_valueTextBox.Text(), &valueValue) == false || valueValue < static_cast<unsigned long>(minValue) || valueValue > static_cast<unsigned long>(maxValue))
+    auto value = TryParseInt(m_valueTextBox.Text());
+    if (!value.has_value() ||
+        value.value() < static_cast<unsigned long>(MinValue()) ||
+        value.value() > static_cast<unsigned long>(MaxValue()))
     {
         m_isFocusedTextBoxValid = false;
     }
@@ -926,17 +921,16 @@ void ColorPicker::OnAlphaTextChanging(winrt::TextBox const& /*sender*/, winrt::T
 
     // We'll respond to the text change if the user has entered a valid value.
     // Otherwise, we'll do nothing except mark the text box's contents as invalid.
-    unsigned long alphaValue;
     winrt::hstring alphaString{ static_cast<wstring>(m_alphaTextBox.Text()).substr(0, m_alphaTextBox.Text().size() - 1) };
-
-    if (TryParseInt(alphaString, &alphaValue) == false || alphaValue < 0 || alphaValue > 100)
+    auto alphaValue = TryParseInt(alphaString);
+    if (!alphaValue.has_value() || alphaValue.value() < 0 || alphaValue.value() > 100)
     {
         m_isFocusedTextBoxValid = false;
     }
     else
     {
         m_isFocusedTextBoxValid = true;
-        UpdateColor(alphaValue / 100.0, ColorUpdateReason::AlphaTextBoxChanged);
+        UpdateColor(alphaValue.value() / 100.0, ColorUpdateReason::AlphaTextBoxChanged);
     }
 }
 
@@ -961,17 +955,11 @@ void ColorPicker::OnHexTextChanging(winrt::TextBox const& /*sender*/, winrt::Tex
     // We'll respond to the text change if the user has entered a valid value.
     // Otherwise, we'll do nothing except mark the text box's contents as invalid.
     bool isAlphaEnabled = IsAlphaEnabled();
-    Rgb rgbValue;
-    double alphaValue = 1.0;
-
-    if (isAlphaEnabled)
-    {
-        HexToRgba(m_hexTextBox.Text(), &rgbValue, &alphaValue);
-    }
-    else
-    {
-        rgbValue = HexToRgb(m_hexTextBox.Text());
-    }
+    auto [rgbValue, alphaValue] = [this, isAlphaEnabled]() {
+        return isAlphaEnabled?
+            HexToRgba(m_hexTextBox.Text()):
+            std::make_tuple<Rgb, double>(HexToRgb(m_hexTextBox.Text()), 1.0);
+    }();
 
     if ((rgbValue.r == -1 && rgbValue.g == -1 && rgbValue.b == -1 && alphaValue == -1) || alphaValue < 0 || alphaValue > 1)
     {
@@ -1255,4 +1243,4 @@ winrt::Color ColorPicker::GetCheckerColor()
     }
 
     return checkerColor;
-}
+}

dev/ColorPicker/InteractionTests/ColorPickerTests.cs

@@ -19,19 +19,11 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
 #endif
 
-#if BUILD_WINDOWS
-using System.Windows.Automation;
-using MS.Internal.Mita.Foundation;
-using MS.Internal.Mita.Foundation.Controls;
-using MS.Internal.Mita.Foundation.Patterns;
-using MS.Internal.Mita.Foundation.Waiters;
-#else
 using Microsoft.Windows.Apps.Test.Automation;
 using Microsoft.Windows.Apps.Test.Foundation;
 using Microsoft.Windows.Apps.Test.Foundation.Controls;
 using Microsoft.Windows.Apps.Test.Foundation.Patterns;
 using Microsoft.Windows.Apps.Test.Foundation.Waiters;
-#endif
 
 namespace Windows.UI.Xaml.Tests.MUXControls.InteractionTests
 {
@@ -1214,7 +1206,6 @@ public void VerifyThirdDimensionSliderAutomationValuesAreCorrect()
         // As a result, we can't test localization there.  The functionality that this is testing is just whether ColorPicker is properly
         // loading resources instead of having any hard-coded strings, so running this test only in the MUXControls repo should be OK -
         // we don't have any OS repo-specific code in what this is testing, so nothing should change between the two repos.
-#if !BUILD_WINDOWS
         [TestMethod]
         public void VerifyStringsAreLocalizedCorrectly()
         {
@@ -1296,7 +1287,6 @@ private void GetLocalizedText(IList<string> stringList)
 
             stringList.Add(FindElement.ById(AlphaLabelAutomationId).Name);
         }
-#endif
 
         private ColorPickerTestSetupHelper SetupColorPickerTest(TestOptions options = TestOptions.None)
         {

dev/ColorPicker/TestUI/ColorPickerPage.xaml.cs

@@ -10,13 +10,11 @@
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Shapes;
 
-#if !BUILD_WINDOWS
 using ColorSpectrumShape = Microsoft.UI.Xaml.Controls.ColorSpectrumShape;
 using ColorSpectrumComponents = Microsoft.UI.Xaml.Controls.ColorSpectrumComponents;
 using ColorPicker = Microsoft.UI.Xaml.Controls.ColorPicker;
 using ColorChangedEventArgs = Microsoft.UI.Xaml.Controls.ColorChangedEventArgs;
 using ColorSpectrum = Microsoft.UI.Xaml.Controls.Primitives.ColorSpectrum;
-#endif
 
 namespace MUXControlsTestApp
 {

dev/CommandBarFlyout/APITests/CommandBarFlyoutTests.cs

@@ -23,9 +23,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
 #endif
 
-#if !BUILD_WINDOWS
 using CommandBarFlyout = Microsoft.UI.Xaml.Controls.CommandBarFlyout;
-#endif
 
 namespace Windows.UI.Xaml.Tests.MUXControls.ApiTests
 {

dev/CommandBarFlyout/InteractionTests/CommandBarFlyoutTests.cs

@@ -16,19 +16,11 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
 #endif
 
-#if BUILD_WINDOWS
-using System.Windows.Automation;
-using MS.Internal.Mita.Foundation;
-using MS.Internal.Mita.Foundation.Controls;
-using MS.Internal.Mita.Foundation.Patterns;
-using MS.Internal.Mita.Foundation.Waiters;
-#else
 using Microsoft.Windows.Apps.Test.Automation;
 using Microsoft.Windows.Apps.Test.Foundation;
 using Microsoft.Windows.Apps.Test.Foundation.Controls;
 using Microsoft.Windows.Apps.Test.Foundation.Patterns;
 using Microsoft.Windows.Apps.Test.Foundation.Waiters;
-#endif
 
 namespace Windows.UI.Xaml.Tests.MUXControls.InteractionTests
 {

dev/CommandBarFlyout/InteractionTests/TextCommandBarFlyoutTests.cs

@@ -16,19 +16,11 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
 #endif
 
-#if BUILD_WINDOWS
-using System.Windows.Automation;
-using MS.Internal.Mita.Foundation;
-using MS.Internal.Mita.Foundation.Controls;
-using MS.Internal.Mita.Foundation.Patterns;
-using MS.Internal.Mita.Foundation.Waiters;
-#else
 using Microsoft.Windows.Apps.Test.Automation;
 using Microsoft.Windows.Apps.Test.Foundation;
 using Microsoft.Windows.Apps.Test.Foundation.Controls;
 using Microsoft.Windows.Apps.Test.Foundation.Patterns;
 using Microsoft.Windows.Apps.Test.Foundation.Waiters;
-#endif
 
 namespace Windows.UI.Xaml.Tests.MUXControls.InteractionTests
 {

dev/CommandBarFlyout/TestUI/CommandBarFlyoutPage.xaml.cs

@@ -9,9 +9,7 @@
 using Windows.UI.Xaml.Controls.Primitives;
 using Windows.UI.Xaml.Input;
 
-#if !BUILD_WINDOWS
 using CommandBarFlyout = Microsoft.UI.Xaml.Controls.CommandBarFlyout;
-#endif
 
 namespace MUXControlsTestApp
 {

dev/CommandBarFlyout/TestUI/TextCommandBarFlyoutPage.xaml.cs

@@ -15,9 +15,7 @@
 using Windows.UI.Xaml.Documents;
 using Windows.UI.Xaml.Input;
 
-#if !BUILD_WINDOWS
 using TextCommandBarFlyout = Microsoft.UI.Xaml.Controls.TextCommandBarFlyout;
-#endif
 
 namespace MUXControlsTestApp
 {