From 13bfbf21c7e22556e40431722d638bd119ef0c87 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:07 +0530 Subject: [PATCH 01/13] Fix Markdown tests with trailing whitespace As we save files with trailing white-space removed, the markdown parser tests that depends on the text with trailing white-space fails. So, to prevent any future formatting changes affecting the test result, we'll replace the actual trailing space(s) with an interpolated variable containing those trailing space(s). --- .../Markdown/Parse/ParagraphTests.cs | 22 +++++++++++-------- .../Markdown/Parse/QuoteTests.cs | 20 ++++++++++------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs index 4d09e452f7a..d42c60d188c 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs @@ -36,8 +36,9 @@ line 1 public void Paragraph_NoLineBreak_OneSpace() { // A line break in the markup does not translate to a line break in the resulting formatted text. - AssertEqual(CollapseWhitespace(@" - line 1 + var space = " "; + AssertEqual(CollapseWhitespace($@" + line 1{space} line 2"), new ParagraphBlock().AddChildren( new TextRunInline { Text = "line 1 line 2" })); @@ -48,9 +49,10 @@ line 1 public void Paragraph_LineBreak() { // Two spaces at the end of the line results in a line break. - AssertEqual(CollapseWhitespace(@" - line 1 - line 2 with *italic + var spaces = " "; + AssertEqual(CollapseWhitespace($@" + line 1{spaces} + line 2 with *italic{spaces} formatting*"), new ParagraphBlock().AddChildren( new TextRunInline { Text = "line 1\r\nline 2 with " }, @@ -63,8 +65,9 @@ line 2 with *italic public void Paragraph_LineBreak_ThreeSpaces() { // Three spaces at the end of the line also results in a line break. - AssertEqual(CollapseWhitespace(@" - line 1 + var spaces = " "; + AssertEqual(CollapseWhitespace($@" + line 1{spaces} line 2"), new ParagraphBlock().AddChildren( new TextRunInline { Text = "line 1 \r\nline 2" })); @@ -90,9 +93,10 @@ line 1 public void Paragraph_NewParagraph_Whitespace() { // A line that contains only whitespace starts a new paragraph. - AssertEqual(CollapseWhitespace(@" + var spaces = " "; + AssertEqual(CollapseWhitespace($@" line 1 - + {spaces} line 2"), new ParagraphBlock().AddChildren( new TextRunInline { Text = "line 1" }), diff --git a/UnitTests/UnitTests.UWP/Markdown/Parse/QuoteTests.cs b/UnitTests/UnitTests.UWP/Markdown/Parse/QuoteTests.cs index de66a966f91..1803e06aa77 100644 --- a/UnitTests/UnitTests.UWP/Markdown/Parse/QuoteTests.cs +++ b/UnitTests/UnitTests.UWP/Markdown/Parse/QuoteTests.cs @@ -29,10 +29,11 @@ public void Quote_SingleLine() [TestCategory("Parse - block")] public void Quote_MultiLine_1() { - AssertEqual(CollapseWhitespace(@" + var spaces = " "; + AssertEqual(CollapseWhitespace($@" > Single line - >Quote + >Quote{spaces} with line break @@ -96,11 +97,12 @@ public void Quote_WithHeader() [TestCategory("Parse - block")] public void Quote_Nested() { - AssertEqual(CollapseWhitespace(@" + var empty = string.Empty; + AssertEqual(CollapseWhitespace($@" >Quoted >>Nested quote >Still nested - + {empty} >Not nested"), new QuoteBlock().AddChildren( new ParagraphBlock().AddChildren( @@ -178,10 +180,11 @@ public void Quote_Invalid_Table() [TestCategory("Parse - block")] public void Quote_WithCode() { - AssertEqual(CollapseWhitespace(@" + var empty = string.Empty; + AssertEqual(CollapseWhitespace($@" > code, line 1 > - + {empty} > code, line 4"), new QuoteBlock().AddChildren( @@ -192,10 +195,11 @@ public void Quote_WithCode() [TestCategory("Parse - block")] public void Quote_WithList() { - AssertEqual(CollapseWhitespace(@" + var empty = string.Empty; + AssertEqual(CollapseWhitespace($@" > code, line 1 > - + {empty} > code, line 4"), new QuoteBlock().AddChildren( From e606ae8b23598c3df8885b5728012c3abe378709 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 16 Jul 2016 09:00:04 +0530 Subject: [PATCH 02/13] Fix corrupted emojis and symbols The emojis and symbols applied here were corrupted since the following patch. ``` Commit: 7da44428ac4cdd5593243c0d37205f02ce6fd800 Author: David Catuhe Date : Fri Jul 15 07:51:16 2016 -0700 Title : Fixed encodings ``` --- .../WeatherLiveTileAndToastCode.bind | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind index ea1d53fea9b..6482f647363 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind @@ -33,8 +33,8 @@ private void PopToast() { // We'll just add two simple lines of text builder - .AddText("Monday ? 63� / 42�") - .AddText("Tuesday ? 57� / 38�"); + .AddText("Monday ⛅ 63° / 42°") + .AddText("Tuesday ☁ 57° / 38°"); } // Set the base URI for the images, so we don't redundantly specify the entire path @@ -76,7 +76,7 @@ public static TileContent GenerateTileContent() builder.AddTile(Notifications.TileSize.Small) .SetTextStacking(TileTextStacking.Center, Notifications.TileSize.Small) .AddText("Mon", Notifications.TileSize.Small, hintStyle: AdaptiveTextStyle.Body, hintAlign: AdaptiveTextAlign.Center) - .AddText("63�", Notifications.TileSize.Small, hintStyle: AdaptiveTextStyle.Base, hintAlign: AdaptiveTextAlign.Center); + .AddText("63°", Notifications.TileSize.Small, hintStyle: AdaptiveTextStyle.Base, hintAlign: AdaptiveTextAlign.Center); // Medium Tile builder.AddTile(Notifications.TileSize.Medium) @@ -160,7 +160,7 @@ private static TileBindingContentAdaptive GenerateLargeTileContent() new AdaptiveText() { - Text = "63� / 42�" + Text = "63° / 42°" }, new AdaptiveText() @@ -221,14 +221,14 @@ private static AdaptiveSubgroup GenerateSubgroup(string day, string img, int tem // High temp new AdaptiveText() { - Text = tempHi + "�", + Text = tempHi + "°", HintAlign = AdaptiveTextAlign.Center }, // Low temp new AdaptiveText() { - Text = tempLo + "�", + Text = tempLo + "°", HintAlign = AdaptiveTextAlign.Center, HintStyle = AdaptiveTextStyle.CaptionSubtle } @@ -251,6 +251,6 @@ private static AdaptiveText GenerateLegacyToastText(string day, string weatherEm { return new AdaptiveText() { - Text = $"{day} {weatherEmoji} {tempHi}� / {tempLo}�" + Text = $"{day} {weatherEmoji} {tempHi}° / {tempLo}°" }; } \ No newline at end of file From c6d9fe4b48f526c2d1c803035767ea8da77a9638 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:17 +0530 Subject: [PATCH 03/13] Rename missed files from previous renames Runtime Directive files and the text files that have been missed in previous renames have been renamed as proposed! --- contributing.md => Contributing.md | 0 license.md => License.md | 0 .../{readme.md => ReadMe.md} | 0 ...icrosoft.Toolkit.Uwp.UI.Animations.rd.xml} | 1 + ...t.Toolkit.Uwp.UI.Controls.DataGrid.rd.xml} | 1 + ...soft.Toolkit.Uwp.UI.Controls.Media.rd.xml} | 0 ...Toolkit.Uwp.UI.Controls.Primitives.rd.xml} | 1 + .../{readme.txt => ReadMe.txt} | 32 ++++++++++--------- ... => Microsoft.Toolkit.Uwp.UI.Media.rd.xml} | 1 + ...rd.xml => Microsoft.Toolkit.Uwp.UI.rd.xml} | 1 + readme.md => ReadMe.md | 0 11 files changed, 22 insertions(+), 15 deletions(-) rename contributing.md => Contributing.md (100%) rename license.md => License.md (100%) rename Microsoft.Toolkit.Uwp.SampleApp/{readme.md => ReadMe.md} (100%) rename Microsoft.Toolkit.Uwp.UI.Animations/Properties/{Microsoft.Windows.Toolkit.UI.Animations.rd.xml => Microsoft.Toolkit.Uwp.UI.Animations.rd.xml} (75%) rename Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Properties/{Microsoft.Toolkit.UI.Controls.DataGrid.rd.xml => Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.rd.xml} (76%) rename Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/{Microsoft.Toolkit.Uwp.UI.Controls.rd.xml => Microsoft.Toolkit.Uwp.UI.Controls.Media.rd.xml} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/{Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml => Microsoft.Toolkit.Uwp.UI.Controls.Primitives.rd.xml} (76%) rename Microsoft.Toolkit.Uwp.UI.Controls/{readme.txt => ReadMe.txt} (59%) rename Microsoft.Toolkit.Uwp.UI.Media/Properties/{Microsoft.Windows.Toolkit.UI.Media.rd.xml => Microsoft.Toolkit.Uwp.UI.Media.rd.xml} (74%) rename Microsoft.Toolkit.Uwp.UI/Properties/{Microsoft.Windows.Toolkit.UI.rd.xml => Microsoft.Toolkit.Uwp.UI.rd.xml} (74%) rename readme.md => ReadMe.md (100%) diff --git a/contributing.md b/Contributing.md similarity index 100% rename from contributing.md rename to Contributing.md diff --git a/license.md b/License.md similarity index 100% rename from license.md rename to License.md 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.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.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.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/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/readme.txt b/Microsoft.Toolkit.Uwp.UI.Controls/ReadMe.txt similarity index 59% rename from Microsoft.Toolkit.Uwp.UI.Controls/readme.txt rename to Microsoft.Toolkit.Uwp.UI.Controls/ReadMe.txt index ae9bab5d700..03726191793 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/readme.txt +++ b/Microsoft.Toolkit.Uwp.UI.Controls/ReadMe.txt @@ -1,30 +1,32 @@ -Thanks for installing the Windows Community Toolkit Controls NuGet package! +Windows Community Toolkit — UWP Controls + +Thanks for installing the “Windows Community Toolkit — UI Controls” package! This is a meta-package made up of various Windows Community Toolkit packages. -It is for your ease and convenience to use all of the controls available! +It is for your ease and convenience to use any and all controls available! You also have the option to only use packages you need which can help optimize the size of your application once you are ready to ship. Visit https://aka.ms/wct/optimize to learn more. -You can find out more about the Windows Community Toolkit at https://aka.ms/windowstoolkit -Or even try our controls in our sample app at https://aka.ms/windowstoolkitapp -Docs are available here: https://aka.ms/windowstoolkitdocs +You can find out more about the Windows Community Toolkit at https://aka.ms/windowstoolkit. +Or even try our controls in our sample app at https://aka.ms/windowstoolkitapp. +Docs are available here: https://aka.ms/windowstoolkitdocs. The Windows Community Toolkit is made possible by our developer community! -Every contribution made to the Toolkit helps everyone, to learn how to contribute visit https://aka.ms/wct/wiki +Every contribution made to the Toolkit helps everyone, to learn how to contribute visit https://aka.ms/wct/wiki. ---- -This package also depends on the WinUI library, so you'll need to set XamlControlsResources as your Application resources in App.xaml: +This package also depends on the "WinUI" library, so you'll need to set "XamlControlsResources" as your Application resources in "App.xaml": - - - - - + + + + + -If you have other resources, then we recommend you add those to the XamlControlsResources' MergedDictionaries. -This works with the platform's resource system to allow overrides of the XamlControlsResources resources. +If you have other resources, then we recommend you add those to the "XamlControlsResources.MergedDictionaries". +This works with the platform's resource system to allow overrides of the "XamlControlsResources" resources. -See http://aka.ms/winui for more information about the WinUI library. +See http://aka.ms/winui for more information about the "WinUI" library. \ 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/readme.md b/ReadMe.md similarity index 100% rename from readme.md rename to ReadMe.md From 06362b21348b59a25efa2a3a19250bcd7b8d96e1 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:19 +0530 Subject: [PATCH 04/13] Fix-up new-lines across project files Add/Remove new-lines (only in project files, xml files and some source files) --- GazeInputTest/Properties/Default.rd.xml | 5 ----- .../Microsoft.Toolkit.Diagnostics.csproj | 7 ++++--- .../Microsoft.Toolkit.HighPerformance.csproj | 11 ++++++----- .../Microsoft.Toolkit.Uwp.Connectivity.csproj | 2 -- .../Microsoft.Toolkit.Uwp.Connectivity.rd.xml | 4 +--- .../Microsoft.Toolkit.Uwp.DeveloperTools.csproj | 1 + .../Microsoft.Toolkit.Uwp.Notifications.csproj | 2 -- .../Microsoft.Toolkit.Uwp.Notifications.rd.xml | 1 - .../Properties/Default.rd.xml | 5 ----- .../Microsoft.Toolkit.Uwp.UI.Behaviors.csproj | 1 + .../Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj | 1 + .../Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj | 2 ++ .../Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj | 1 + .../Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj | 1 + .../Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj | 2 ++ .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj | 1 + .../Microsoft.Toolkit.Uwp.UI.Controls.csproj | 2 ++ .../Microsoft.Toolkit.Uwp.UI.Media.csproj | 1 + Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj | 2 -- SmokeTests/Properties/Default.rd.xml | 5 ----- UITests/UITests.App/Properties/Default.rd.xml | 5 ----- .../Properties/Default.rd.xml | 3 --- .../Properties/UnitTestApp.rd.xml | 3 --- .../Properties/UnitTestApp.rd.xml | 3 --- UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml | 4 +--- .../Properties/Default.rd.xml | 5 ----- 26 files changed, 25 insertions(+), 55 deletions(-) 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/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj b/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj index f000abc9985..d1842daff13 100644 --- a/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj +++ b/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj @@ -13,33 +13,34 @@ 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..71af0b4cc9f 100644 --- a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj +++ b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj @@ -24,10 +24,10 @@ Windows;Community;Toolkit;WCT;UWP;core;standard;unsafe;span;memory;string;array;stream;buffer;extensions;helpers;parallel;performance + - @@ -54,14 +54,13 @@ + - - @@ -75,17 +74,18 @@ NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT + NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT + - - - - + \ 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..ada2fbc15d1 100644 --- a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj +++ b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj @@ -26,4 +26,5 @@ + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj index 279f4de0c8b..9cc8d9e4c4a 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -8,7 +8,6 @@ - @@ -16,7 +15,6 @@ - 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..40d8edd8320 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,7 +3,6 @@ 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.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj b/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj index 170c8c83688..a995327553a 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 @@ -28,4 +28,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..4767f38f5ee 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 @@ -63,4 +63,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..f69439ba307 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 @@ -44,4 +45,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..4e4f2e62a0d 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 @@ -53,4 +53,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 dfd6bc9d053..8ce10335208 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 @@ -60,4 +60,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..ead1df07c5f 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 @@ -48,4 +49,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 f9848614394..b826cc905c3 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 @@ -46,4 +46,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..90fb80b3991 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 @@ -20,4 +21,5 @@ + \ No newline at end of file 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/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/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/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/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.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.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.UWP/Properties/UnitTestApp.rd.xml b/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml index 592ef8b1d7a..164874b6141 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 --> - - + @@ -38,6 +37,5 @@ - \ 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 From 7e379351e21cfb2fc3e4775c1b0ab5d5adb43bc6 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:20 +0530 Subject: [PATCH 05/13] Fix-up white-spaces across project files Add/Remove leading and trailing white-space (only in comments, code blocks, xml strings) --- Directory.Build.props | 12 +- Directory.Build.targets | 6 +- .../Microsoft.Toolkit.Diagnostics.csproj | 8 +- .../Microsoft.Toolkit.HighPerformance.csproj | 12 +- .../Microsoft.Toolkit.Mvvm.csproj | 4 +- ...Microsoft.Toolkit.Uwp.Notifications.csproj | 8 +- ....Toolkit.Uwp.UI.Controls.Primitives.csproj | 109 +++++++++--------- .../IncrementalLoadingCollection.cs | 2 +- Microsoft.Toolkit/Microsoft.Toolkit.csproj | 2 +- SmokeTests/SmokeTests.proj | 2 +- .../UITests.Tests.TAEF.csproj | 2 +- .../UnitTests.HighPerformance.NetCore.csproj | 2 +- .../UnitTests.NetCore.csproj | 2 +- .../Converters/Test_TaskResultConverter.cs | 2 +- .../Extensions/Test_LogicalTreeExtensions.cs | 18 +-- 15 files changed, 95 insertions(+), 96 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index d2d1e9e2707..3ba3147bea8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -62,8 +62,8 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - - + + @@ -71,7 +71,7 @@ - + @@ -103,10 +103,10 @@ stylecop.json - - + + - + 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/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj b/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj index d1842daff13..9687d8b3413 100644 --- a/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj +++ b/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj @@ -15,7 +15,7 @@ - + @@ -24,14 +24,14 @@ - + - + NETSTANDARD2_1_OR_GREATER @@ -41,7 +41,7 @@ - + NETSTANDARD2_1_OR_GREATER diff --git a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj index 71af0b4cc9f..2fb567c874b 100644 --- a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj +++ b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj @@ -26,7 +26,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -75,13 +75,13 @@ - + NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT - + @@ -97,7 +97,7 @@ - + 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.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj index 9cc8d9e4c4a..9fb33e41d6a 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -3,13 +3,13 @@ netstandard1.4;uap10.0.19041;net461;netcoreapp3.1;net5.0;net5.0-windows10.0.17763.0;native $(DefineConstants);NETFX_CORE - true + true Microsoft.Toolkit.Uwp.Notifications.nuspec - + @@ -17,13 +17,13 @@ - + $(DefineConstants);WINDOWS_UWP;WIN32 - + 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/IncrementalLoadingCollection/IncrementalLoadingCollection.cs b/Microsoft.Toolkit.Uwp/IncrementalLoadingCollection/IncrementalLoadingCollection.cs index 53adfb85699..de5eb12721e 100644 --- a/Microsoft.Toolkit.Uwp/IncrementalLoadingCollection/IncrementalLoadingCollection.cs +++ b/Microsoft.Toolkit.Uwp/IncrementalLoadingCollection/IncrementalLoadingCollection.cs @@ -232,7 +232,7 @@ protected virtual async Task> LoadDataAsync(CancellationToken .ContinueWith( t => { - if(t.IsFaulted) + if (t.IsFaulted) { throw t.Exception; } diff --git a/Microsoft.Toolkit/Microsoft.Toolkit.csproj b/Microsoft.Toolkit/Microsoft.Toolkit.csproj index db0abad5fe5..ef03f50f68d 100644 --- a/Microsoft.Toolkit/Microsoft.Toolkit.csproj +++ b/Microsoft.Toolkit/Microsoft.Toolkit.csproj @@ -20,7 +20,7 @@ - + NETSTANDARD2_1_OR_GREATER diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj index e2d34046e76..709cc000707 100644 --- a/SmokeTests/SmokeTests.proj +++ b/SmokeTests/SmokeTests.proj @@ -49,7 +49,7 @@ + Properties="CurrentProject=%(ProjectsToBuild.Identity);Configuration=%(ProjectsToBuild.Configuration);Platform=%(ProjectsToBuild.Platform);NuGetPackageVersion=$(NuGetPackageVersion)" /> 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.NetCore/UnitTests.NetCore.csproj b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj index 42ef917bb81..6a53f4cfc12 100644 --- a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj +++ b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj @@ -15,7 +15,7 @@ - + diff --git a/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs b/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs index 9e1cacb9b7b..3c615928ac5 100644 --- a/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs +++ b/UnitTests/UnitTests.UWP/Converters/Test_TaskResultConverter.cs @@ -77,7 +77,7 @@ public void Test_TaskResultConverter_Instance_UnsetValue() Assert.AreEqual(DependencyProperty.UnsetValue, converter.Convert(null, null, null, null)); Assert.AreEqual(DependencyProperty.UnsetValue, converter.Convert("Hello world", null, null, null)); - } + } [TestCategory("Converters")] [UITestMethod] 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 From 8d205a1096f10d63f9872f6357cbae43be0c9b9b Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:22 +0530 Subject: [PATCH 06/13] Fix-up comments across project files Format comments to be legible. - Place comment start and end tags on a new line for multi-line comments. - Have space between start and end tags in a single line comment. Place comments where appropriate. - If an entire block is common to the comment then place it above the block. - Only place a comment near or after the block, if it refers exclusively. Sources are not formatted! --- Directory.Build.props | 6 +- .../Microsoft.Toolkit.Diagnostics.csproj | 6 +- .../Microsoft.Toolkit.HighPerformance.csproj | 56 ++++++++++--------- .../Microsoft.Toolkit.Uwp.Connectivity.rd.xml | 25 --------- ...icrosoft.Toolkit.Uwp.DeveloperTools.rd.xml | 1 + ...Microsoft.Toolkit.Uwp.Notifications.csproj | 5 +- ...Microsoft.Toolkit.Uwp.Notifications.rd.xml | 6 +- .../Microsoft.Toolkit.Uwp.UI.Behaviors.rd.xml | 1 + 8 files changed, 45 insertions(+), 61 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3ba3147bea8..1ce8326b3e2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -54,11 +54,11 @@ - + true - + true - + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb diff --git a/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj b/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj index 9687d8b3413..531855099c1 100644 --- a/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj +++ b/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj @@ -16,8 +16,8 @@ + - @@ -25,8 +25,8 @@ + - @@ -35,8 +35,8 @@ NETSTANDARD2_1_OR_GREATER + - diff --git a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj index 2fb567c874b..ca23086fd38 100644 --- a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj +++ b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj @@ -27,14 +27,16 @@ + - @@ -46,8 +48,8 @@ + - @@ -56,21 +58,23 @@ + - - + + 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 @@ -85,14 +89,16 @@ + - NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT;NETCORE_RUNTIME 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 912128a846c..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,28 +1,3 @@ - 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/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj index 9fb33e41d6a..1ff5d84a60a 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -70,13 +70,12 @@ v5.0 $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v16.0\Microsoft.Windows.UI.Xaml.CSharp.targets - - + 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 40d8edd8320..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 @@ -5,8 +5,10 @@ --> - + \ 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 From 7586eeb013380a15bc0cbb2e36f591553c5b297f Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:24 +0530 Subject: [PATCH 07/13] Reorder code-blocks for better readability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To make diff understandable through blame and across similar project files, I have re-organized some lines in these project files. This also improves readability. Previously, the focus is per-project file but now—to maintain project logic across repos and several similar logic across project files, new way of authoring project files is required. This refactor is the start of it. --- Directory.Build.props | 2 +- .../Microsoft.Toolkit.HighPerformance.csproj | 22 ++--- ...Microsoft.Toolkit.Uwp.Notifications.csproj | 80 +++++++++---------- .../Microsoft.Toolkit.Uwp.UI.Behaviors.csproj | 2 +- Microsoft.Toolkit/Microsoft.Toolkit.csproj | 10 +-- .../Properties/UnitTestApp.rd.xml | 4 +- 6 files changed, 58 insertions(+), 62 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1ce8326b3e2..e6a51e995f6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -45,8 +45,8 @@ - false false + false diff --git a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj index ca23086fd38..258ad9de37e 100644 --- a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj +++ b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj @@ -58,11 +58,6 @@ - - - - - + NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT + + + + @@ -86,9 +86,6 @@ - - - - - - - - - - - - - - $(DefineConstants);WINDOWS_UWP;WIN32 - - - - - - - - - - - - - - - - - - - - - - - - - - - 10.0.19041.0 16299 10.0.16299.0 + + + $(DefineConstants);WINDOWS_UWP;WIN32 + + winmdobj Full @@ -64,17 +28,49 @@ 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 a995327553a..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,9 +24,9 @@ + - \ No newline at end of file diff --git a/Microsoft.Toolkit/Microsoft.Toolkit.csproj b/Microsoft.Toolkit/Microsoft.Toolkit.csproj index ef03f50f68d..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/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml b/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml index 164874b6141..84f46a97429 100644 --- a/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml +++ b/UnitTests/UnitTests.UWP/Properties/UnitTestApp.rd.xml @@ -27,7 +27,7 @@ - + @@ -36,6 +36,6 @@ - + \ No newline at end of file From 53a76353ce08617a29c0d27d9cbf6711f6aa4d6f Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:25 +0530 Subject: [PATCH 08/13] Use correct casing for certain terminologies Change Nuget -> NuGet --- .../Microsoft.Toolkit.Uwp.Notifications.csproj | 4 ++-- SmokeTests/SmokeTest.csproj | 8 ++++---- SmokeTests/SmokeTests.proj | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj index 2fb5f67c89c..72ff8ad6041 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -22,8 +22,8 @@ Full UAP - native - UAP,Version=v10.0 + native + UAP,Version=v10.0 uap10.0 10.0.19041.0 10240 diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj index b7b8d71462f..d478972c6c6 100644 --- a/SmokeTests/SmokeTest.csproj +++ b/SmokeTests/SmokeTest.csproj @@ -123,10 +123,10 @@ - - + + - - + + \ No newline at end of file diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj index 709cc000707..8882816bfaa 100644 --- a/SmokeTests/SmokeTests.proj +++ b/SmokeTests/SmokeTests.proj @@ -52,7 +52,7 @@ Properties="CurrentProject=%(ProjectsToBuild.Identity);Configuration=%(ProjectsToBuild.Configuration);Platform=%(ProjectsToBuild.Platform);NuGetPackageVersion=$(NuGetPackageVersion)" /> - + @@ -80,14 +80,14 @@ - + - ../bin/nupkg/*.nupkg + ../bin/nupkg/*.nupkg - + - + \ No newline at end of file From 54ffaf9deea35f6fcb45371141ded7591e04c30f Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:27 +0530 Subject: [PATCH 09/13] Remove un-necessary build logic across project files Remove commented build logic Remove duplicated build logic --- GazeInputTest/GazeInputTest.csproj | 10 ---------- .../Microsoft.Toolkit.Uwp.DeveloperTools.csproj | 2 -- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 2 -- ...icrosoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj | 9 --------- .../Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj | 2 -- .../Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj | 2 -- .../Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj | 2 -- .../Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj | 1 - .../Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj | 2 -- .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj | 2 -- UITests/UITests.App/UITests.App.csproj | 7 ------- .../UnitTests.HighPerformance.UWP.csproj | 7 ------- .../UnitTests.Notifications.UWP.csproj | 7 ------- .../UnitTests.Notifications.WinRT.csproj | 7 ------- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 7 ------- .../UnitTests.XamlIslands.UWPApp.csproj | 9 --------- 16 files changed, 78 deletions(-) diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj index bad303797f2..bd179de9d51 100644 --- a/GazeInputTest/GazeInputTest.csproj +++ b/GazeInputTest/GazeInputTest.csproj @@ -151,9 +151,6 @@ 6.2.12 - - 1.0.2 - @@ -165,11 +162,4 @@ 14.0 - \ 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 ada2fbc15d1..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 diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index d61626fda16..2e220f9e22d 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\ 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..2a1948df4af 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,13 +145,6 @@ prompt - 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 4767f38f5ee..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 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 f69439ba307..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 @@ -9,8 +9,6 @@ Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Data;Grid;DataGrid Microsoft.Toolkit.Uwp.UI.Controls - - false 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 4e4f2e62a0d..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 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 8ce10335208..c0f50de8576 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 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 ead1df07c5f..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 @@ -9,8 +9,6 @@ Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Markdown;Text;Block;MarkdownTextBlock Microsoft.Toolkit.Uwp.UI.Controls - - false 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 b826cc905c3..a9ab931313f 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 diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj index a3a9ce66685..7649364817d 100644 --- a/UITests/UITests.App/UITests.App.csproj +++ b/UITests/UITests.App/UITests.App.csproj @@ -242,12 +242,5 @@ 14.0 - \ 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..440e4642941 100644 --- a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj +++ b/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj @@ -173,11 +173,4 @@ 14.0 - \ 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..9fb35e2d10a 100644 --- a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj +++ b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj @@ -179,11 +179,4 @@ 14.0 - \ 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..fe63a956ab3 100644 --- a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj +++ b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj @@ -178,11 +178,4 @@ - \ No newline at end of file diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index c7b790ad8b4..71bc782a2d9 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -546,11 +546,4 @@ true - \ 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..b5d8c376f39 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,4 @@ 14.0 - \ No newline at end of file From 7c61d09be3258728f929c188d2a579dff05c71a2 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:28 +0530 Subject: [PATCH 10/13] Remove projects that are not required to be packed Override projects with an empty Pack target that are not packed into packages. This will prevent any any packages being accidentally produced. --- Directory.Build.props | 5 +++++ GazeInputTest/GazeInputTest.csproj | 2 ++ .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 2 ++ .../Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj | 5 ++--- ....Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj | 2 ++ SmokeTests/SmokeTest.csproj | 2 ++ UITests/UITests.App/UITests.App.csproj | 4 ++-- .../UnitTests.HighPerformance.UWP.csproj | 4 ++-- .../UnitTests.Notifications.UWP.csproj | 4 ++-- .../UnitTests.Notifications.WinRT.csproj | 4 ++-- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 4 ++-- .../UnitTests.XamlIslands.Package.wapproj | 2 ++ .../UnitTests.XamlIslands.UWPApp.csproj | 2 ++ 13 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e6a51e995f6..790b569d0e8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -31,6 +31,11 @@ true + + + false + + diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj index bd179de9d51..cca2cf2c13f 100644 --- a/GazeInputTest/GazeInputTest.csproj +++ b/GazeInputTest/GazeInputTest.csproj @@ -162,4 +162,6 @@ 14.0 + + \ 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 2e220f9e22d..a362deb594a 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -1536,4 +1536,6 @@ + + \ No newline at end of file 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 2a1948df4af..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 @@ -145,7 +145,6 @@ prompt - - - + + \ 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/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj index d478972c6c6..a4a8c99b103 100644 --- a/SmokeTests/SmokeTest.csproj +++ b/SmokeTests/SmokeTest.csproj @@ -129,4 +129,6 @@ + + \ No newline at end of file diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj index 7649364817d..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\ @@ -243,4 +241,6 @@ + + \ 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 440e4642941..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,4 +171,6 @@ 14.0 + + \ 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 9fb35e2d10a..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,4 +177,6 @@ 14.0 + + \ 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 fe63a956ab3..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,4 +176,6 @@ + + \ No newline at end of file diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index 71bc782a2d9..df89e808f61 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\ @@ -546,4 +544,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/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj index b5d8c376f39..950b4b4691b 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj @@ -223,4 +223,6 @@ 14.0 + + \ No newline at end of file From aa5f174190943b565daa2cb6220b69f9308a52d7 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:30 +0530 Subject: [PATCH 11/13] Format missed files manually These files were not formatted by the dotnet format tool. So, manually formatting it by hand! --- Microsoft.Toolkit.Uwp.SampleApp/Models/Item.cs | 6 ++++-- UnitTests/UnitTests.UWP/Markdown/Parse/ParagraphTests.cs | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) 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/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 } From a52ad35d807d882cdd5debaedff0444c630b6498 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:31 +0530 Subject: [PATCH 12/13] Use Type aliasing instead of macros The .NET Formatter breaks in these scenarios. Improves maintainability of code in the long run. --- .../Adaptive/AdaptiveProgressBar.cs | 44 ++++++------------- .../Adaptive/AdaptiveText.cs | 17 +++---- 2 files changed, 23 insertions(+), 38 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveProgressBar.cs b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveProgressBar.cs index ced2e168357..1df297836b5 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveProgressBar.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveProgressBar.cs @@ -2,11 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +#pragma warning disable SA1121 // UseBuiltInTypeAlias + +using System; +using Microsoft.Toolkit.Uwp.Notifications.Adaptive.Elements; + #if WINRT using System.Collections.Generic; +using BindableProgressBarValue = Microsoft.Toolkit.Uwp.Notifications.AdaptiveProgressBarValue; +using BindableString = System.String; +#else +using BindableProgressBarValue = Microsoft.Toolkit.Uwp.Notifications.BindableProgressBarValue; +using BindableString = Microsoft.Toolkit.Uwp.Notifications.BindableString; #endif -using System; -using Microsoft.Toolkit.Uwp.Notifications.Adaptive.Elements; namespace Microsoft.Toolkit.Uwp.Notifications { @@ -25,46 +33,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..0279b856c3e 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveText.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveText.cs @@ -2,10 +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. +#pragma warning disable SA1121 // UseBuiltInTypeAlias + +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 +36,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 From c891e2948bcaaf30e285c16ee1b0e738fe407605 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:33 +0530 Subject: [PATCH 13/13] Consolidate package versions Update renamed files in the build logic Use correct path format in the build logic --- Directory.Build.props | 2 +- .../Microsoft.Toolkit.Uwp.UI.Controls.csproj | 2 +- SmokeTests/SmokeTest.csproj | 4 ++-- SmokeTests/SmokeTests.proj | 2 +- UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 790b569d0e8..aebd7b6929a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -108,7 +108,7 @@ stylecop.json - + 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 90fb80b3991..ced5a073978 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 @@ -12,7 +12,7 @@ - + diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj index a4a8c99b103..f06f20c2188 100644 --- a/SmokeTests/SmokeTest.csproj +++ b/SmokeTests/SmokeTest.csproj @@ -111,7 +111,7 @@ - 2.4.3 + 2.5.0 @@ -123,7 +123,7 @@ - + diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj index 8882816bfaa..60a18ffc54b 100644 --- a/SmokeTests/SmokeTests.proj +++ b/SmokeTests/SmokeTests.proj @@ -82,7 +82,7 @@ - ../bin/nupkg/*.nupkg + $(MSBuildThisFileDirectory)..\bin\nupkg\*.nupkg diff --git a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj index 6a53f4cfc12..668fa700842 100644 --- a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj +++ b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj @@ -8,7 +8,7 @@ - +