From 925b24cbb9aca40f92532c2769d7cca512f80a82 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 24 Jul 2021 08:40:02 +0530 Subject: [PATCH 1/5] Remove BOM from new files Renormalize new lines and remove BOM from new files --- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 2 +- .../SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml | 2 +- .../TokenizingTextBox/TokenizingTextBoxAutomationPeer.cs | 2 +- .../Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj | 2 +- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Resources.resx | 1 - UITests/UITests.App/Package.appxmanifest | 2 +- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 2 +- .../UnitTests.XamlIslands.UWPApp.csproj | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index 2018763e733..0f437781d44 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 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 @@ - + 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/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 @@ - + Debug diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj index 4d28462a7bf..21d475366c7 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj @@ -1,4 +1,4 @@ - + Debug From 4929dc51351a97ffb8c932fcaaea0c75a93f953d Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 31 Jul 2021 08:09:16 +0530 Subject: [PATCH 2/5] Refactor Project and Build related files - Refactor Project files - Refactor Markdown files - Remove unnecessary files - Use latest NuGet and config - Fixup UAP/Windows TFM versions --- .gitignore | 1 - ...Microsoft.Toolkit.Uwp.Notifications.csproj | 55 +++++++++---------- ...Microsoft.Toolkit.Uwp.Notifications.nuspec | 14 ++--- Microsoft.Toolkit.Uwp.Notifications/ReadMe.md | 40 +++++++------- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 5 +- .../Microsoft.Toolkit.Uwp.UI.csproj | 4 +- SmokeTests/nuget.config | 2 +- .../Directory.Build.props | 6 -- .../Directory.Build.targets | 3 - .../UnitTests.XamlIslands.csproj | 2 +- azure-pipelines.yml | 4 +- .../Windows.Toolkit.VisualStudio.Design.props | 2 +- nuget.config | 4 +- 13 files changed, 66 insertions(+), 76 deletions(-) delete mode 100644 UnitTests/UnitTests.XamlIslands/Directory.Build.props delete mode 100644 UnitTests/UnitTests.XamlIslands/Directory.Build.targets diff --git a/.gitignore b/.gitignore index e1269ff7fd7..c7eb234e317 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ [Rr]eleases/ x64/ x86/ -build/ bld/ [Bb]in/ [Oo]bj/ diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj index c97dc653fff..358ff668538 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -1,57 +1,53 @@ - 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);NETFX_CORE - - + + $(DefineConstants);WINDOWS_UWP;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_UWP;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 - - - + - - - + + @@ -61,12 +57,15 @@ - + - + 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..7c85a2ac62f 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 + +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`). ## Where should I add new code? -Any code for generating notifications should be written in the Microsoft.Toolkit.Uwp.Notifications project. + +Any code for generating notifications should be written in the `Microsoft.Toolkit.Uwp.Notifications` project. If there's UWP-specific code, use the appropriate `#ifdef`, `WINDOWS_UWP` or `WINRT`. ## What are all the projects for? -All the code is contained on 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++. +All the code is contained on the `Microsoft.Toolkit.Uwp.Notifications` project. -| C# | C++ | -| ---------------- | ------------------- | -| NET Standard 1.4 | UWP WinRT Component | -| UWP C# DLL | | -| .Net Core DLL | | - +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.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index 0f437781d44..ef888d18615 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -110,7 +110,7 @@ @@ -127,7 +127,6 @@ - @@ -1493,6 +1492,7 @@ + Microsoft Engagement Framework @@ -1500,7 +1500,6 @@ Visual C++ 2015 Runtime for Universal Windows Platform Apps - 14.0 diff --git a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj index c9881ebd4c0..bdedf71aa1d 100644 --- a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj +++ b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj @@ -50,11 +50,11 @@ - + - + \ No newline at end of file diff --git a/SmokeTests/nuget.config b/SmokeTests/nuget.config index 14c62b9b4bb..1a943588fb8 100644 --- a/SmokeTests/nuget.config +++ b/SmokeTests/nuget.config @@ -1,7 +1,7 @@ - + \ No newline at end of file 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..39db0bb64ea 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 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f204e580701..5c87f9637e3 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 diff --git a/build/Windows.Toolkit.VisualStudio.Design.props b/build/Windows.Toolkit.VisualStudio.Design.props index 06432dfc837..c1731ddabb1 100644 --- a/build/Windows.Toolkit.VisualStudio.Design.props +++ b/build/Windows.Toolkit.VisualStudio.Design.props @@ -16,7 +16,7 @@ - + diff --git a/nuget.config b/nuget.config index 1b39cb3113e..62c7515ba9e 100644 --- a/nuget.config +++ b/nuget.config @@ -1,9 +1,9 @@ - - + + From 58ed821bf8c0fc3ef2b9616095b0aa7c79e7530a Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 31 Jul 2021 09:01:10 +0530 Subject: [PATCH 3/5] Use Common paths for Build, Publish and Pack The new Output paths point to... Build: `~build\...` Restore: `~build\ext` Publish: `~publish\...` Pack: `~packages\{bin,obj}` --- .gitignore | 5 ++ Directory.Build.props | 1 - GazeInputTest/GazeInputTest.csproj | 8 -- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 8 -- ...Toolkit.Uwp.Samples.BackgroundTasks.csproj | 10 --- ...WpfCore.SampleApp.PackagingProject.wapproj | 4 + SmokeTests/SmokeTest.csproj | 7 +- SmokeTests/SmokeTests.proj | 5 +- SmokeTests/nuget.config | 2 +- UITests/UITests.App/UITests.App.csproj | 8 -- .../Controls/ColorPickerButtonTest.cs | 2 +- .../Controls/ConstrainedBoxTest.cs | 2 +- .../Controls/GridSplitterTest.cs | 2 +- .../Controls/RangeSelectorTest.cs | 2 +- .../Controls/RichSuggestBoxTest.cs | 2 +- .../Controls/TextBoxMaskTest.cs | 2 +- .../Examples/SimpleTest.cs | 2 +- UITests/UITests.Tests.Shared/TestAssembly.cs | 8 +- UITests/UITests.Tests.Shared/UITestBase.cs | 84 +++++++++++-------- .../UnitTests.Notifications.UWP.csproj | 8 -- .../UnitTests.Notifications.WinRT.csproj | 8 -- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 24 ------ .../UnitTests.XamlIslands.Package.wapproj | 4 + .../UnitTests.XamlIslands.UWPApp.csproj | 8 -- azure-pipelines.yml | 6 +- build/Windows.Toolkit.Common.props | 22 ++++- build/Windows.Toolkit.Common.targets | 5 ++ .../Windows.Toolkit.VisualStudio.Design.props | 1 - ...indows.Toolkit.VisualStudio.Design.targets | 2 +- build/build.cake | 16 ++-- 30 files changed, 120 insertions(+), 148 deletions(-) diff --git a/.gitignore b/.gitignore index c7eb234e317..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 diff --git a/Directory.Build.props b/Directory.Build.props index 63fd9d141d7..3ddb90b8c38 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,7 +11,6 @@ true - $(RepositoryDirectory)bin\nupkg true true diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj index 28a650ed0be..f48a7173c1d 100644 --- a/GazeInputTest/GazeInputTest.csproj +++ b/GazeInputTest/GazeInputTest.csproj @@ -21,7 +21,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -30,7 +29,6 @@ true - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -42,7 +40,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -51,7 +48,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -63,7 +59,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM64 @@ -72,7 +67,6 @@ true - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -84,7 +78,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -93,7 +86,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index ef888d18615..79e027cafff 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -24,7 +24,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -34,7 +33,6 @@ $(OutputPath)$(AssemblyName).xml - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true pdbonly @@ -49,7 +47,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -58,7 +55,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true pdbonly @@ -73,7 +69,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -82,7 +77,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true pdbonly @@ -1505,7 +1499,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP true full @@ -1515,7 +1508,6 @@ true - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true true 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 1610d8f86b6..11b35687b8d 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 @@ -23,7 +23,6 @@ true full false - bin\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP prompt 4 @@ -32,7 +31,6 @@ AnyCPU pdbonly true - bin\Release\ TRACE;NETFX_CORE;WINDOWS_UWP prompt 4 @@ -40,7 +38,6 @@ x86 true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -49,7 +46,6 @@ x86 - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -60,7 +56,6 @@ ARM true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -69,7 +64,6 @@ ARM - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -80,7 +74,6 @@ x64 true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -89,7 +82,6 @@ x64 - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -120,7 +112,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM64 @@ -128,7 +119,6 @@ prompt - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly 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/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj index c053fef0779..e57abd520c8 100644 --- a/SmokeTests/SmokeTest.csproj +++ b/SmokeTests/SmokeTest.csproj @@ -37,8 +37,9 @@ SmokeTest_$(CurrentProject) - obj\$(CurrentProject)\ - bin\$(CurrentProject)\$(Platform)\$(Configuration)\ + ~build\ + $(BuildDir)$(CurrentProject)\obj\ + $(BuildDir)$(CurrentProject)\bin\ true @@ -123,7 +124,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 1a943588fb8..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/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj index a82743b5f4f..1a300fe06e5 100644 --- a/UITests/UITests.App/UITests.App.csproj +++ b/UITests/UITests.App/UITests.App.csproj @@ -31,7 +31,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -40,7 +39,6 @@ true - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -52,7 +50,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -61,7 +58,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -73,7 +69,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM64 @@ -83,7 +78,6 @@ true - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -95,7 +89,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -104,7 +97,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly 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/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj index 6c06c8484c3..63d6cfd5a4c 100644 --- a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj +++ b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj @@ -21,7 +21,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -30,7 +29,6 @@ true - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -43,7 +41,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -52,7 +49,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -65,7 +61,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -74,7 +69,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -90,7 +84,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM64 @@ -99,7 +92,6 @@ true - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly diff --git a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj index ff993c99800..46a0d70cc48 100644 --- a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj +++ b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj @@ -21,7 +21,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT full x86 @@ -30,7 +29,6 @@ true - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;WINRT true pdbonly @@ -43,7 +41,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT full ARM @@ -52,7 +49,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;WINRT true pdbonly @@ -65,7 +61,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT full x64 @@ -74,7 +69,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;WINRT true pdbonly @@ -90,7 +84,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT full ARM64 @@ -99,7 +92,6 @@ true - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;WINRT true pdbonly diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index 94bca731193..3b1e2a0b316 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -21,7 +21,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -30,7 +29,6 @@ true - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -44,7 +42,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -53,7 +50,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -67,7 +63,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -77,7 +72,6 @@ true - bin\ARM64\Release\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -91,7 +85,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -100,7 +93,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -355,7 +347,6 @@ true - bin\x86\Debug %28Version 1511%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -366,7 +357,6 @@ true - bin\ARM\Debug %28Version 1511%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -377,7 +367,6 @@ true - bin\x64\Debug %28Version 1511%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -388,7 +377,6 @@ true - bin\x86\Debug %28Anniversary Update%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -399,7 +387,6 @@ true - bin\ARM\Debug %28Anniversary Update%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -410,7 +397,6 @@ true - bin\x64\Debug %28Anniversary Update%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true full @@ -420,7 +406,6 @@ true - bin\x86\Release %28Version 1511%29\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -432,7 +417,6 @@ true - bin\ARM\Release %28Version 1511%29\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -444,7 +428,6 @@ true - bin\x64\Release %28Version 1511%29\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -456,7 +439,6 @@ true - bin\x86\Release %28Anniversary Update%29\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -468,7 +450,6 @@ true - bin\ARM\Release %28Anniversary Update%29\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -480,7 +461,6 @@ true - bin\x64\Release %28Anniversary Update%29\ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true @@ -493,7 +473,6 @@ true - bin\ARM64\Debug %28Version 1511%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS true full @@ -504,7 +483,6 @@ true - bin\ARM64\Debug %28Anniversary Update%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS true full @@ -514,7 +492,6 @@ true - bin\ARM64\Release %28Version 1511%29\ CODE_ANALYSIS;CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS true true @@ -526,7 +503,6 @@ true - bin\ARM64\Release %28Anniversary Update%29\ CODE_ANALYSIS;CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS 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 21d475366c7..e23eddd5a82 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj @@ -21,7 +21,6 @@ true - bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x86 @@ -30,7 +29,6 @@ true - bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -42,7 +40,6 @@ true - bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM @@ -51,7 +48,6 @@ true - bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -63,7 +59,6 @@ true - bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full ARM64 @@ -73,7 +68,6 @@ true - bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly @@ -85,7 +79,6 @@ true - bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP full x64 @@ -94,7 +87,6 @@ true - bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true pdbonly diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5c87f9637e3..c23918d8d59 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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..28cd995b2dc 100644 --- a/build/Windows.Toolkit.Common.targets +++ b/build/Windows.Toolkit.Common.targets @@ -12,6 +12,11 @@ $(CommonTags) + + + $(BuildDir)**;$(PublishDir)**;$(DefaultItemExcludes) + + diff --git a/build/Windows.Toolkit.VisualStudio.Design.props b/build/Windows.Toolkit.VisualStudio.Design.props index c1731ddabb1..0c943341a97 100644 --- a/build/Windows.Toolkit.VisualStudio.Design.props +++ b/build/Windows.Toolkit.VisualStudio.Design.props @@ -9,7 +9,6 @@ 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..1dec2c09418 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\ diff --git a/build/build.cake b/build/build.cake index 585ad201e90..a2b1d5cf085 100644 --- a/build/build.cake +++ b/build/build.cake @@ -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); }); From 4b8a67dbd5735ddec34cfd83117b8227e88ac3a7 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 31 Jul 2021 10:10:45 +0530 Subject: [PATCH 4/5] Manage Dependencies centrally Update package versions. Use Static Graph restore when applicable. Manage Packages Centrally using NuGet's CPVM feature. --- Directory.Build.props | 8 +- Directory.Packages.props | 102 ++++++++++++++++++ Directory.Solution.props | 14 +++ GazeInputTest/GazeInputTest.csproj | 4 +- ...Microsoft.Toolkit.Uwp.Notifications.csproj | 12 +-- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 32 ++---- ...Toolkit.Uwp.Samples.BackgroundTasks.csproj | 4 +- .../Microsoft.Toolkit.Uwp.UI.Behaviors.csproj | 2 +- ...ft.Toolkit.Uwp.UI.Controls.Markdown.csproj | 2 +- ...osoft.Toolkit.Uwp.UI.Controls.Media.csproj | 4 +- .../Microsoft.Toolkit.Uwp.UI.Media.csproj | 4 +- .../Microsoft.Toolkit.Uwp.UI.csproj | 2 +- .../Microsoft.Toolkit.Uwp.csproj | 2 +- ...oft.Toolkit.Win32.WpfCore.SampleApp.csproj | 2 +- SmokeTests/SmokeTest.csproj | 8 +- UITests/UITests.App/UITests.App.csproj | 24 ++--- .../UITests.Tests.MSTest.csproj | 22 ++-- .../UITests.Tests.TAEF.csproj | 10 +- .../UnitTests.Notifications.NetCore.csproj | 6 +- .../UnitTests.Notifications.UWP.csproj | 22 ++-- .../UnitTests.Notifications.WinRT.csproj | 20 +--- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 50 +++------ .../UnitTests.XamlIslands.UWPApp.csproj | 14 +-- .../UnitTests.XamlIslands.csproj | 2 +- build/Windows.Toolkit.Common.targets | 11 ++ build/Windows.Toolkit.UWP.Controls.targets | 2 +- ...indows.Toolkit.VisualStudio.Design.targets | 4 +- build/build.cake | 6 +- 28 files changed, 219 insertions(+), 176 deletions(-) create mode 100644 Directory.Packages.props create mode 100644 Directory.Solution.props diff --git a/Directory.Build.props b/Directory.Build.props index 3ddb90b8c38..32629db9aa8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,7 @@ + + $(MSBuildThisFileDirectory) $(RepositoryDirectory)build\ @@ -46,7 +48,7 @@ false - + @@ -54,7 +56,7 @@ - + @@ -68,7 +70,7 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000000..9bd7dac96e7 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,102 @@ + + + + 2.0.3 + 6.2.13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 f48a7173c1d..6ab4c9a34a6 100644 --- a/GazeInputTest/GazeInputTest.csproj +++ b/GazeInputTest/GazeInputTest.csproj @@ -133,9 +133,7 @@ - - 6.2.12 - + diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj index 358ff668538..e4ec71c55d8 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -43,23 +43,23 @@ - + - - - + + + - + - + - - 2.7.0 - - - 0.7.0-alpha - - - 2.0.1 - - - 4.5.0 - + + + + 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 11b35687b8d..f5ce0b6dc7b 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 @@ -93,9 +93,7 @@ PackageReference - - 6.2.12 - + 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..ff1a2a473be 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 @@ -22,7 +22,7 @@ - + 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..a4088ebf390 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 @@ -19,7 +19,7 @@ - + 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..819eab9282f 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 @@ -32,8 +32,8 @@ - - + + 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..43e44f0c92b 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 @@ -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 bdedf71aa1d..768b56d42aa 100644 --- a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj +++ b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj @@ -54,7 +54,7 @@ - + \ 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..65153077e87 100644 --- a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj +++ b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj @@ -11,7 +11,7 @@ - + \ No newline at end of file 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 e57abd520c8..5d81a9f69a7 100644 --- a/SmokeTests/SmokeTest.csproj +++ b/SmokeTests/SmokeTest.csproj @@ -105,15 +105,11 @@ - - 6.2.10 - + - - 2.7.0 - + diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj index 1a300fe06e5..4723c352c24 100644 --- a/UITests/UITests.App/UITests.App.csproj +++ b/UITests/UITests.App/UITests.App.csproj @@ -157,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.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.UWP/UnitTests.Notifications.UWP.csproj b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj index 63d6cfd5a4c..299ca2f86c1 100644 --- a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj +++ b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj @@ -105,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 46a0d70cc48..6af216ba580 100644 --- a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj +++ b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj @@ -105,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 3b1e2a0b316..8b88426f551 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -111,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 - + + + + + + + + + + + + diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj index e23eddd5a82..9e382d5de1f 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj @@ -148,16 +148,12 @@ - - 6.2.12 - - - 6.1.2 - + + diff --git a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj index 39db0bb64ea..149f202733c 100644 --- a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj +++ b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj @@ -18,7 +18,7 @@ - + \ No newline at end of file diff --git a/build/Windows.Toolkit.Common.targets b/build/Windows.Toolkit.Common.targets index 28cd995b2dc..eb74df84231 100644 --- a/build/Windows.Toolkit.Common.targets +++ b/build/Windows.Toolkit.Common.targets @@ -27,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.targets b/build/Windows.Toolkit.VisualStudio.Design.targets index 1dec2c09418..795ad41cd3a 100644 --- a/build/Windows.Toolkit.VisualStudio.Design.targets +++ b/build/Windows.Toolkit.VisualStudio.Design.targets @@ -34,8 +34,8 @@ - - + + \ No newline at end of file diff --git a/build/build.cake b/build/build.cake index a2b1d5cf085..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; @@ -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."); } From 9a6802cc5449dc284afbc51032cf71d45594621a Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 31 Jul 2021 11:11:11 +0530 Subject: [PATCH 5/5] Fix build issues in UWP projects Use "MSBuild.NET.Extras.Sdk" instead of "MSBuild.Sdk.Extras" for projects. This replacement package contains fixes around UWP project setup and build! --- Directory.Build.props | 4 +- Directory.Packages.props | 5 +- GazeInputTest/GazeInputTest.csproj | 16 +++---- .../Microsoft.Toolkit.Uwp.Connectivity.csproj | 2 +- ...icrosoft.Toolkit.Uwp.DeveloperTools.csproj | 2 +- ...t.Toolkit.Uwp.Input.GazeInteraction.csproj | 2 +- .../Badges/BadgeGlyphContent.cs | 4 +- .../Badges/BadgeNumericContent.cs | 4 +- .../Common/BaseElement.cs | 4 +- .../Common/INotificationContent.cs | 4 +- .../Common/LimitedList{T}.cs | 2 +- .../NotificationContentValidationException.cs | 2 +- ...Microsoft.Toolkit.Uwp.Notifications.csproj | 12 ++--- Microsoft.Toolkit.Uwp.Notifications/ReadMe.md | 2 +- .../Tiles/TileContent.cs | 4 +- .../Toasts/Builder/CustomizeToast.cs | 2 +- .../Builder/ToastContentBuilder.Visuals.cs | 4 +- .../Toasts/Builder/ToastContentBuilder.cs | 2 +- .../Compat/ToastNotificationHistoryCompat.cs | 2 +- .../Compat/ToastNotificationManagerCompat.cs | 2 +- .../Toasts/Compat/ToastNotifierCompat.cs | 2 +- .../Toasts/ToastContent.cs | 4 +- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 16 +++---- ...Toolkit.Uwp.Samples.BackgroundTasks.csproj | 20 ++++---- ...Microsoft.Toolkit.Uwp.UI.Animations.csproj | 2 +- .../Microsoft.Toolkit.Uwp.UI.Behaviors.csproj | 2 +- ...rosoft.Toolkit.Uwp.UI.Controls.Core.csproj | 2 +- .../DataGrid/DataGridBoundColumn.cs | 2 +- ...ft.Toolkit.Uwp.UI.Controls.DataGrid.csproj | 2 +- .../Utilities/Extensions.cs | 4 +- .../Utilities/TypeHelper.cs | 2 +- .../Utilities/ValidationUtil.cs | 2 +- ...osoft.Toolkit.Uwp.UI.Controls.Input.csproj | 2 +- ...soft.Toolkit.Uwp.UI.Controls.Layout.csproj | 2 +- ...ft.Toolkit.Uwp.UI.Controls.Markdown.csproj | 2 +- ...osoft.Toolkit.Uwp.UI.Controls.Media.csproj | 2 +- ....Toolkit.Uwp.UI.Controls.Primitives.csproj | 2 +- .../Microsoft.Toolkit.Uwp.UI.Controls.csproj | 2 +- .../Microsoft.Toolkit.Uwp.UI.Media.csproj | 2 +- .../Microsoft.Toolkit.Uwp.UI.csproj | 2 +- .../Microsoft.Toolkit.Uwp.csproj | 2 +- SmokeTests/SmokeTest.csproj | 4 +- UITests/UITests.App/UITests.App.csproj | 16 +++---- .../TestAssertHelper.cs | 4 +- .../Test_Badge_Xml.cs | 2 +- .../UnitTests.Notifications.UWP.csproj | 16 +++---- .../UnitTests.Notifications.WinRT.csproj | 16 +++---- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 48 +++++++++---------- .../UnitTests.XamlIslands.UWPApp.csproj | 16 +++---- global.json | 2 +- 50 files changed, 139 insertions(+), 144 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 32629db9aa8..c16e8639f2d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -31,8 +31,8 @@ $(NoWarn);CS8002 - - true + + true diff --git a/Directory.Packages.props b/Directory.Packages.props index 9bd7dac96e7..a59013c3c83 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,7 +2,6 @@ 2.0.3 - 6.2.13 @@ -12,8 +11,8 @@ - - + + diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj index 6ab4c9a34a6..3d3a4b93482 100644 --- a/GazeInputTest/GazeInputTest.csproj +++ b/GazeInputTest/GazeInputTest.csproj @@ -21,7 +21,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -29,7 +29,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x86 @@ -40,7 +40,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -48,7 +48,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM @@ -59,7 +59,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM64 false @@ -67,7 +67,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM64 @@ -78,7 +78,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -86,7 +86,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x64 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 e4ec71c55d8..8b00aef3110 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -1,4 +1,4 @@ - + netstandard1.4;uap10.0.16299;net461;netcoreapp3.1;net5.0;net5.0-windows10.0.17763;native @@ -14,8 +14,8 @@ - - $(DefineConstants);WINDOWS_UWP;WIN32 + + $(DefineConstants);WINDOWS_UAP;WIN32 @@ -30,7 +30,7 @@ v5.0 false - $(DefineConstants);WINDOWS_UWP;WINRT + $(DefineConstants);WINDOWS_UAP;WINRT $(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets UAP,Version=v10.0 @@ -53,10 +53,6 @@ - - - - diff --git a/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md b/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md index 7c85a2ac62f..a794e1c3abe 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md +++ b/Microsoft.Toolkit.Uwp.Notifications/ReadMe.md @@ -6,7 +6,7 @@ Welcome to the Notifications section of the toolkit! This contains the Notificat Any code for generating notifications should be written in the `Microsoft.Toolkit.Uwp.Notifications` project. -If there's UWP-specific code, use the appropriate `#ifdef`, `WINDOWS_UWP` or `WINRT`. +If there's UWP-specific code, use the appropriate `#ifdef`, `WINDOWS_UAP` or `WINRT`. ## What are all the projects for? 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 7ec45d1bbd6..62dbb7cfda7 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -24,7 +24,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -33,7 +33,7 @@ $(OutputPath)$(AssemblyName).xml - TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS + TRACE;NETFX_CORE;WINDOWS_UAP;REMOTE_DOCS true pdbonly x86 @@ -47,7 +47,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -55,7 +55,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS + TRACE;NETFX_CORE;WINDOWS_UAP;REMOTE_DOCS true pdbonly ARM @@ -69,7 +69,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -77,7 +77,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS + TRACE;NETFX_CORE;WINDOWS_UAP;REMOTE_DOCS true pdbonly x64 @@ -1483,7 +1483,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP true full ARM64 @@ -1492,7 +1492,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS + TRACE;NETFX_CORE;WINDOWS_UAP;REMOTE_DOCS true true true 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 f5ce0b6dc7b..418901e4a57 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 @@ -23,7 +23,7 @@ true full false - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP prompt 4 @@ -31,14 +31,14 @@ AnyCPU pdbonly true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP prompt 4 x86 true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -46,7 +46,7 @@ x86 - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x86 @@ -56,7 +56,7 @@ ARM true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -64,7 +64,7 @@ ARM - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM @@ -74,7 +74,7 @@ x64 true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -82,7 +82,7 @@ x64 - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x64 @@ -110,14 +110,14 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM64 false prompt - 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 ff1a2a473be..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 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.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 a4088ebf390..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 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 819eab9282f..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 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 43e44f0c92b..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 diff --git a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj index 768b56d42aa..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 diff --git a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj index 65153077e87..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 diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj index 5d81a9f69a7..582f42286f9 100644 --- a/SmokeTests/SmokeTest.csproj +++ b/SmokeTests/SmokeTest.csproj @@ -43,11 +43,11 @@ 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 diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj index 4723c352c24..d6531d20e2e 100644 --- a/UITests/UITests.App/UITests.App.csproj +++ b/UITests/UITests.App/UITests.App.csproj @@ -31,7 +31,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -39,7 +39,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x86 @@ -50,7 +50,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -58,7 +58,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM @@ -69,7 +69,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM64 false @@ -78,7 +78,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM64 @@ -89,7 +89,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -97,7 +97,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x64 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 299ca2f86c1..a1d15048b33 100644 --- a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj +++ b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj @@ -21,7 +21,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -29,7 +29,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x86 @@ -41,7 +41,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -49,7 +49,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM @@ -61,7 +61,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -69,7 +69,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x64 @@ -84,7 +84,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM64 false @@ -92,7 +92,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM64 diff --git a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj index 6af216ba580..5225cf1aa57 100644 --- a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj +++ b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj @@ -21,7 +21,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;WINRT full x86 false @@ -29,7 +29,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;WINRT + TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS;WINRT true pdbonly x86 @@ -41,7 +41,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;WINRT full ARM false @@ -49,7 +49,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + TRACE;NETFX_CORE;WINDOWS_UAP;WINRT true pdbonly ARM @@ -61,7 +61,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;WINRT full x64 false @@ -69,7 +69,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + TRACE;NETFX_CORE;WINDOWS_UAP;WINRT true pdbonly x64 @@ -84,7 +84,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;WINRT full ARM64 false @@ -92,7 +92,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP;WINRT + TRACE;NETFX_CORE;WINDOWS_UAP;WINRT true pdbonly ARM64 diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index 8b88426f551..19d5faeef24 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -21,7 +21,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -29,7 +29,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x86 @@ -42,7 +42,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -50,7 +50,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM @@ -63,7 +63,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full ARM64 @@ -72,7 +72,7 @@ true - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -85,7 +85,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -93,7 +93,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x64 @@ -321,7 +321,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full x86 @@ -331,7 +331,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full ARM @@ -341,7 +341,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full x64 @@ -351,7 +351,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full x86 @@ -361,7 +361,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full ARM @@ -371,7 +371,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true full x64 @@ -380,7 +380,7 @@ true - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -391,7 +391,7 @@ true - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -402,7 +402,7 @@ true - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -413,7 +413,7 @@ true - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -424,7 +424,7 @@ true - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -435,7 +435,7 @@ true - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS true true true @@ -447,7 +447,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS;CODE_ANALYSIS true full ARM64 @@ -457,7 +457,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP;CODE_ANALYSIS;CODE_ANALYSIS true full ARM64 @@ -466,7 +466,7 @@ true - 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 @@ -477,7 +477,7 @@ true - 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.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj index 9e382d5de1f..69630b6011e 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj @@ -21,7 +21,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x86 false @@ -29,7 +29,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x86 @@ -40,7 +40,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM false @@ -48,7 +48,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM @@ -59,7 +59,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full ARM64 false @@ -68,7 +68,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly ARM64 @@ -79,7 +79,7 @@ true - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP full x64 false @@ -87,7 +87,7 @@ true - TRACE;NETFX_CORE;WINDOWS_UWP + TRACE;NETFX_CORE;WINDOWS_UAP true pdbonly x64 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