diff --git a/dev/AutoSuggestBox/AutoSuggestBox.vcxitems b/dev/AutoSuggestBox/AutoSuggestBox.vcxitems index eb030912f8..7a91a4b3fe 100644 --- a/dev/AutoSuggestBox/AutoSuggestBox.vcxitems +++ b/dev/AutoSuggestBox/AutoSuggestBox.vcxitems @@ -18,13 +18,11 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true diff --git a/dev/CalendarDatePicker/CalendarDatePicker.vcxitems b/dev/CalendarDatePicker/CalendarDatePicker.vcxitems index 8bd9aca51a..88867335f4 100644 --- a/dev/CalendarDatePicker/CalendarDatePicker.vcxitems +++ b/dev/CalendarDatePicker/CalendarDatePicker.vcxitems @@ -18,13 +18,11 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true \ No newline at end of file diff --git a/dev/CalendarView/CalendarView.vcxitems b/dev/CalendarView/CalendarView.vcxitems index ef937003d7..b7ecb8caeb 100644 --- a/dev/CalendarView/CalendarView.vcxitems +++ b/dev/CalendarView/CalendarView.vcxitems @@ -19,13 +19,11 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true \ No newline at end of file diff --git a/dev/CheckBox/CheckBox.vcxitems b/dev/CheckBox/CheckBox.vcxitems index 25471063b7..68338efb85 100644 --- a/dev/CheckBox/CheckBox.vcxitems +++ b/dev/CheckBox/CheckBox.vcxitems @@ -18,13 +18,11 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true \ No newline at end of file diff --git a/dev/ColorPicker/ColorPicker.vcxitems b/dev/ColorPicker/ColorPicker.vcxitems index 99f8960b4b..899358b37b 100644 --- a/dev/ColorPicker/ColorPicker.vcxitems +++ b/dev/ColorPicker/ColorPicker.vcxitems @@ -42,13 +42,11 @@ Latest RS1 DefaultStyle - true V2dot5 RS1 DefaultStyle - true Latest @@ -64,13 +62,11 @@ Latest RS1 DefaultStyle - true V2dot5 RS1 DefaultStyle - true diff --git a/dev/ComboBox/ComboBox.vcxitems b/dev/ComboBox/ComboBox.vcxitems index 7377d0a5a9..61d112b32c 100644 --- a/dev/ComboBox/ComboBox.vcxitems +++ b/dev/ComboBox/ComboBox.vcxitems @@ -18,13 +18,11 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true diff --git a/dev/CommonStyles/CommonStyles.vcxitems b/dev/CommonStyles/CommonStyles.vcxitems index 580d1edfcd..54a1fafab7 100644 --- a/dev/CommonStyles/CommonStyles.vcxitems +++ b/dev/CommonStyles/CommonStyles.vcxitems @@ -30,163 +30,136 @@ Latest RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest @@ -202,25 +175,21 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true \ No newline at end of file diff --git a/dev/DatePicker/DatePicker.vcxitems b/dev/DatePicker/DatePicker.vcxitems index f616a0d0d5..ea2b1972e1 100644 --- a/dev/DatePicker/DatePicker.vcxitems +++ b/dev/DatePicker/DatePicker.vcxitems @@ -18,25 +18,21 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true \ No newline at end of file diff --git a/dev/FlipView/FlipView.vcxitems b/dev/FlipView/FlipView.vcxitems index d6435e2226..0a3c86de1f 100644 --- a/dev/FlipView/FlipView.vcxitems +++ b/dev/FlipView/FlipView.vcxitems @@ -18,13 +18,11 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest diff --git a/dev/Materials/Reveal/RevealBrush.vcxitems b/dev/Materials/Reveal/RevealBrush.vcxitems index 7a0b84ccc0..abf8cded2c 100644 --- a/dev/Materials/Reveal/RevealBrush.vcxitems +++ b/dev/Materials/Reveal/RevealBrush.vcxitems @@ -34,52 +34,44 @@ RS1 ThemeResources 2 - true Latest RS2 ThemeResources 2 - true V2dot5 RS1 ThemeResources 2 - true V2dot5 RS2 ThemeResources 2 - true RS3 ThemeResources 3 - true RS4 ThemeResources 4 - true RS5 ThemeResources 5 - true 19H1 ThemeResources 6 - true diff --git a/dev/MenuFlyout/MenuFlyout.vcxitems b/dev/MenuFlyout/MenuFlyout.vcxitems index d338fb0cf6..09ebaee9a8 100644 --- a/dev/MenuFlyout/MenuFlyout.vcxitems +++ b/dev/MenuFlyout/MenuFlyout.vcxitems @@ -20,7 +20,6 @@ ThemeResources 2 Designer - true V2dot5 @@ -28,7 +27,6 @@ ThemeResources 2 Designer - true \ No newline at end of file diff --git a/dev/NavigationView/NavigationView.vcxitems b/dev/NavigationView/NavigationView.vcxitems index 6ccb35fc83..ce2277b950 100644 --- a/dev/NavigationView/NavigationView.vcxitems +++ b/dev/NavigationView/NavigationView.vcxitems @@ -73,39 +73,33 @@ Latest RS1 DefaultStyle - true V2dot5 RS1 DefaultStyle - true Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS2 Designer ThemeResources - true V2dot5 RS2 Designer ThemeResources - true Latest diff --git a/dev/Pivot/Pivot.vcxitems b/dev/Pivot/Pivot.vcxitems index bf3d5ab9f9..f9d75a0ee8 100644 --- a/dev/Pivot/Pivot.vcxitems +++ b/dev/Pivot/Pivot.vcxitems @@ -18,13 +18,11 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true \ No newline at end of file diff --git a/dev/ProgressBar/ProgressBar.vcxitems b/dev/ProgressBar/ProgressBar.vcxitems index 0dc4c5a90f..063de732e0 100644 --- a/dev/ProgressBar/ProgressBar.vcxitems +++ b/dev/ProgressBar/ProgressBar.vcxitems @@ -43,13 +43,11 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true diff --git a/dev/ScrollBar/ScrollBar.vcxitems b/dev/ScrollBar/ScrollBar.vcxitems index f993c3ce0f..c7b6e48ab7 100644 --- a/dev/ScrollBar/ScrollBar.vcxitems +++ b/dev/ScrollBar/ScrollBar.vcxitems @@ -18,13 +18,11 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true \ No newline at end of file diff --git a/dev/Slider/Slider.vcxitems b/dev/Slider/Slider.vcxitems index be655c65d9..083cac7909 100644 --- a/dev/Slider/Slider.vcxitems +++ b/dev/Slider/Slider.vcxitems @@ -18,13 +18,11 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true \ No newline at end of file diff --git a/dev/SplitView/SplitView.vcxitems b/dev/SplitView/SplitView.vcxitems index 93a4eb4a2f..8686e10e0b 100644 --- a/dev/SplitView/SplitView.vcxitems +++ b/dev/SplitView/SplitView.vcxitems @@ -19,13 +19,11 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true \ No newline at end of file diff --git a/dev/TabView/TabView.vcxitems b/dev/TabView/TabView.vcxitems index 913b79b6d4..273d93114b 100644 --- a/dev/TabView/TabView.vcxitems +++ b/dev/TabView/TabView.vcxitems @@ -36,13 +36,11 @@ Latest RS1 DefaultStyle - true V2dot5 RS1 DefaultStyle - true Latest diff --git a/dev/TimePicker/TimePicker.vcxitems b/dev/TimePicker/TimePicker.vcxitems index fd74f67291..265dd1b059 100644 --- a/dev/TimePicker/TimePicker.vcxitems +++ b/dev/TimePicker/TimePicker.vcxitems @@ -18,13 +18,11 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true \ No newline at end of file diff --git a/dev/ToolTip/ToolTip.vcxitems b/dev/ToolTip/ToolTip.vcxitems index 87d1ee5a51..15b9af4171 100644 --- a/dev/ToolTip/ToolTip.vcxitems +++ b/dev/ToolTip/ToolTip.vcxitems @@ -18,25 +18,21 @@ Latest RS1 ThemeResources - true V2dot5 RS1 ThemeResources - true Latest RS5 ThemeResources - true V2dot5 RS5 ThemeResources - true \ No newline at end of file diff --git a/dev/TreeView/TreeView.vcxitems b/dev/TreeView/TreeView.vcxitems index e21e27b1a9..a2c2273e4a 100644 --- a/dev/TreeView/TreeView.vcxitems +++ b/dev/TreeView/TreeView.vcxitems @@ -71,13 +71,11 @@ Latest RS2 DefaultStyle - true V2dot5 RS2 DefaultStyle - true Latest diff --git a/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems b/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems index 804258677f..6a1103ee03 100644 --- a/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems +++ b/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems @@ -139,12 +139,6 @@ true - - - - - {ad0c90b0-4845-4d4b-88f1-86f653f8171b} @@ -294,10 +288,6 @@ - - - - Designer @@ -332,9 +322,6 @@ Designer - - - @@ -344,11 +331,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(TargetName) .appx diff --git a/test/MUXControlsTestApp/ThemeResourcesTests.cs b/test/MUXControlsTestApp/ThemeResourcesTests.cs index 96a33ad688..a33cd57ea9 100644 --- a/test/MUXControlsTestApp/ThemeResourcesTests.cs +++ b/test/MUXControlsTestApp/ThemeResourcesTests.cs @@ -36,7 +36,7 @@ namespace Windows.UI.Xaml.Tests.MUXControls.ApiTests { [TestClass] - public partial class ThemeResourcesTests : ApiTestBase + public class ThemeResourcesTests : ApiTestBase { [ClassInitialize] [TestProperty("Classification", "Integration")] @@ -121,391 +121,5 @@ public void VerifyOverrides() }); IdleSynchronizer.TryWait(); } - - // TO DO [Task 30818605]: Disabling to replace with reflection-based tests in release test app - // [TestMethod] - public void VerifyRS2DefaultStyleDictionariesWereMergedCorrectly() - { - if (PlatformConfiguration.IsOsVersionGreaterThan(OSVersion.Redstone1)) - { - VerifyDictionariesWereMergedCorrectly(GetRS2DefaultStyleDictionaries(), "Microsoft.UI.Xaml/Themes/rs2_generic.xaml"); - } - } - - [TestMethod] - public void VerifyRS3DefaultStyleDictionariesWereMergedCorrectly() - { - if (PlatformConfiguration.IsOsVersionGreaterThan(OSVersion.Redstone2)) - { - VerifyDictionariesWereMergedCorrectly(GetRS3DefaultStyleDictionaries(), "Microsoft.UI.Xaml/Themes/rs3_generic.xaml"); - } - } - - [TestMethod] - public void VerifyRS4DefaultStyleDictionariesWereMergedCorrectly() - { - if (PlatformConfiguration.IsOsVersionGreaterThan(OSVersion.Redstone3)) - { - VerifyDictionariesWereMergedCorrectly(GetRS4DefaultStyleDictionaries(), "Microsoft.UI.Xaml/Themes/rs4_generic.xaml"); - } - } - - [TestMethod] - public void VerifyRS5DefaultStyleDictionariesWereMergedCorrectly() - { - if (PlatformConfiguration.IsOsVersionGreaterThan(OSVersion.Redstone4)) - { - VerifyDictionariesWereMergedCorrectly(GetRS5DefaultStyleDictionaries(), "Microsoft.UI.Xaml/Themes/rs5_generic.xaml"); - } - } - - [TestMethod] - public void Verify19H1DefaultStyleDictionariesWereMergedCorrectly() - { - if (PlatformConfiguration.IsOsVersionGreaterThan(OSVersion.Redstone5)) - { - VerifyDictionariesWereMergedCorrectly(Get19H1DefaultStyleDictionaries(), "Microsoft.UI.Xaml/Themes/19h1_generic.xaml"); - } - } - - [TestMethod] - public void VerifyRS2ThemeResourceDictionariesWereMergedCorrectly() - { - if (PlatformConfiguration.IsOsVersionGreaterThan(OSVersion.Redstone1)) - { - VerifyDictionariesWereMergedCorrectly(GetRS2ThemeResourceDictionaries(), "Microsoft.UI.Xaml/Themes/rs2_themeresources.xaml"); - } - } - - [TestMethod] - public void VerifyRS3ThemeResourceDictionariesWereMergedCorrectly() - { - if (PlatformConfiguration.IsOsVersionGreaterThan(OSVersion.Redstone2)) - { - VerifyDictionariesWereMergedCorrectly(GetRS3ThemeResourceDictionaries(), "Microsoft.UI.Xaml/Themes/rs3_themeresources.xaml"); - } - } - - [TestMethod] - public void VerifyRS4ThemeResourceDictionariesWereMergedCorrectly() - { - if (PlatformConfiguration.IsOsVersionGreaterThan(OSVersion.Redstone3)) - { - VerifyDictionariesWereMergedCorrectly(GetRS4ThemeResourceDictionaries(), "Microsoft.UI.Xaml/Themes/rs4_themeresources.xaml"); - } - } - - [TestMethod] - public void VerifyRS5ThemeResourceDictionariesWereMergedCorrectly() - { - if (PlatformConfiguration.IsOsVersionGreaterThan(OSVersion.Redstone4)) - { - VerifyDictionariesWereMergedCorrectly(GetRS5ThemeResourceDictionaries(), "Microsoft.UI.Xaml/Themes/rs5_themeresources.xaml"); - } - } - - [TestMethod] - public void Verify19H1ThemeResourceDictionariesWereMergedCorrectly() - { - if (PlatformConfiguration.IsOsVersionGreaterThan(OSVersion.Redstone5)) - { - VerifyDictionariesWereMergedCorrectly(Get19H1ThemeResourceDictionaries(), "Microsoft.UI.Xaml/Themes/19h1_themeresources.xaml"); - } - } - - #region Dictionary verification - - List keysWithDifferentValues = new List(); - - private void VerifyDictionariesWereMergedCorrectly(List dictionaries, string mergedDictionary) - { - RunOnUIThread.Execute(() => - { - keysWithDifferentValues.Clear(); - TestDictionariesAgainstMergedDictionary(dictionaries, mergedDictionary); - - if (keysWithDifferentValues.Count > 0) - { - string errorMessage = Environment.NewLine + "Verification FAILED. The following keys were not the same in the merged dictionaries as in the unmerged dictionaries:" + Environment.NewLine; - - foreach (string key in keysWithDifferentValues) - { - errorMessage += " " + key; - } - - errorMessage += Environment.NewLine; - - Log.Comment(errorMessage); - } - else - { - Log.Comment(Environment.NewLine + "Verification succeeded!" + Environment.NewLine); - } - }); - } - - private void TestDictionariesAgainstMergedDictionary(List dictionaries, string mergedDictionary) - { - ResourceDictionary parsedMergedDictionary = new ResourceDictionary() { Source = new Uri("ms-appx:///" + mergedDictionary) }; - - foreach (string dictionary in dictionaries) - { - Log.Comment(Environment.NewLine + "Testing {0} against {1}..." + Environment.NewLine, dictionary, mergedDictionary); - ResourceDictionary parsedDictionary = new ResourceDictionary() { Source = new Uri("ms-appx:///" + dictionary) }; - - List keysToCheck = new List(); - - foreach (object themeDictionaryKey in parsedDictionary.ThemeDictionaries.Keys) - { - string themeDictionaryKeyString = themeDictionaryKey as string; - - ResourceDictionary themeDictionary = parsedDictionary.ThemeDictionaries[themeDictionaryKeyString] as ResourceDictionary; - keysToCheck.AddRange(SafeRetrieveKeys(themeDictionary).Where((key) => !keysToCheck.Contains(key))); - } - - foreach (ResourceDictionary innerMergedDictionary in parsedDictionary.MergedDictionaries) - { - keysToCheck.AddRange(SafeRetrieveKeys(innerMergedDictionary).Where((key) => !keysToCheck.Contains(key))); - } - - keysToCheck.AddRange(SafeRetrieveKeys(parsedDictionary).Where((key) => !keysToCheck.Contains(key))); - - foreach (string key in keysToCheck) - { - Log.Comment("Comparing key '{0}' between dictionaries...", key); - - if (CompareObjects(parsedDictionary[key], parsedMergedDictionary[key], 0) == false) - { - keysWithDifferentValues.Add(key); - } - } - } - } - - // There's a bug in RS1 where trying to iterate through a ResourceDictionary containing an element with no key - // causes E_FAIL to be returned. We'll just ignore those failures. - private static IEnumerable SafeRetrieveKeys(ResourceDictionary dictionary) - { - IEnumerator keyEnumerator = dictionary.Keys.GetEnumerator(); - - bool shouldContinue = true; - - while (shouldContinue) - { - string keyString = null; - - try - { - shouldContinue = keyEnumerator.MoveNext(); - - if (!shouldContinue) - { - break; - } - - keyString = keyEnumerator.Current as string; - } - catch (COMException e) - { - if (e.HResult == -2147467259) // E_FAIL - { - shouldContinue = false; - } - else - { - throw; - } - } - - if (keyString != null) - { - yield return keyString; - } - } - } - - // For whatever reason, our version of System.Type doesn't contain an IsValueType property, - // so we need to do things the hard way. - static Type[] valueTypes = new Type[] - { - typeof(Enum), - typeof(String), - typeof(Char), - typeof(Guid), - typeof(Boolean), - typeof(Byte), - typeof(Int16), - typeof(Int32), - typeof(Int64), - typeof(Single), - typeof(Double), - typeof(Decimal), - typeof(SByte), - typeof(UInt16), - typeof(UInt32), - typeof(UInt64), - typeof(DateTime), - typeof(DateTimeOffset), - typeof(TimeSpan), - }; - - // Some properties can end up creating a loop if we try to then reference their properties, - // or are super noisy and take way too long to evaluate. We'll ignore them. - static string[] ignoredProperties = new string[] - { - "Inverse", - "RelativeTransform", - "Transform", - }; - - private bool CompareObjects(object value, object mergedValue, int indentation) - { - // We'll first test equality. Failure doesn't necessarily mean that the objects aren't the same, - // since we may be dealing with a reference type, but success means we can immediately quit. - if (value == mergedValue) - { - // We'll still call verify to log the values so we can make sure they look right. - Verify.AreEqual(value, mergedValue); - } - else - { - // If one value is null and the other isn't, then we know we can immediately fail. - if ((value == null && mergedValue != null) || (value != null && mergedValue == null)) - { - Verify.Fail("One value was null while the other wasn't, so these values aren't equal."); - return false; - } - - // If the types aren't even the same, then we can just early-out and fail. - Type type = value.GetType(); - Type mergedType = mergedValue.GetType(); - - // If one value is null and the other isn't, then we know we can immediately fail. - if (type != mergedType) - { - Verify.Fail(string.Format("Types '{0}' and '{1}' do not match.", type.Name, mergedType.Name)); - return false; - } - - // If the two values weren't equal, but they're value types, then we can fal - testing for equality should've worked. - // We'll call Verify.AreEqual() to get information about what the values were. - if (valueTypes.Any((valueType) => valueType.IsAssignableFrom(type))) - { - Verify.AreEqual(value, mergedValue); - } - else - { - DependencyObject valueObject = value as DependencyObject; - DependencyObject mergedValueObject = mergedValue as DependencyObject; - - PropertyInfo[] propertyInfoList = null; - - if (valueObject != null && mergedValueObject != null) - { - propertyInfoList = type.GetProperties(BindingFlags.Static | BindingFlags.Public | BindingFlags.FlattenHierarchy).Where((pi) => pi.PropertyType == typeof(DependencyProperty)).ToArray(); - } - else - { - propertyInfoList = type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.FlattenHierarchy); - } - - // If we've got a dependency object that we're checking, then we'll consider all of its dependency properties. - // We'll ignore any that aren't set. - foreach (PropertyInfo propertyInfo in propertyInfoList) - { - if (ignoredProperties.Contains(propertyInfo.Name)) - { - continue; - } - - object property = null; - object mergedProperty = null; - - if (valueObject != null && mergedValueObject != null) - { - DependencyProperty propertyDP = propertyInfo.GetValue(valueObject) as DependencyProperty; - - property = valueObject.ReadLocalValue(propertyDP); - mergedProperty = mergedValueObject.ReadLocalValue(propertyDP); - - if (property == DependencyProperty.UnsetValue && mergedProperty == DependencyProperty.UnsetValue) - { - // If both values are unset, then we can just ignore this property. - continue; - } - else if ((property == DependencyProperty.UnsetValue && mergedProperty != DependencyProperty.UnsetValue) || - (property != DependencyProperty.UnsetValue && mergedProperty == DependencyProperty.UnsetValue)) - { - // If one value is unset and another is set, then we've found a difference, and can stop. - return false; - } - } - else - { - property = propertyInfo.GetValue(value); - mergedProperty = propertyInfo.GetValue(mergedValue); - } - - string comparisonComment = "Comparing property '{0}' on objects..."; - - for (int i = 0; i < indentation; i++) - { - comparisonComment = " " + comparisonComment; - } - - Log.Comment(comparisonComment, propertyInfo.Name); - bool succeeded = CompareObjects(property, mergedProperty, indentation + 1); - - if (!succeeded) - { - return false; - } - } - - // Finally, we should check to see whether or not this is a collection. - // If it is, we should iterate over its items to make sure they're all equal too. - ICollection collection = value as ICollection; - ICollection mergedCollection = mergedValue as ICollection; - - if (collection != null && mergedCollection != null) - { - List list = new List(); - List mergedList = new List(); - - foreach (object o in collection) - { - list.Add(o); - } - - foreach (object o in mergedCollection) - { - mergedList.Add(o); - } - - for (int i = 0; i < list.Count; i++) - { - string comparisonComment = "Comparing element '{0}' in list..."; - - for (int j = 0; j < indentation; j++) - { - comparisonComment = " " + comparisonComment; - } - - Log.Comment(comparisonComment, i); - bool succeeded = CompareObjects(list[i], mergedList[i], indentation + 1); - - if (!succeeded) - { - return false; - } - } - } - } - } - - return true; - } - - #endregion } } diff --git a/tools/CustomTasks/BatchMergeXaml.cs b/tools/CustomTasks/BatchMergeXaml.cs index ef9f76a6f6..74860b7729 100644 --- a/tools/CustomTasks/BatchMergeXaml.cs +++ b/tools/CustomTasks/BatchMergeXaml.cs @@ -1,4 +1,11 @@ -using Microsoft.Build.Framework; +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +// This is no test coverage for BatchMergeXaml, MergedDictionary and StripNamespaces. +// Please manually verify them if you make change on it. For example, checkout the buildoutput intermediate files +// and do the comparision between 19h1_generic_2dot5.prefixed.xaml and 19h1_generic_2dot5.xaml + +using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using System; using System.Collections.Generic;