diff --git a/contributing.md b/Contributing.md
similarity index 100%
rename from contributing.md
rename to Contributing.md
diff --git a/Directory.Build.props b/Directory.Build.props
index 5b59fa7a93d..b37ca57395e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -31,6 +31,11 @@
true
+
+
+ false
+
+
@@ -44,9 +49,9 @@
-
- false
+
false
+ false
@@ -54,16 +59,16 @@
-
+
true
-
+
true
-
+
$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
-
-
+
+
@@ -71,7 +76,7 @@
-
+
@@ -103,10 +108,10 @@
stylecop.json
-
-
+
+
-
+
\ No newline at end of file
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 112cde71423..4b3849792b5 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -5,7 +5,7 @@
-
+
true
@@ -15,11 +15,11 @@
-
+
-
+
<_Parameter1>CommitHash
<_Parameter2>$(SourceRevisionId)
diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj
index bad303797f2..cca2cf2c13f 100644
--- a/GazeInputTest/GazeInputTest.csproj
+++ b/GazeInputTest/GazeInputTest.csproj
@@ -151,9 +151,6 @@
6.2.12
-
- 1.0.2
-
@@ -165,11 +162,6 @@
14.0
-
+
+
\ No newline at end of file
diff --git a/GazeInputTest/Properties/Default.rd.xml b/GazeInputTest/Properties/Default.rd.xml
index ec0e6a457b6..dc591a4ce9c 100644
--- a/GazeInputTest/Properties/Default.rd.xml
+++ b/GazeInputTest/Properties/Default.rd.xml
@@ -14,7 +14,6 @@
Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-->
-
-
-
-
-
\ No newline at end of file
diff --git a/license.md b/License.md
similarity index 100%
rename from license.md
rename to License.md
diff --git a/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj b/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj
index f000abc9985..531855099c1 100644
--- a/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj
+++ b/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj
@@ -13,34 +13,35 @@
Windows;Community;Toolkit;WCT;UWP;Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;extensions;helpers
+
-
+
+
-
-
-
-
-
+
+
+
-
+
+
NETSTANDARD2_1_OR_GREATER
+
-
-
-
+
+
NETSTANDARD2_1_OR_GREATER
diff --git a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj
index 5e0161e0304..258ad9de37e 100644
--- a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj
+++ b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj
@@ -24,17 +24,19 @@
Windows;Community;Toolkit;WCT;UWP;core;standard;unsafe;span;memory;string;array;stream;buffer;extensions;helpers;parallel;performance
+
-
+
+
-
-
@@ -44,65 +46,70 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
- NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT
-
-
-
+ SPAN_RUNTIME_SUPPORT: define a constant to indicate runtimes with runtime support for
+ the fast Span type, as well as some overloads with Span parameters (eg. Stream.Write).
+ In particular, these are runtimes which are able to create Span instances from just
+ a managed reference, which can be used to slice arbitrary objects not technically supported.
+ This API (MemoryMarshal.CreateSpan) is not part of .NET Standard 2.0, but it is still
+ available on .NET Core 2.1. So by using this constant, we can make sure to expose those
+ APIs relying on that method on all target frameworks that are able to support them.
+ -->
NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT
-
-
+
+
+
+
+ NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT
+
+
-
+
+
+
NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT;NETCORE_RUNTIME
-
-
+
+
+
SPAN_RUNTIME_SUPPORT;NETCORE_RUNTIME
+
+
+
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
index 926d8f9c235..96a98b6ee07 100644
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -21,14 +21,14 @@
-
+
-
+
diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj
index 5c713e10344..4000f5e402d 100644
--- a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj
+++ b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj
@@ -8,9 +8,7 @@
-
-
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Properties/Microsoft.Toolkit.Uwp.Connectivity.rd.xml b/Microsoft.Toolkit.Uwp.Connectivity/Properties/Microsoft.Toolkit.Uwp.Connectivity.rd.xml
index a00a0a46167..e537af7d785 100644
--- a/Microsoft.Toolkit.Uwp.Connectivity/Properties/Microsoft.Toolkit.Uwp.Connectivity.rd.xml
+++ b/Microsoft.Toolkit.Uwp.Connectivity/Properties/Microsoft.Toolkit.Uwp.Connectivity.rd.xml
@@ -1,32 +1,5 @@
-
-
-
-
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj
index a5e92aa4152..04334239afc 100644
--- a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj
+++ b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj
@@ -10,8 +10,6 @@
-Themes : Provides the source path of the resource dictionaries for the FocusTracker.
Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Developer;Tools;Accessibility;Alignment;Grid;AlignmentGrid
-
- false
@@ -26,4 +24,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/Properties/Microsoft.Toolkit.Uwp.DeveloperTools.rd.xml b/Microsoft.Toolkit.Uwp.DeveloperTools/Properties/Microsoft.Toolkit.Uwp.DeveloperTools.rd.xml
index dd94da2d1fc..3e6944658b2 100644
--- a/Microsoft.Toolkit.Uwp.DeveloperTools/Properties/Microsoft.Toolkit.Uwp.DeveloperTools.rd.xml
+++ b/Microsoft.Toolkit.Uwp.DeveloperTools/Properties/Microsoft.Toolkit.Uwp.DeveloperTools.rd.xml
@@ -1,4 +1,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveProgressBar.cs b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveProgressBar.cs
index ced2e168357..4699a477900 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveProgressBar.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveProgressBar.cs
@@ -2,11 +2,17 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+using Microsoft.Toolkit.Uwp.Notifications.Adaptive.Elements;
+
#if WINRT
using System.Collections.Generic;
+using BindableString = System.String;
+using BindableProgressBarValue = Microsoft.Toolkit.Uwp.Notifications.AdaptiveProgressBarValue;
+#else
+using BindableString = Microsoft.Toolkit.Uwp.Notifications.BindableString;
+using BindableProgressBarValue = Microsoft.Toolkit.Uwp.Notifications.BindableProgressBarValue;
#endif
-using System;
-using Microsoft.Toolkit.Uwp.Notifications.Adaptive.Elements;
namespace Microsoft.Toolkit.Uwp.Notifications
{
@@ -25,46 +31,22 @@ public sealed class AdaptiveProgressBar : IToastBindingGenericChild
///
/// Gets or sets an optional title string. Supports data binding.
///
- public
-#if WINRT
- string
-#else
- BindableString
-#endif
- Title { get; set; }
+ public BindableString Title { get; set; }
///
/// Gets or sets the value of the progress bar. Supports data binding. Defaults to 0.
///
- public
-#if WINRT
- AdaptiveProgressBarValue
-#else
- BindableProgressBarValue
-#endif
- Value { get; set; } = AdaptiveProgressBarValue.FromValue(0);
+ public BindableProgressBarValue Value { get; set; } = AdaptiveProgressBarValue.FromValue(0);
///
/// Gets or sets an optional string to be displayed instead of the default percentage string. If this isn't provided, something like "70%" will be displayed.
///
- public
-#if WINRT
- string
-#else
- BindableString
-#endif
- ValueStringOverride { get; set; }
+ public BindableString ValueStringOverride { get; set; }
///
/// Gets or sets a status string (Required), which is displayed underneath the progress bar. This string should reflect the status of the operation, like "Downloading..." or "Installing..."
///
- public
-#if WINRT
- string
-#else
- BindableString
-#endif
- Status { get; set; }
+ public BindableString Status { get; set; }
internal Element_AdaptiveProgressBar ConvertToElement()
{
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveText.cs b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveText.cs
index 21151fe86d3..06878b5b704 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveText.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveText.cs
@@ -2,10 +2,15 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+using Microsoft.Toolkit.Uwp.Notifications.Adaptive.Elements;
+
#if WINRT
using System.Collections.Generic;
+using BindableString = System.String;
+#else
+using BindableString = Microsoft.Toolkit.Uwp.Notifications.BindableString;
#endif
-using Microsoft.Toolkit.Uwp.Notifications.Adaptive.Elements;
namespace Microsoft.Toolkit.Uwp.Notifications
{
@@ -29,13 +34,7 @@ public sealed class AdaptiveText
/// Gets or sets the text to display. Data binding support added in Creators Update,
/// only works for toast top-level text elements.
///
- public
-#if WINRT
- string
-#else
- BindableString
-#endif
- Text { get; set; }
+ public BindableString Text { get; set; }
///
/// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index 279f4de0c8b..72ff8ad6041 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -3,82 +3,75 @@
netstandard1.4;uap10.0.19041;net461;netcoreapp3.1;net5.0;net5.0-windows10.0.17763.0;native
$(DefineConstants);NETFX_CORE
- true
Microsoft.Toolkit.Uwp.Notifications.nuspec
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(DefineConstants);WINDOWS_UWP;WIN32
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
10.0.19041.0
16299
10.0.16299.0
+
+
+ $(DefineConstants);WINDOWS_UWP;WIN32
+
+
winmdobj
Full
UAP
- native
- UAP,Version=v10.0
+ native
+ UAP,Version=v10.0
uap10.0
10.0.19041.0
10240
10.0.10240.0
- $(DefineConstants);NETFX_CORE;WINDOWS_UWP;WINRT
+ $(DefineConstants);WINDOWS_UWP;WINRT
false
.NETCore
v5.0
$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v16.0\Microsoft.Windows.UI.Xaml.CSharp.targets
+ true
-
-
+
UAP$(TargetPlatformMinVersion.Replace('.', '_'))
true
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
buildOutput=bin\$(Configuration);version=$(Version)
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Properties/Microsoft.Toolkit.Uwp.Notifications.rd.xml b/Microsoft.Toolkit.Uwp.Notifications/Properties/Microsoft.Toolkit.Uwp.Notifications.rd.xml
index 88eeb44650a..dd9ceac8093 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Properties/Microsoft.Toolkit.Uwp.Notifications.rd.xml
+++ b/Microsoft.Toolkit.Uwp.Notifications/Properties/Microsoft.Toolkit.Uwp.Notifications.rd.xml
@@ -3,11 +3,12 @@
enabling the library to work in .NET Native even if developers modified their default rd.xml.
See issue https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3093 for more details.
-->
-
-
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index d61626fda16..b01b33efa3e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -1478,8 +1478,6 @@
false
prompt
true
-
- false
bin\ARM64\Release\
@@ -1530,12 +1528,6 @@
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Item.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Item.cs
index 947f0bb58f5..69841bfb421 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Item.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Item.cs
@@ -12,14 +12,16 @@ public class Item : BindableBase
public string Title
{
- get { return _title; } set { Set(ref _title, value); }
+ get { return _title; }
+ set { Set(ref _title, value); }
}
private bool? _isFavorite = default(bool);
public bool? IsFavorite
{
- get { return _isFavorite; } set { Set(ref _isFavorite, value); }
+ get { return _isFavorite; }
+ set { Set(ref _isFavorite, value); }
}
private DelegateCommand _toggleFavorite = default(DelegateCommand);
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml b/Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml
index e6a2af0492e..1182c415d85 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml
@@ -14,7 +14,6 @@
Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-->
-
-
-
-
-
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/readme.md b/Microsoft.Toolkit.Uwp.SampleApp/ReadMe.md
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/readme.md
rename to Microsoft.Toolkit.Uwp.SampleApp/ReadMe.md
diff --git a/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj b/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj
index 3c3579252a2..ba031e81491 100644
--- a/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj
+++ b/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj
@@ -133,8 +133,6 @@
ARM64
false
prompt
-
- false
bin\ARM64\Release\
@@ -147,14 +145,6 @@
prompt
-
-
-
-
+
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Properties/Microsoft.Windows.Toolkit.UI.Animations.rd.xml b/Microsoft.Toolkit.Uwp.UI.Animations/Properties/Microsoft.Toolkit.Uwp.UI.Animations.rd.xml
similarity index 75%
rename from Microsoft.Toolkit.Uwp.UI.Animations/Properties/Microsoft.Windows.Toolkit.UI.Animations.rd.xml
rename to Microsoft.Toolkit.Uwp.UI.Animations/Properties/Microsoft.Toolkit.Uwp.UI.Animations.rd.xml
index 844e0c79ce3..687805398c6 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Properties/Microsoft.Windows.Toolkit.UI.Animations.rd.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Properties/Microsoft.Toolkit.Uwp.UI.Animations.rd.xml
@@ -1,4 +1,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj b/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj
index 170c8c83688..4df1835eb14 100644
--- a/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj
@@ -24,8 +24,9 @@
+
-
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Properties/Microsoft.Toolkit.Uwp.UI.Behaviors.rd.xml b/Microsoft.Toolkit.Uwp.UI.Behaviors/Properties/Microsoft.Toolkit.Uwp.UI.Behaviors.rd.xml
index 13c73d0b935..1b01e3c7e14 100644
--- a/Microsoft.Toolkit.Uwp.UI.Behaviors/Properties/Microsoft.Toolkit.Uwp.UI.Behaviors.rd.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Behaviors/Properties/Microsoft.Toolkit.Uwp.UI.Behaviors.rd.xml
@@ -1,4 +1,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
index e94a9bfbc7c..7531d4fb22d 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
@@ -32,8 +32,6 @@
Text;Tool;Bar ;TextToolBar ;ToolBar ;Markdown;
Tile;Control ;TileControl ;
-
- false
9.0
@@ -63,4 +61,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
index e2b2776c039..095d16a7e1b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
@@ -1,4 +1,5 @@
+
uap10.0.17763
Windows Community Toolkit Controls DataGrid
@@ -8,8 +9,6 @@
Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Data;Grid;DataGrid
Microsoft.Toolkit.Uwp.UI.Controls
-
- false
@@ -44,4 +43,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Microsoft.Toolkit.UI.Controls.DataGrid.rd.xml b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.rd.xml
similarity index 76%
rename from Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Microsoft.Toolkit.UI.Controls.DataGrid.rd.xml
rename to Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.rd.xml
index 15cfe6473d5..74cc2593082 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Microsoft.Toolkit.UI.Controls.DataGrid.rd.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.rd.xml
@@ -1,4 +1,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj
index 13289df45fb..536296b3b50 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj
@@ -21,8 +21,6 @@
Remote;Device;Picker;RemoteDevicePicker;DevicePicker;RemoteDevice;
Tokenizing;Text;Box ;TokenizingTextBox ;TextBox ;
-
- false
8.0
@@ -53,4 +51,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
index c0b52c74354..a9caa86c08a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
@@ -30,7 +30,6 @@
Orbit;View ;OrbitView ;
Microsoft.Toolkit.Uwp.UI.Controls
- false
8.0
@@ -60,4 +59,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
index 673a5987986..429caee440f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
@@ -1,4 +1,5 @@
+
uap10.0.17763
Windows Community Toolkit Controls Markdown
@@ -8,8 +9,6 @@
Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Markdown;Text;Block;MarkdownTextBlock
Microsoft.Toolkit.Uwp.UI.Controls
-
- false
@@ -48,4 +47,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
index 0f3cad4d279..648ed7804a1 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -17,8 +17,6 @@
Image;Cropper ;ImageCropper ;Crop;
Infinite;Canvas;InfiniteCanvas;
-
- false
8.0
@@ -46,4 +44,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/Microsoft.Toolkit.Uwp.UI.Controls.Media.rd.xml
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/Microsoft.Toolkit.Uwp.UI.Controls.Media.rd.xml
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
index 0c054f43947..f0d0e06e8e3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
@@ -1,58 +1,57 @@
-
- uap10.0.17763
- Windows Community Toolkit Primitive Controls
-
- This library provides controls for use in XAML which don't provide their own style. It is part of the Windows Community Toolkit.
-
- Controls:
- - AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space.
- - DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other.
- - StaggeredLayout: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
- - StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
- - SwitchPresenter: A presenter which can act as a switch statement for layout providing alternate layouts based on a value.
- - UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space.
- - WrapLayout: Positions child elements in sequential position from left to right and breaks content to the next line.
- - WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line.
-
-
- Windows;Community;Toolkit;WCT;UWP;Controls;XAML;
- Adaptive;Grid;View;AdaptiveGridView;GridView ;AdaptiveGrid ;
- Dock;Panel ;DockPanel ;
- Staggered;Layout ;StaggeredLayout ;
- Staggered;Panel ;StaggeredPanel ;
- Switch;Presenter ;SwitchPresenter ;
- Uniform;Grid ;UniformGrid ;
- Wrap;Layout ;WrapLayout ;
- Wrap;Panel ;WrapPanel ;
-
-
- false
- 8.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ uap10.0.17763
+ Windows Community Toolkit Primitive Controls
+
+ This library provides controls for use in XAML which don't provide their own style. It is part of the Windows Community Toolkit.
+
+ Controls:
+ - AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space.
+ - DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other.
+ - StaggeredLayout: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
+ - StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
+ - SwitchPresenter: A presenter which can act as a switch statement for layout providing alternate layouts based on a value.
+ - UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space.
+ - WrapLayout: Positions child elements in sequential position from left to right and breaks content to the next line.
+ - WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line.
+
+
+ Windows;Community;Toolkit;WCT;UWP;Controls;XAML;
+ Adaptive;Grid;View;AdaptiveGridView;GridView ;AdaptiveGrid ;
+ Dock;Panel ;DockPanel ;
+ Staggered;Layout ;StaggeredLayout ;
+ Staggered;Panel ;StaggeredPanel ;
+ Switch;Presenter ;SwitchPresenter ;
+ Uniform;Grid ;UniformGrid ;
+ Wrap;Layout ;WrapLayout ;
+ Wrap;Panel ;WrapPanel ;
+
+ 8.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.rd.xml
similarity index 76%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml
rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.rd.xml
index d46676b6f63..6878c0d7137 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.rd.xml
@@ -1,4 +1,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index 9fc21c1851a..ee87b6ca251 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -1,4 +1,5 @@
+
uap10.0.17763
Windows Community Toolkit Controls
@@ -11,7 +12,7 @@
-
+
@@ -20,4 +21,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/readme.txt b/Microsoft.Toolkit.Uwp.UI.Controls/ReadMe.md
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls/readme.txt
rename to Microsoft.Toolkit.Uwp.UI.Controls/ReadMe.md
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
index c49a4acd6d2..0a502cd7b2b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
@@ -50,4 +50,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Properties/Microsoft.Windows.Toolkit.UI.Media.rd.xml b/Microsoft.Toolkit.Uwp.UI.Media/Properties/Microsoft.Toolkit.Uwp.UI.Media.rd.xml
similarity index 74%
rename from Microsoft.Toolkit.Uwp.UI.Media/Properties/Microsoft.Windows.Toolkit.UI.Media.rd.xml
rename to Microsoft.Toolkit.Uwp.UI.Media/Properties/Microsoft.Toolkit.Uwp.UI.Media.rd.xml
index f555bf7abe4..441e987ad63 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Properties/Microsoft.Windows.Toolkit.UI.Media.rd.xml
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Properties/Microsoft.Toolkit.Uwp.UI.Media.rd.xml
@@ -1,4 +1,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.UI/Properties/Microsoft.Windows.Toolkit.UI.rd.xml b/Microsoft.Toolkit.Uwp.UI/Properties/Microsoft.Toolkit.Uwp.UI.rd.xml
similarity index 74%
rename from Microsoft.Toolkit.Uwp.UI/Properties/Microsoft.Windows.Toolkit.UI.rd.xml
rename to Microsoft.Toolkit.Uwp.UI/Properties/Microsoft.Toolkit.Uwp.UI.rd.xml
index 936c5fe8a73..30ac8433878 100644
--- a/Microsoft.Toolkit.Uwp.UI/Properties/Microsoft.Windows.Toolkit.UI.rd.xml
+++ b/Microsoft.Toolkit.Uwp.UI/Properties/Microsoft.Toolkit.Uwp.UI.rd.xml
@@ -1,4 +1,5 @@
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
index 45de3d034c2..d3ffcaaee12 100644
--- a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
+++ b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
@@ -9,9 +9,7 @@
-
-
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj
index 741665a4958..75a6ab8feee 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj
@@ -76,4 +76,6 @@
+
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Microsoft.Toolkit.csproj b/Microsoft.Toolkit/Microsoft.Toolkit.csproj
index db0abad5fe5..8b428ac2652 100644
--- a/Microsoft.Toolkit/Microsoft.Toolkit.csproj
+++ b/Microsoft.Toolkit/Microsoft.Toolkit.csproj
@@ -14,14 +14,14 @@
Windows;Community;Toolkit;WCT;UWP;Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;extensions;helpers
-
-
-
-
-
-
+
NETSTANDARD2_1_OR_GREATER
+
+
+
+
+
\ No newline at end of file
diff --git a/readme.md b/ReadMe.md
similarity index 100%
rename from readme.md
rename to ReadMe.md
diff --git a/SmokeTests/Properties/Default.rd.xml b/SmokeTests/Properties/Default.rd.xml
index ec0e6a457b6..dc591a4ce9c 100644
--- a/SmokeTests/Properties/Default.rd.xml
+++ b/SmokeTests/Properties/Default.rd.xml
@@ -14,7 +14,6 @@
Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-->
-
-
-
-
-
\ No newline at end of file
diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj
index b7b8d71462f..f06f20c2188 100644
--- a/SmokeTests/SmokeTest.csproj
+++ b/SmokeTests/SmokeTest.csproj
@@ -111,7 +111,7 @@
- 2.4.3
+ 2.5.0
@@ -123,10 +123,12 @@
-
-
+
+
-
-
+
+
+
+
\ No newline at end of file
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index e2d34046e76..60a18ffc54b 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -49,10 +49,10 @@
+ Properties="CurrentProject=%(ProjectsToBuild.Identity);Configuration=%(ProjectsToBuild.Configuration);Platform=%(ProjectsToBuild.Platform);NuGetPackageVersion=$(NuGetPackageVersion)" />
-
+
@@ -80,14 +80,14 @@
-
+
- ../bin/nupkg/*.nupkg
+ $(MSBuildThisFileDirectory)..\bin\nupkg\*.nupkg
-
+
-
+
\ No newline at end of file
diff --git a/UITests/UITests.App/Properties/Default.rd.xml b/UITests/UITests.App/Properties/Default.rd.xml
index ec0e6a457b6..dc591a4ce9c 100644
--- a/UITests/UITests.App/Properties/Default.rd.xml
+++ b/UITests/UITests.App/Properties/Default.rd.xml
@@ -14,7 +14,6 @@
Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-->
-
-
-
-
-
\ No newline at end of file
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index a3a9ce66685..04abff88fd8 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -28,8 +28,6 @@
True
true
-
-
true
bin\x86\Debug\
@@ -242,12 +240,7 @@
14.0
-
+
+
\ No newline at end of file
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
index f03aa9eecd3..f6fc741fabc 100644
--- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -56,7 +56,7 @@
-
+
diff --git a/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj b/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj
index 501234995d0..68c1befb2bf 100644
--- a/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj
+++ b/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/Properties/Default.rd.xml b/UnitTests/UnitTests.HighPerformance.UWP/Properties/Default.rd.xml
index 996a8392ada..dc591a4ce9c 100644
--- a/UnitTests/UnitTests.HighPerformance.UWP/Properties/Default.rd.xml
+++ b/UnitTests/UnitTests.HighPerformance.UWP/Properties/Default.rd.xml
@@ -14,7 +14,6 @@
Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-->
-
-
-
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj b/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj
index 4c55bee0aa4..b565a8fb36e 100644
--- a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj
+++ b/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj
@@ -20,8 +20,6 @@
true
8.0
-
-
true
bin\x86\Debug\
@@ -173,11 +171,6 @@
14.0
-
+
+
\ No newline at end of file
diff --git a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
index 42ef917bb81..668fa700842 100644
--- a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
+++ b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
@@ -8,14 +8,14 @@
-
+
-
+
diff --git a/UnitTests/UnitTests.Notifications.UWP/Properties/UnitTestApp.rd.xml b/UnitTests/UnitTests.Notifications.UWP/Properties/UnitTestApp.rd.xml
index c58aac08178..e8a3009f373 100644
--- a/UnitTests/UnitTests.Notifications.UWP/Properties/UnitTestApp.rd.xml
+++ b/UnitTests/UnitTests.Notifications.UWP/Properties/UnitTestApp.rd.xml
@@ -14,7 +14,6 @@
Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-->
-
-
-
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
index c91da440729..4ff0203765f 100644
--- a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
+++ b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
@@ -18,8 +18,6 @@
$(VisualStudioVersion)
false
-
-
true
bin\x86\Debug\
@@ -179,11 +177,6 @@
14.0
-
+
+
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Notifications.WinRT/Properties/UnitTestApp.rd.xml b/UnitTests/UnitTests.Notifications.WinRT/Properties/UnitTestApp.rd.xml
index c58aac08178..e8a3009f373 100644
--- a/UnitTests/UnitTests.Notifications.WinRT/Properties/UnitTestApp.rd.xml
+++ b/UnitTests/UnitTests.Notifications.WinRT/Properties/UnitTestApp.rd.xml
@@ -14,7 +14,6 @@
Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-->
-
-
-
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
index 062d1c4e9ae..9bfb0fd19f3 100644
--- a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
+++ b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
@@ -18,8 +18,6 @@
$(VisualStudioVersion)
false
-
-
true
bin\x86\Debug\
@@ -178,11 +176,6 @@
-
+
+
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_LogicalTreeExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_LogicalTreeExtensions.cs
index ed3dd35f4ed..de8d3a8ae4c 100644
--- a/UnitTests/UnitTests.UWP/Extensions/Test_LogicalTreeExtensions.cs
+++ b/UnitTests/UnitTests.UWP/Extensions/Test_LogicalTreeExtensions.cs
@@ -126,17 +126,17 @@ public async Task Test_LogicalTree_FindChild_NoVisualTree_Exists()
await App.DispatcherQueue.EnqueueAsync(() =>
{
var treeRoot = XamlReader.Load(@"
-
+ xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+ xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
-
-
-
-
-
+
+
+
+
+
+
+
-
") as Page;
// Test Setup
diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs
index d42c60d188c..d089ed0676a 100644
--- a/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs
+++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs
@@ -383,11 +383,14 @@ public void Paragraph_Entities()
♥
♦"),
new ParagraphBlock().AddChildren(
- new TextRunInline { Text = @""" & ' < > ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ " +
+ new TextRunInline
+ {
+ Text = @""" & ' < > ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ " +
"¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô " +
"õ ö ÷ ø ù ú û ü ý þ ÿ Œ œ Š š Ÿ ƒ ˆ ˜ Α Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ Ν Ξ Ο Π Ρ Σ Τ Υ Φ Χ Ψ Ω α β γ δ ε ζ η θ ι κ λ " +
"μ ν ξ ο π ρ ς σ τ υ φ χ ψ ω ϑ ϒ ϖ – — ‘ ’ ‚ “ ” „ † ‡ • … ‰ ′ ″ ‹ › ‾ ⁄ € ℑ ℘ ℜ ™ ℵ ← ↑ → ↓ ↔ ↵ ⇐ " +
- "⇑ ⇒ ⇓ ⇔ ∀ ∂ ∃ ∅ ∇ ∈ ∉ ∋ ∏ ∑ − ∗ √ ∝ ∞ ∠ ∧ ∨ ∩ ∪ ∫ ∴ ∼ ≅ ≈ ≠ ≡ ≤ ≥ ⊂ ⊃ ⊄ ⊆ ⊇ ⊕ ⊗ ⊥ ⋅ ⌈ ⌉ ⌊ ⌋ 〈 〉 ◊ ♠ ♣ ♥ ♦" }));
+ "⇑ ⇒ ⇓ ⇔ ∀ ∂ ∃ ∅ ∇ ∈ ∉ ∋ ∏ ∑ − ∗ √ ∝ ∞ ∠ ∧ ∨ ∩ ∪ ∫ ∴ ∼ ≅ ≈ ≠ ≡ ≤ ≥ ⊂ ⊃ ⊄ ⊆ ⊇ ⊕ ⊗ ⊥ ⋅ ⌈ ⌉ ⌊ ⌋ 〈 〉 ◊ ♠ ♣ ♥ ♦"
+ }));
}
#pragma warning restore CS0618 // Type or member is obsolete
}
diff --git a/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml b/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml
index 592ef8b1d7a..84f46a97429 100644
--- a/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml
+++ b/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml
@@ -14,7 +14,6 @@
Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-->
-
-
-
+
+
@@ -37,7 +36,6 @@
-
-
+
\ No newline at end of file
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 37ed64fece1..32665941d43 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -19,8 +19,6 @@
false
9.0
-
-
true
bin\x86\Debug\
@@ -538,11 +536,6 @@
true
-
+
+
\ No newline at end of file
diff --git a/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj b/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj
index b5426c5ca39..6d4a34b7d6f 100644
--- a/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj
+++ b/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj
@@ -94,4 +94,6 @@
+
+
\ No newline at end of file
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/Properties/Default.rd.xml b/UnitTests/UnitTests.XamlIslands.UWPApp/Properties/Default.rd.xml
index ec0e6a457b6..dc591a4ce9c 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/Properties/Default.rd.xml
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/Properties/Default.rd.xml
@@ -14,7 +14,6 @@
Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-->
-
-
-
-
-
\ No newline at end of file
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index 0355214ed13..950b4b4691b 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -17,8 +17,6 @@
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
true
false
- false
- false
true
@@ -225,11 +223,6 @@
14.0
-
+
+
\ No newline at end of file