diff --git a/.gitignore b/.gitignore index e1269ff7fd7..f422ca85891 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,11 @@ ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. +# Working folders +~build/ +~publish/ +~packages/ + # User-specific files *.suo *.user @@ -18,7 +23,6 @@ [Rr]eleases/ x64/ x86/ -build/ bld/ [Bb]in/ [Oo]bj/ diff --git a/Directory.Build.props b/Directory.Build.props index 63fd9d141d7..c16e8639f2d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,7 @@ + + $(MSBuildThisFileDirectory) $(RepositoryDirectory)build\ @@ -11,7 +13,6 @@ true - $(RepositoryDirectory)bin\nupkg true true @@ -30,8 +31,8 @@ $(NoWarn);CS8002 - - true + + true @@ -47,7 +48,7 @@ false - + @@ -55,7 +56,7 @@ - + @@ -69,7 +70,7 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000000..a59013c3c83 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,101 @@ + + + + 2.0.3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Directory.Solution.props b/Directory.Solution.props new file mode 100644 index 00000000000..ac476e14109 --- /dev/null +++ b/Directory.Solution.props @@ -0,0 +1,14 @@ + + + + True + True + + + + + + False + + + \ No newline at end of file diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj index 28a650ed0be..3d3a4b93482 100644 --- a/GazeInputTest/GazeInputTest.csproj +++ b/GazeInputTest/GazeInputTest.csproj @@ -21,8 +21,7 @@ true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -30,8 +29,7 @@ true - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x86 @@ -42,8 +40,7 @@ true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -51,8 +48,7 @@ true - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM @@ -63,8 +59,7 @@ true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM64 false @@ -72,8 +67,7 @@ true - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM64 @@ -84,8 +78,7 @@ true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -93,8 +86,7 @@ true - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x64 @@ -141,9 +133,7 @@ - - 6.2.12 - + diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj index 4cd3b1c28d4..42227e6c263 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj +++ b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj @@ -1,4 +1,4 @@ - + uap10.0.17763 diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj index c5d5838785f..3e5daeae53a 100644 --- a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj +++ b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj @@ -1,4 +1,4 @@ - + uap10.0.17763 diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj index 0acc2d6fe2a..7a220a3046e 100644 --- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj +++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj @@ -1,4 +1,4 @@ - + uap10.0.17134 diff --git a/Microsoft.Toolkit.Uwp.Notifications/Badges/BadgeGlyphContent.cs b/Microsoft.Toolkit.Uwp.Notifications/Badges/BadgeGlyphContent.cs index 9532c066e97..089b7a719b0 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Badges/BadgeGlyphContent.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Badges/BadgeGlyphContent.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -#if WINDOWS_UWP +#if WINDOWS_UAP using Windows.Data.Xml.Dom; #endif @@ -80,7 +80,7 @@ public override string ToString() return GetContent(); } -#if WINDOWS_UWP +#if WINDOWS_UAP /// /// Retrieves the notification XML content as a WinRT Xml document. /// diff --git a/Microsoft.Toolkit.Uwp.Notifications/Badges/BadgeNumericContent.cs b/Microsoft.Toolkit.Uwp.Notifications/Badges/BadgeNumericContent.cs index a785eaa2693..76e42c7139d 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Badges/BadgeNumericContent.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Badges/BadgeNumericContent.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if WINDOWS_UWP +#if WINDOWS_UAP using Windows.Data.Xml.Dom; #endif @@ -62,7 +62,7 @@ public override string ToString() return GetContent(); } -#if WINDOWS_UWP +#if WINDOWS_UAP /// /// Retrieves the notification Xml content as a WinRT Xml document. /// diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/BaseElement.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/BaseElement.cs index 781f04f56f7..8ccdb0413d5 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Common/BaseElement.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Common/BaseElement.cs @@ -5,7 +5,7 @@ using System.IO; using System.Text; -#if WINDOWS_UWP +#if WINDOWS_UAP using Windows.Data.Xml.Dom; #endif @@ -40,7 +40,7 @@ public string GetContent() } } -#if WINDOWS_UWP +#if WINDOWS_UAP /// /// Retrieves the notification XML content as a WinRT XML document. /// diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/INotificationContent.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/INotificationContent.cs index 2523ac60968..e209ed3215a 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Common/INotificationContent.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Common/INotificationContent.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if WINDOWS_UWP +#if WINDOWS_UAP using Windows.Data.Xml.Dom; #endif @@ -19,7 +19,7 @@ public interface INotificationContent /// The notification Xml content as a string. string GetContent(); -#if WINDOWS_UWP +#if WINDOWS_UAP /// /// Retrieves the notification Xml content as a WinRT Xml document. /// diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/LimitedList{T}.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/LimitedList{T}.cs index 1814752979b..69fe19826ce 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Common/LimitedList{T}.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Common/LimitedList{T}.cs @@ -5,7 +5,7 @@ using System; using System.Collections; using System.Collections.Generic; -#if WINDOWS_UWP +#if WINDOWS_UAP #endif diff --git a/Microsoft.Toolkit.Uwp.Notifications/Common/NotificationContentValidationException.cs b/Microsoft.Toolkit.Uwp.Notifications/Common/NotificationContentValidationException.cs index 11aa4a4d4e3..0ebbf80f261 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Common/NotificationContentValidationException.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Common/NotificationContentValidationException.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -#if WINDOWS_UWP +#if WINDOWS_UAP #endif diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj index c97dc653fff..8b00aef3110 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -1,72 +1,67 @@ - + - netstandard1.4;uap10.0.19041;net461;netcoreapp3.1;net5.0;net5.0-windows10.0.17763.0;native - $(DefineConstants);NETFX_CORE + netstandard1.4;uap10.0.16299;net461;netcoreapp3.1;net5.0;net5.0-windows10.0.17763;native Microsoft.Toolkit.Uwp.Notifications.nuspec - - 10.0.19041.0 - 10.0.16299.0 + + 10.0.$(TargetPlatformRevision).0 - - - $(DefineConstants);WINDOWS_UWP;WIN32 + + $(DefineConstants);NETFX_CORE + + + + + $(DefineConstants);WINDOWS_UAP;WIN32 - winmdobj + Full + WinMDObj + uap10.0 + UAP - - native - UAP,Version=v10.0 - uap10.0 - 10.0.19041.0 10.0.10240.0 - $(DefineConstants);WINDOWS_UWP;WINRT - false .NETCore v5.0 + + false + $(DefineConstants);WINDOWS_UAP;WINRT $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets - true - - - UAP$(TargetPlatformMinVersion.Replace('.', '_')) - true + + UAP,Version=v10.0 + Native,Version=v0.0 - - - + - - - - - - - - - + - - + + + + + - + - + - + buildOutput=bin\$(Configuration);version=$(Version) diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec index 22a597a87df..8b96f8a3bd6 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec @@ -61,19 +61,19 @@ - - - + + + - - - - + + + + diff --git a/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md b/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md index bfc7d22d1ca..a794e1c3abe 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md +++ b/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md @@ -1,36 +1,38 @@ -Welcome to the Notifications section of the toolkit! This contains the Notifications library, including the object model for tile, toast, and badge XML (previously called NotificationsExtensions). +# UWP Notifications -## Where should I add new code? -Any code for generating notifications should be written in the Microsoft.Toolkit.Uwp.Notifications project. +Welcome to the Notifications section of the toolkit! This contains the Notifications library, including the object model for tile, toast, and badge XML (previously called `NotificationsExtensions`). -If there's UWP-specific code, use the appropriate `#ifdef`, `WINDOWS_UWP` or `WINRT`. +## Where should I add new code? -## What are all the projects for? -All the code is contained on the Microsoft.Toolkit.Uwp.Notifications project. +Any code for generating notifications should be written in the `Microsoft.Toolkit.Uwp.Notifications` project. -It outputs `netstandard1.4`, `uap10.0`, `native` for WinRT, and netcoreapp for .Net Core projects. The UWP library is only for C#, while the WinRT library is a Windows Runtime Component for C++. +If there's UWP-specific code, use the appropriate `#ifdef`, `WINDOWS_UAP` or `WINRT`. +## What are all the projects for? -| C# | C++ | -| ---------------- | ------------------- | -| NET Standard 1.4 | UWP WinRT Component | -| UWP C# DLL | | -| .Net Core DLL | | +All the code is contained on the `Microsoft.Toolkit.Uwp.Notifications` project. +It outputs `netstandard1.4`, `uap10.0`, `native` for WinRT, and `netcoreapp3.1` for .NET Core projects. The UWP library is only for C#, while the WinRT library is a Windows Runtime Component for C++. +| C# | C++ | +| --------------------- | ------------------- | +| .NET Standard Library | UWP WinRT Component | +| .NET Core Library | | +| UWP C# Library | | ## Scenarios we want to support -Imagine you add this library to a .NET Standard class library, and you also add it to your UWP app. In this case, your .NET Standard class library will receive the NETStandard dll. Your UWP project will receive the UWP dll. +Imagine you add this library to a .NET Standard class library, and you also add it to your UWP app. In this case, your .NET Standard class library will receive the .NET Standard DLL. Your UWP project will receive the UWP DLL. ## How are the test projects organized? -If you look in the UnitTests folder of the repo, you'll notice that there's three projects... - - UnitTests.Notifications.Shared - - UnitTests.Notifications.NetCore - - UnitTests.Notifications.UWP - - UnitTests.Notifications.WinRT +If you look in the `UnitTests` folder of the repo, you'll notice that there are three projects... + +- `UnitTests.Notifications.Shared` +- `UnitTests.Notifications.NetCore` +- `UnitTests.Notifications.UWP` +- `UnitTests.Notifications.WinRT` -That's because in our source code, we have some #IF defs for switching between the different types of reflection that C# uses, since it's different between a .NET Standard and WinRT code. +That's because in our source code, we have some `#ifdef` for switching between the different types of reflection that C# uses, since it's different between a .NET Standard and WinRT code. -Therefore, there are two different code paths, one path for NETFX_CORE, and another for when that isn't present. The two test projects exercise both code paths. +Therefore, there are two different code paths, one path for `NETFX_CORE`, and another for when that isn't present. The two test projects exercise both code paths. diff --git a/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileContent.cs b/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileContent.cs index dc3a622cb30..c0b921485f1 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileContent.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileContent.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if WINDOWS_UWP +#if WINDOWS_UAP using Windows.Data.Xml.Dom; using Windows.UI.Notifications; #endif @@ -28,7 +28,7 @@ public string GetContent() return ConvertToElement().GetContent(); } -#if WINDOWS_UWP +#if WINDOWS_UAP /// /// Retrieves the notification XML content as a WinRT XmlDocument, so that it can be used with a local Tile notification's constructor on either or . /// diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/CustomizeToast.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/CustomizeToast.cs index f7947126aa0..b8851313939 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/CustomizeToast.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/CustomizeToast.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if WINDOWS_UWP +#if WINDOWS_UAP using Windows.Foundation; using Windows.UI.Notifications; diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Visuals.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Visuals.cs index 49b99d9056b..770d21c4dbd 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Visuals.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Visuals.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; -#if WINDOWS_UWP +#if WINDOWS_UAP using Windows.UI.Notifications; #endif @@ -79,7 +79,7 @@ private IList VisualChildren } } -#if WINDOWS_UWP +#if WINDOWS_UAP #if !WINRT /// /// Create an instance of NotificationData that can be used to update toast that has a progress bar. diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs index 5349883b0d0..0dc3a3ad3f8 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs @@ -396,7 +396,7 @@ public ToastContent GetToastContent() return Content; } -#if WINDOWS_UWP +#if WINDOWS_UAP /// /// Retrieves the notification XML content as a WinRT XmlDocument, so that it can be used with a local Toast notification's constructor on either or . /// diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationHistoryCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationHistoryCompat.cs index 69104c2eefd..0d9f3bc5a9c 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationHistoryCompat.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationHistoryCompat.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if WINDOWS_UWP +#if WINDOWS_UAP using System.Collections.Generic; using Windows.UI.Notifications; diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs index 91a01a2adcb..059466b128d 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if WINDOWS_UWP +#if WINDOWS_UAP using System; using System.Collections.Generic; diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotifierCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotifierCompat.cs index da7667b6ed2..e346e46791c 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotifierCompat.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotifierCompat.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if WINDOWS_UWP +#if WINDOWS_UAP using System.Collections.Generic; using Windows.UI.Notifications; diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastContent.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastContent.cs index dfb44c75833..657631bf38a 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastContent.cs +++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastContent.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -#if WINDOWS_UWP +#if WINDOWS_UAP using Windows.Data.Xml.Dom; using Windows.UI.Notifications; #endif @@ -100,7 +100,7 @@ public string GetContent() return ConvertToElement().GetContent(); } -#if WINDOWS_UWP +#if WINDOWS_UAP /// /// Retrieves the notification XML content as a WinRT XmlDocument, so that it can be used with a local Toast notification's constructor on either or . diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index 2018763e733..62dbb7cfda7 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -1,4 +1,4 @@ - + Debug @@ -24,8 +24,7 @@ true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -34,8 +33,7 @@ $(OutputPath)$(AssemblyName).xml - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS + TRACE;NETFX_CORE;WINDOWS_UAP;REMOTE_DOCS true pdbonly x86 @@ -49,8 +47,7 @@ true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -58,8 +55,7 @@ true - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS + TRACE;NETFX_CORE;WINDOWS_UAP;REMOTE_DOCS true pdbonly ARM @@ -73,8 +69,7 @@ true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -82,8 +77,7 @@ true - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS + TRACE;NETFX_CORE;WINDOWS_UAP;REMOTE_DOCS true pdbonly x64 @@ -99,35 +93,18 @@ PackageReference - - 6.2.12 - - - 10.1901.28001 - - - 7.1.2 - + + + - - 2.7.0 - - - 0.7.0-alpha - - - 2.0.1 - - - 4.5.0 - + + + + - @@ -1493,6 +1470,7 @@ + Microsoft Engagement Framework @@ -1500,14 +1478,12 @@ Visual C++ 2015 Runtime for Universal Windows Platform Apps - 14.0 true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP true full ARM64 @@ -1516,8 +1492,7 @@ true - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS + TRACE;NETFX_CORE;WINDOWS_UAP;REMOTE_DOCS true true true diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml index a57d44b9576..e431a43a928 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml @@ -1,4 +1,4 @@ -true full false - bin\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP prompt 4 @@ -32,16 +31,14 @@ AnyCPU pdbonly true - bin\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP prompt 4 x86 true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -49,8 +46,7 @@ x86 - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x86 @@ -60,8 +56,7 @@ ARM true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -69,8 +64,7 @@ ARM - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM @@ -80,8 +74,7 @@ x64 true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -89,8 +82,7 @@ x64 - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x64 @@ -101,9 +93,7 @@ PackageReference - - 6.2.12 - + @@ -120,16 +110,14 @@ true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM64 false prompt - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM64 diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj b/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj index 130fdd806ef..cded28df431 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj @@ -1,4 +1,4 @@ - + uap10.0.17763 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 81dfa301b10..400814bbca0 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 @@ -1,4 +1,4 @@ - + true @@ -22,7 +22,7 @@ - + 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 7179d2b0382..0c63f1c081e 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 @@ -1,4 +1,4 @@ - + uap10.0.17763 diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridBoundColumn.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridBoundColumn.cs index 3e31f65ed55..f78cf65a0d7 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridBoundColumn.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridBoundColumn.cs @@ -58,7 +58,7 @@ public virtual Binding Binding _binding.Converter = new DataGridValueConverter(); } -#if !WINDOWS_UWP +#if !WINDOWS_UAP // Setup the binding for validation _binding.ValidatesOnDataErrors = true; _binding.ValidatesOnExceptions = true; 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 0ab3e6b27bf..36705b8285e 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,4 @@ - + uap10.0.17763 diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/Extensions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/Extensions.cs index d69734da15b..f43378c19fa 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/Extensions.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/Extensions.cs @@ -95,7 +95,7 @@ private static object GetFocusedElement(UIElement uiElement) /// true if MemberInfo is read-only, false otherwise internal static bool GetIsReadOnly(this MemberInfo memberInfo) { -#if !WINDOWS_UWP +#if !WINDOWS_UAP if (memberInfo != null) { // Check if ReadOnlyAttribute is defined on the member @@ -124,7 +124,7 @@ internal static Type GetItemType(this IEnumerable list) if (listType.IsEnumerableType()) { itemType = listType.GetEnumerableItemType(); -#if !WINDOWS_UWP +#if !WINDOWS_UAP if (itemType != null) { isICustomTypeProvider = typeof(ICustomTypeProvider).IsAssignableFrom(itemType); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/TypeHelper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/TypeHelper.cs index dc533a33326..c3fe70d7c2d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/TypeHelper.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/TypeHelper.cs @@ -447,7 +447,7 @@ internal static List SplitPropertyPath(string propertyPath) /// Type of the instance internal static Type GetCustomOrCLRType(this object instance) { -#if !WINDOWS_UWP +#if !WINDOWS_UAP ICustomTypeProvider customTypeProvider = instance as ICustomTypeProvider; if (customTypeProvider != null) { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/ValidationUtil.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/ValidationUtil.cs index 47506ab7bbd..94aa33b6aec 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/ValidationUtil.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/ValidationUtil.cs @@ -241,7 +241,7 @@ public static List GetDependencyProperties(this FrameworkEle /// True if the process cannot be recovered from the exception. public static bool IsCriticalException(Exception exception) { -#if WINDOWS_UWP +#if WINDOWS_UAP return exception is OutOfMemoryException; #else return (exception is OutOfMemoryException) || 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 454a8b8e3fc..9bd1581c7b7 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 @@ -1,4 +1,4 @@ - + uap10.0.17763 diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxAutomationPeer.cs index 5f049a80149..c7fe623f199 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxAutomationPeer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxAutomationPeer.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. 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 488c2b80257..83f2d4f8403 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 @@ -1,4 +1,4 @@ - + uap10.0.17763 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 111e7a153c8..e5052a4740c 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,4 @@ - + uap10.0.17763 @@ -19,7 +19,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj index 1d1da3892d0..17794015dd0 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj @@ -1,4 +1,4 @@ - + net472 diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs index e15099efc90..539da38f1e6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.Designer.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx index 1259dd097e6..55496358de1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media.Design/Properties/Resources.resx @@ -1,4 +1,3 @@ - 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 e2a245b7046..8693f00610e 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 @@ -1,4 +1,4 @@ - + uap10.0.17763 @@ -32,8 +32,8 @@ - - + + 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 88930723d43..89161d01c3a 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,4 +1,4 @@ - + uap10.0.17763 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 7d2ab48bad5..538e3ea200e 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,4 @@ - + false 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 b3355b31554..841a190f1bc 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 @@ -1,4 +1,4 @@ - + uap10.0.17763 @@ -47,8 +47,8 @@ - - + + diff --git a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj index c9881ebd4c0..98e752f58e1 100644 --- a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj +++ b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj @@ -1,4 +1,4 @@ - + true @@ -50,11 +50,11 @@ - + - + \ 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 4c1de1f5720..a6e96eaad26 100644 --- a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj +++ b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj @@ -1,4 +1,4 @@ - + uap10.0.17763 @@ -11,7 +11,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 b72dca46f0c..e6a827bd8be 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 @@ -75,6 +75,10 @@ True + + $(BaseOutputPath)$(Configuration)\ + $(OutputPath)$(Platform) + diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj index 4a6de004eaf..74c4c8fda7a 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj +++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj @@ -12,7 +12,7 @@ - + \ No newline at end of file diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj index c053fef0779..582f42286f9 100644 --- a/SmokeTests/SmokeTest.csproj +++ b/SmokeTests/SmokeTest.csproj @@ -37,16 +37,17 @@ SmokeTest_$(CurrentProject) - obj\$(CurrentProject)\ - bin\$(CurrentProject)\$(Platform)\$(Configuration)\ + ~build\ + $(BuildDir)$(CurrentProject)\obj\ + $(BuildDir)$(CurrentProject)\bin\ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly true @@ -104,15 +105,11 @@ - - 6.2.10 - + - - 2.7.0 - + @@ -123,7 +120,7 @@ - + diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj index fe28bced3aa..80ee4977a6d 100644 --- a/SmokeTests/SmokeTests.proj +++ b/SmokeTests/SmokeTests.proj @@ -44,7 +44,7 @@ @@ -56,7 +56,6 @@ x86;x64;ARM;ARM64 - bin %(ToolkitPackage.Identity) @@ -78,7 +77,7 @@ - $(MSBuildThisFileDirectory)..\bin\nupkg + $(MSBuildThisFileDirectory)..\~packages\bin diff --git a/SmokeTests/nuget.config b/SmokeTests/nuget.config index 14c62b9b4bb..b2feedd72b5 100644 --- a/SmokeTests/nuget.config +++ b/SmokeTests/nuget.config @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/UITests/UITests.App/Package.appxmanifest b/UITests/UITests.App/Package.appxmanifest index 9aa617ea938..45cc14f50ff 100644 --- a/UITests/UITests.App/Package.appxmanifest +++ b/UITests/UITests.App/Package.appxmanifest @@ -1,4 +1,4 @@ - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -40,8 +39,7 @@ true - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x86 @@ -52,8 +50,7 @@ true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -61,8 +58,7 @@ true - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM @@ -73,8 +69,7 @@ true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM64 false @@ -83,8 +78,7 @@ true - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM64 @@ -95,8 +89,7 @@ true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -104,8 +97,7 @@ true - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x64 @@ -165,24 +157,12 @@ - - 6.2.12 - - - 7.1.2 - - - 7.1.2 - - - 7.1.2 - - - 0.0.4 - - - 5.0.2 - + + + + + + diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj index 429adb007c5..c8c752b602a 100644 --- a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj +++ b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj @@ -13,20 +13,20 @@ - - - - + + + + - + - - - - + + + + - - + + diff --git a/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs b/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs index f1672919788..8f9e3da30f2 100644 --- a/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/ColorPickerButtonTest.cs @@ -25,7 +25,7 @@ public class ColorPickerButtonTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } /// diff --git a/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs b/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs index 6a14ceae6d7..663e6707397 100644 --- a/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/ConstrainedBoxTest.cs @@ -27,7 +27,7 @@ public class ConstrainedBoxTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } [TestMethod] diff --git a/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs b/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs index 4e09ea8dbb9..32ab111ea68 100644 --- a/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/GridSplitterTest.cs @@ -33,7 +33,7 @@ public class GridSplitterTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } [TestMethod] diff --git a/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs b/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs index 385271c42ee..3bbea6146ae 100644 --- a/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs @@ -26,7 +26,7 @@ public class RangeSelectorTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } [TestMethod] diff --git a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs index 6d722bd945d..98679d65e5c 100644 --- a/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/RichSuggestBoxTest.cs @@ -27,7 +27,7 @@ public class RichSuggestBoxTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } [TestMethod] diff --git a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs index b605debea8e..0dac88cb83d 100644 --- a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs @@ -25,7 +25,7 @@ public class TextBoxMaskTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } [TestMethod] diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs b/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs index 6576a58bc4c..8e05b9a2d0e 100644 --- a/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs +++ b/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs @@ -25,7 +25,7 @@ public class SimpleTest : UITestBase [TestProperty("Platform", "Any")] public static void ClassInitialize(TestContext testContext) { - TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp); + TestEnvironment.Initialize(testContext, WinUICSharpUWPSampleApp); } [TestMethod] diff --git a/UITests/UITests.Tests.Shared/TestAssembly.cs b/UITests/UITests.Tests.Shared/TestAssembly.cs index e2956adde8e..944580fdf50 100644 --- a/UITests/UITests.Tests.Shared/TestAssembly.cs +++ b/UITests/UITests.Tests.Shared/TestAssembly.cs @@ -36,10 +36,10 @@ public static void AssemblyInitialize(TestContext testContext) [AssemblyCleanup] public static void AssemblyCleanup() { - TestEnvironment.AssemblyCleanupWorker(UITestBase.WinUICsUWPSampleApp); + TestEnvironment.AssemblyCleanupWorker(UITestBase.WinUICSharpUWPSampleApp); } - private static async Task InitalizeComService() + private static async Task InitializeComService() { CommunicationService = new AppServiceConnection(); @@ -84,7 +84,7 @@ internal static async Task SendCustomMessageToApp(ValueSet m { if (CommunicationService is null) { - await InitalizeComService(); + await InitializeComService(); } return await CommunicationService.SendMessageAsync(message); @@ -94,7 +94,7 @@ private static async Task SendMessageToApp(ValueSet message) { if (CommunicationService is null) { - await InitalizeComService(); + await InitializeComService(); } var response = await CommunicationService.SendMessageAsync(message); diff --git a/UITests/UITests.Tests.Shared/UITestBase.cs b/UITests/UITests.Tests.Shared/UITestBase.cs index d513a7ca2e6..15eb6daccb9 100644 --- a/UITests/UITests.Tests.Shared/UITestBase.cs +++ b/UITests/UITests.Tests.Shared/UITestBase.cs @@ -25,46 +25,65 @@ public abstract class UITestBase { private TestSetupHelper helper; - internal static TestApplicationInfo WinUICsUWPSampleApp + internal static TestApplicationInfo WinUICSharpUWPSampleApp { get { - string assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - string baseDirectory = Path.Combine(Directory.GetParent(assemblyDir).Parent.Parent.Parent.Parent.FullName, "UITests.App"); + try + { + string assemblyDir = Path.GetDirectoryName(typeof(TestApplicationInfo).Assembly.Location); + var baseDir = Directory.GetParent(assemblyDir); - Log.Comment($"Base Package Search Directory = \"{baseDirectory}\""); + for (int i = 0; i < 10; i++) + { + if (baseDir.EnumerateDirectories().Any(d => d.Name.Equals("~build", StringComparison.OrdinalIgnoreCase))) + { + break; + } - var exclude = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs", "Microsoft.UI.Xaml", "Microsoft.NET.CoreFramework.Debug" }; - var files = Directory.GetFiles(baseDirectory, "*.msix", SearchOption.AllDirectories).Where(f => !exclude.Any(Path.GetFileNameWithoutExtension(f).Contains)); + baseDir = baseDir.Parent; + } - if (files.Count() == 0) - { - throw new Exception(string.Format("Failed to find '*.msix' in {0}'!", baseDirectory)); - } + string publishDir = Path.Combine(baseDir.FullName, "~publish"); - string mostRecentlyBuiltPackage = string.Empty; - DateTime timeMostRecentlyBuilt = DateTime.MinValue; + Log.Comment($"Base Package Search Directory = \"{publishDir}\""); - foreach (string file in files) - { - DateTime fileWriteTime = File.GetLastWriteTime(file); + var exclude = new[] { "Microsoft.NET.CoreRuntime", "Microsoft.VCLibs", "Microsoft.UI.Xaml", "Microsoft.NET.CoreFramework.Debug" }; + var files = Directory.EnumerateFiles(publishDir, "*.msix", SearchOption.AllDirectories).Where(f => !exclude.Any(Path.GetFileNameWithoutExtension(f).Contains)); - if (fileWriteTime > timeMostRecentlyBuilt) + if (!files.Any()) { - timeMostRecentlyBuilt = fileWriteTime; - mostRecentlyBuiltPackage = file; + throw new Exception($"Failed to find '*.msix' in {publishDir}'!"); } - } - return new TestApplicationInfo( - testAppPackageName: "UITests.App", - testAppName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme!App", - testAppPackageFamilyName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme", - testAppMainWindowTitle: "UITests.App", - processName: "UITests.App.exe", - installerName: mostRecentlyBuiltPackage.Replace(".msix", string.Empty), - certSerialNumber: "24d62f3b13b8b9514ead9c4de48cc30f7cc6151d", - baseAppxDir: baseDirectory); + string mostRecentlyBuiltPackage = string.Empty; + DateTime timeMostRecentlyBuilt = DateTime.MinValue; + + foreach (string file in files) + { + DateTime fileWriteTime = File.GetLastWriteTime(file); + + if (fileWriteTime > timeMostRecentlyBuilt) + { + timeMostRecentlyBuilt = fileWriteTime; + mostRecentlyBuiltPackage = file; + } + } + + return new TestApplicationInfo( + testAppPackageName: "UITests.App", + testAppName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme!App", + testAppPackageFamilyName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme", + testAppMainWindowTitle: "UITests.App", + processName: "UITests.App.exe", + installerName: mostRecentlyBuiltPackage.Replace(".msix", string.Empty), + certSerialNumber: "24d62f3b13b8b9514ead9c4de48cc30f7cc6151d", + baseAppxDir: publishDir); + } + catch (Exception e) + { + throw new AggregateException("Can't get Test Application info from the published MSIX packages. Check Output paths.", e); + } } } @@ -80,8 +99,7 @@ private static TestSetupHelper.TestSetupHelperOptions TestSetupHelperOptions public async Task TestInitialize() { // This will reset the test for each run (as from original WinUI https://github.com/microsoft/microsoft-ui-xaml/blob/master/test/testinfra/MUXTestInfra/Infra/TestHelpers.cs) - // We construct it so it doesn't try to run any tests since we use the AppService Bridge to complete - // our loading. + // We construct it so it doesn't try to run any tests since we use the AppService Bridge to complete our loading. helper = new TestSetupHelper(new string[] { }, TestSetupHelperOptions); var pageName = GetPageForTest(TestContext); @@ -132,13 +150,13 @@ private static string GetPageForTest(TestContext testContext) Log.Comment($"Found {testMethodString}."); - var testpageAttributeString = $"\"{typeof(TestPageAttribute)}\" on {testMethodString}"; + var testPageAttributeString = $"\"{typeof(TestPageAttribute)}\" on {testMethodString}"; if (method.GetCustomAttribute(typeof(TestPageAttribute), true) is not TestPageAttribute attribute) { - throw new Exception($"Could not find {testpageAttributeString}."); + throw new Exception($"Could not find {testPageAttributeString}."); } - Log.Comment($"Found {testpageAttributeString}. {nameof(TestPageAttribute.XamlFile)}: {attribute.XamlFile}."); + Log.Comment($"Found {testPageAttributeString}. {nameof(TestPageAttribute.XamlFile)}: {attribute.XamlFile}."); return attribute.XamlFile; } diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj index 70718b662e4..4dd2896bfa9 100644 --- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj +++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj @@ -54,13 +54,13 @@ - + - - - + + + - + diff --git a/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj b/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj index 3a218e5ac9d..a6c001e1b13 100644 --- a/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj +++ b/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/UnitTests/UnitTests.Notifications.Shared/TestAssertHelper.cs b/UnitTests/UnitTests.Notifications.Shared/TestAssertHelper.cs index 575986099f0..dd4cf93c5f5 100644 --- a/UnitTests/UnitTests.Notifications.Shared/TestAssertHelper.cs +++ b/UnitTests/UnitTests.Notifications.Shared/TestAssertHelper.cs @@ -271,7 +271,7 @@ public static void AssertToast(string expected, ToastContent toast) { AssertHelper.AssertXml(expected.ToLower(), toast.GetContent().ToLower()); -#if WINDOWS_UWP +#if WINDOWS_UAP // For WinRT, we'll test the XmlDocument method too, make sure it works. AssertHelper.AssertXml(expected, toast.GetXml().GetXml()); #endif @@ -281,7 +281,7 @@ public static void AssertTile(string expected, TileContent tile) { AssertHelper.AssertXml(expected.ToLower(), tile.GetContent().ToLower()); -#if WINDOWS_UWP +#if WINDOWS_UAP // For WinRT, we'll test the XmlDocument method too, make sure it works. AssertHelper.AssertXml(expected, tile.GetXml().GetXml()); #endif diff --git a/UnitTests/UnitTests.Notifications.Shared/Test_Badge_Xml.cs b/UnitTests/UnitTests.Notifications.Shared/Test_Badge_Xml.cs index caa0c64c4f5..0997b90226b 100644 --- a/UnitTests/UnitTests.Notifications.Shared/Test_Badge_Xml.cs +++ b/UnitTests/UnitTests.Notifications.Shared/Test_Badge_Xml.cs @@ -67,7 +67,7 @@ private static void AssertPayload(string expectedXml, INotificationContent notif { AssertHelper.AssertXml(expectedXml, notificationContent.GetContent()); -#if WINDOWS_UWP +#if WINDOWS_UAP // For WinRT, we'll test the XmlDocument method too, make sure it works. AssertHelper.AssertXml(expectedXml, notificationContent.GetXml().GetXml()); #endif diff --git a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj index 6c06c8484c3..a1d15048b33 100644 --- a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj +++ b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj @@ -21,8 +21,7 @@ true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -30,8 +29,7 @@ true - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x86 @@ -43,8 +41,7 @@ true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -52,8 +49,7 @@ true - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM @@ -65,8 +61,7 @@ true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -74,8 +69,7 @@ true - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x64 @@ -90,8 +84,7 @@ true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM64 false @@ -99,8 +92,7 @@ true - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM64 @@ -113,22 +105,12 @@ - - 6.2.12 - - - 2.1.2 - - - 2.1.2 - - - - 4.5.0 - - - 4.3.0 - + + + + + + diff --git a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj index ff993c99800..5225cf1aa57 100644 --- a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj +++ b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj @@ -21,8 +21,7 @@ true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;WINRT full x86 false @@ -30,8 +29,7 @@ true - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;WINRT + TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS;WINRT true pdbonly x86 @@ -43,8 +41,7 @@ true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;WINRT full ARM false @@ -52,8 +49,7 @@ true - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + TRACE;NETFX_CORE;WINDOWS_UAP;WINRT true pdbonly ARM @@ -65,8 +61,7 @@ true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;WINRT full x64 false @@ -74,8 +69,7 @@ true - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + TRACE;NETFX_CORE;WINDOWS_UAP;WINRT true pdbonly x64 @@ -90,8 +84,7 @@ true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;WINRT full ARM64 false @@ -99,8 +92,7 @@ true - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + TRACE;NETFX_CORE;WINDOWS_UAP;WINRT true pdbonly ARM64 @@ -113,21 +105,11 @@ - - 6.2.10 - - - 2.1.0 - - - 2.1.0 - - - 4.3.1 - - - 4.3.0 - + + + + + diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index 9faa59332eb..19d5faeef24 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -1,4 +1,4 @@ - + Debug @@ -21,8 +21,7 @@ true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -30,8 +29,7 @@ true - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x86 @@ -44,8 +42,7 @@ true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -53,8 +50,7 @@ true - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM @@ -67,8 +63,7 @@ true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full ARM64 @@ -77,8 +72,7 @@ true - bin\ARM64\Release\ - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -91,8 +85,7 @@ true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -100,8 +93,7 @@ true - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x64 @@ -119,44 +111,18 @@ - - 5.0.2 - - - 5.10.3 - - - 6.2.12 - - - 7.1.2 - - - 7.1.2 - - - 2.7.0 - - - 2.2.5 - - - 2.2.5 - - - - 10.0.3 - - - - 5.0.2 - - - 4.3.0 - - - 1.25.0 - + + + + + + + + + + + + @@ -355,8 +321,7 @@ true - bin\x86\Debug %28Version 1511%29\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full x86 @@ -366,8 +331,7 @@ true - bin\ARM\Debug %28Version 1511%29\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full ARM @@ -377,8 +341,7 @@ true - bin\x64\Debug %28Version 1511%29\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full x64 @@ -388,8 +351,7 @@ true - bin\x86\Debug %28Anniversary Update%29\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full x86 @@ -399,8 +361,7 @@ true - bin\ARM\Debug %28Anniversary Update%29\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full ARM @@ -410,8 +371,7 @@ true - bin\x64\Debug %28Anniversary Update%29\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full x64 @@ -420,8 +380,7 @@ true - bin\x86\Release %28Version 1511%29\ - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -432,8 +391,7 @@ true - bin\ARM\Release %28Version 1511%29\ - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -444,8 +402,7 @@ true - bin\x64\Release %28Version 1511%29\ - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -456,8 +413,7 @@ true - bin\x86\Release %28Anniversary Update%29\ - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -468,8 +424,7 @@ true - bin\ARM\Release %28Anniversary Update%29\ - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -480,8 +435,7 @@ true - bin\x64\Release %28Anniversary Update%29\ - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -493,8 +447,7 @@ true - bin\ARM64\Debug %28Version 1511%29\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS;CODE_ANALYSIS true full ARM64 @@ -504,8 +457,7 @@ true - bin\ARM64\Debug %28Anniversary Update%29\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS;CODE_ANALYSIS true full ARM64 @@ -514,8 +466,7 @@ true - bin\ARM64\Release %28Version 1511%29\ - CODE_ANALYSIS;CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS + CODE_ANALYSIS;CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS;CODE_ANALYSIS true true true @@ -526,8 +477,7 @@ true - bin\ARM64\Release %28Anniversary Update%29\ - CODE_ANALYSIS;CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS + CODE_ANALYSIS;CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS;CODE_ANALYSIS true true true diff --git a/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj b/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj index 6d4a34b7d6f..049dc4ee417 100644 --- a/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj +++ b/UnitTests/UnitTests.XamlIslands.Package/UnitTests.XamlIslands.Package.wapproj @@ -83,6 +83,10 @@ true + + $(BaseOutputPath)$(Configuration)\ + $(OutputPath)$(Platform) + diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj index 4d28462a7bf..69630b6011e 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj @@ -1,4 +1,4 @@ - + Debug @@ -21,8 +21,7 @@ true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -30,8 +29,7 @@ true - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x86 @@ -42,8 +40,7 @@ true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -51,8 +48,7 @@ true - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM @@ -63,8 +59,7 @@ true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM64 false @@ -73,8 +68,7 @@ true - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM64 @@ -85,8 +79,7 @@ true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -94,8 +87,7 @@ true - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x64 @@ -156,16 +148,12 @@ - - 6.2.12 - - - 6.1.2 - + + diff --git a/UnitTests/UnitTests.XamlIslands/Directory.Build.props b/UnitTests/UnitTests.XamlIslands/Directory.Build.props deleted file mode 100644 index d0b03191f36..00000000000 --- a/UnitTests/UnitTests.XamlIslands/Directory.Build.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/UnitTests/UnitTests.XamlIslands/Directory.Build.targets b/UnitTests/UnitTests.XamlIslands/Directory.Build.targets deleted file mode 100644 index 4de98b5c73f..00000000000 --- a/UnitTests/UnitTests.XamlIslands/Directory.Build.targets +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj index 9e48643d0ce..149f202733c 100644 --- a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj +++ b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj @@ -8,7 +8,7 @@ - uap10.0.19041 + uap10.0.18362 app.manifest UnitTests.XamlIslands.Program @@ -18,7 +18,7 @@ - + \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f204e580701..c23918d8d59 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,10 +28,10 @@ jobs: displayName: Setup Environment Variables - task: NuGetToolInstaller@0 - displayName: Use NuGet 5.11.x + displayName: Use NuGet 5.11 inputs: versionSpec: 5.11.x - + - task: DotNetCoreCLI@2 inputs: command: custom @@ -91,13 +91,13 @@ jobs: env: SignClientUser: $(SignClientUser) SignClientSecret: $(SignClientSecret) - ArtifactDirectory: bin\nupkg + ArtifactDirectory: ~packages\bin condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], ''))) - task: PublishPipelineArtifact@1 displayName: Publish Package Artifacts inputs: - targetPath: .\bin\nupkg + targetPath: .\~packages\bin artifactName: Packages ### Smoke Tests ### @@ -111,7 +111,7 @@ jobs: displayName: Download NuGet Packages Artifact inputs: artifact: Packages - path: .\bin\nupkg + path: .\~packages\bin - task: DotNetCoreCLI@2 inputs: diff --git a/build/Windows.Toolkit.Common.props b/build/Windows.Toolkit.Common.props index 38374bf895c..fcd25fac3e6 100644 --- a/build/Windows.Toolkit.Common.props +++ b/build/Windows.Toolkit.Common.props @@ -11,7 +11,6 @@ https://github.com/CommunityToolkit/WindowsCommunityToolkit https://github.com/CommunityToolkit/WindowsCommunityToolkit/releases Icon.png - https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png @@ -34,6 +33,8 @@ $(MSBuildProjectName.Contains('Test')) $(MSBuildProjectName.Contains('.Uwp')) False + $(MSBuildProjectName.Contains('.Controls.')) + False False True @@ -44,4 +45,23 @@ $(TF_BUILD) + + + ~build\ + ~publish\ + + $(BuildDir)bin\ + $(BuildDir)obj\ + + $(BuildDir)ext\ + $(MSBuildProjectExtensionsPath) + + $(RepositoryDirectory)~packages\bin\ + $(RepositoryDirectory)~packages\obj\ + + $(PublishDir)TestResults\ + + $(PublishDir) + + diff --git a/build/Windows.Toolkit.Common.targets b/build/Windows.Toolkit.Common.targets index 61ae0c52034..eb74df84231 100644 --- a/build/Windows.Toolkit.Common.targets +++ b/build/Windows.Toolkit.Common.targets @@ -12,6 +12,11 @@ $(CommonTags) + + + $(BuildDir)**;$(PublishDir)**;$(DefaultItemExcludes) + + @@ -22,4 +27,15 @@ + + + + + \ No newline at end of file diff --git a/build/Windows.Toolkit.UWP.Controls.targets b/build/Windows.Toolkit.UWP.Controls.targets index 57fcc888af4..f1bb8e164eb 100644 --- a/build/Windows.Toolkit.UWP.Controls.targets +++ b/build/Windows.Toolkit.UWP.Controls.targets @@ -5,7 +5,7 @@ - + diff --git a/build/Windows.Toolkit.VisualStudio.Design.props b/build/Windows.Toolkit.VisualStudio.Design.props index 06432dfc837..0c943341a97 100644 --- a/build/Windows.Toolkit.VisualStudio.Design.props +++ b/build/Windows.Toolkit.VisualStudio.Design.props @@ -9,14 +9,13 @@ False False - True uap$(TargetPlatformBaseVersion).$(TargetPlatformMinRevision) $(MSBuildProjectName.Remove($(MSBuildProjectName.LastIndexOf('.')))) - + diff --git a/build/Windows.Toolkit.VisualStudio.Design.targets b/build/Windows.Toolkit.VisualStudio.Design.targets index 83d83552d6b..795ad41cd3a 100644 --- a/build/Windows.Toolkit.VisualStudio.Design.targets +++ b/build/Windows.Toolkit.VisualStudio.Design.targets @@ -2,7 +2,7 @@ $(RootNamespace.Remove($(RootNamespace.LastIndexOf('.')))) - ..\$(ParentProjectName)\bin\$(Configuration)\$(ParentTargetFramework)\ + ..\$(ParentProjectName)\~build\bin\$(Configuration)\$(ParentTargetFramework)\ $(ParentProjectOutputPath)Design\ @@ -34,8 +34,8 @@ - - + + \ No newline at end of file diff --git a/build/build.cake b/build/build.cake index 585ad201e90..e1218365c72 100644 --- a/build/build.cake +++ b/build/build.cake @@ -2,9 +2,9 @@ #addin nuget:?package=Cake.FileHelpers&version=4.0.1 #addin nuget:?package=Cake.Powershell&version=1.0.1 -#addin nuget:?package=Cake.GitVersioning&version=3.4.220 +#addin nuget:?package=Cake.GitVersioning&version=3.4.231 -#tool nuget:?package=MSTest.TestAdapter&version=2.2.5 +#tool nuget:?package=MSTest.TestAdapter&version=2.2.6 #tool nuget:?package=vswhere&version=2.8.4 using System; @@ -33,10 +33,10 @@ var buildDir = baseDir + "/build"; var Solution = baseDir + "/Windows Community Toolkit.sln"; var toolsDir = buildDir + "/tools"; -var binDir = baseDir + "/bin"; -var nupkgDir = binDir + "/nupkg"; +var packagesDir = baseDir + "/~packages"; +var pkgBinDir = packagesDir + "/bin"; -var taefBinDir = baseDir + $"/UITests/UITests.Tests.TAEF/bin/{configuration}/netcoreapp3.1/win10-x86"; +var taefBinDir = baseDir + $"/UITests/UITests.Tests.TAEF/~build/bin/{configuration}/netcoreapp3.1/win10-x86"; var styler = toolsDir + "/XamlStyler.Console/tools/xstyler.exe"; var stylerFile = baseDir + "/settings.xamlstyler"; @@ -114,14 +114,14 @@ Task("Clean") .Description("Clean the output folder") .Does(() => { - if(DirectoryExists(binDir)) + if(DirectoryExists(packagesDir)) { Information("\nCleaning Working Directory"); - CleanDirectory(binDir); + CleanDirectory(packagesDir); } else { - CreateDirectory(binDir); + CreateDirectory(packagesDir); } }); @@ -158,7 +158,7 @@ Task("BuildProjects") MSBuild(Solution, buildSettings); - EnsureDirectoryExists(nupkgDir); + EnsureDirectoryExists(pkgBinDir); // Build once with normal dependency ordering buildSettings = new MSBuildSettings @@ -222,7 +222,7 @@ Task("Package") .SetConfiguration(configuration) .WithTarget("Pack") .WithProperty("GenerateLibraryLayout", "true") - .WithProperty("PackageOutputPath", nupkgDir); + .WithProperty("PackageOutputPath", pkgBinDir); MSBuild(Solution, buildSettings); }); @@ -233,7 +233,7 @@ public string getMSTestAdapterPath(){ if(nugetPaths.Count == 0){ throw new Exception( "Cannot locate the MSTest test adapter. " + - "You might need to add '#tool nuget:?package=MSTest.TestAdapter&version=2.1.0' " + + "You might need to add '#tool nuget:?package=MSTest.TestAdapter&version=' " + "to the top of your build.cake file."); } diff --git a/global.json b/global.json index a3d78890e48..a38b55dd705 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "msbuild-sdks": { - "MSBuild.Sdk.Extras": "3.0.22" + "MSBuild.NET.Extras.Sdk": "1.4.1" } } \ No newline at end of file diff --git a/nuget.config b/nuget.config index 1b39cb3113e..62c7515ba9e 100644 --- a/nuget.config +++ b/nuget.config @@ -1,9 +1,9 @@ - - + +