diff --git a/WindowsAppRuntime.sln b/WindowsAppRuntime.sln index b92522dc44..030712d2d3 100644 --- a/WindowsAppRuntime.sln +++ b/WindowsAppRuntime.sln @@ -1095,28 +1095,32 @@ Global {6539E9E1-BF36-40E5-86BC-070E99DB7B7B}.Release|x86.Build.0 = Release|Win32 {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Debug|Any CPU.ActiveCfg = Debug|Win32 {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Debug|ARM.ActiveCfg = Debug|Win32 - {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Debug|ARM64.ActiveCfg = Debug|Win32 + {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Debug|ARM64.Build.0 = Debug|ARM64 {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Debug|x64.ActiveCfg = Debug|x64 {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Debug|x64.Build.0 = Debug|x64 {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Debug|x86.ActiveCfg = Debug|Win32 {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Debug|x86.Build.0 = Debug|Win32 {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Release|Any CPU.ActiveCfg = Release|Win32 {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Release|ARM.ActiveCfg = Release|Win32 - {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Release|ARM64.ActiveCfg = Release|Win32 + {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Release|ARM64.ActiveCfg = Release|ARM64 + {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Release|ARM64.Build.0 = Release|ARM64 {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Release|x64.ActiveCfg = Release|x64 {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Release|x64.Build.0 = Release|x64 {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Release|x86.ActiveCfg = Release|Win32 {E977B1BD-00DC-4085-A105-E0A18E0183D7}.Release|x86.Build.0 = Release|Win32 {4B30C685-8490-440F-9879-A75D45DAA361}.Debug|Any CPU.ActiveCfg = Debug|Win32 {4B30C685-8490-440F-9879-A75D45DAA361}.Debug|ARM.ActiveCfg = Debug|Win32 - {4B30C685-8490-440F-9879-A75D45DAA361}.Debug|ARM64.ActiveCfg = Debug|Win32 + {4B30C685-8490-440F-9879-A75D45DAA361}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {4B30C685-8490-440F-9879-A75D45DAA361}.Debug|ARM64.Build.0 = Debug|ARM64 {4B30C685-8490-440F-9879-A75D45DAA361}.Debug|x64.ActiveCfg = Debug|x64 {4B30C685-8490-440F-9879-A75D45DAA361}.Debug|x64.Build.0 = Debug|x64 {4B30C685-8490-440F-9879-A75D45DAA361}.Debug|x86.ActiveCfg = Debug|Win32 {4B30C685-8490-440F-9879-A75D45DAA361}.Debug|x86.Build.0 = Debug|Win32 {4B30C685-8490-440F-9879-A75D45DAA361}.Release|Any CPU.ActiveCfg = Release|Win32 {4B30C685-8490-440F-9879-A75D45DAA361}.Release|ARM.ActiveCfg = Release|Win32 - {4B30C685-8490-440F-9879-A75D45DAA361}.Release|ARM64.ActiveCfg = Release|Win32 + {4B30C685-8490-440F-9879-A75D45DAA361}.Release|ARM64.ActiveCfg = Release|ARM64 + {4B30C685-8490-440F-9879-A75D45DAA361}.Release|ARM64.Build.0 = Release|ARM64 {4B30C685-8490-440F-9879-A75D45DAA361}.Release|x64.ActiveCfg = Release|x64 {4B30C685-8490-440F-9879-A75D45DAA361}.Release|x64.Build.0 = Release|x64 {4B30C685-8490-440F-9879-A75D45DAA361}.Release|x86.ActiveCfg = Release|Win32 @@ -1125,8 +1129,6 @@ Global {D6A64926-4988-4C64-A5A8-2C14B1388696}.Debug|Any CPU.Build.0 = Debug|Any CPU {D6A64926-4988-4C64-A5A8-2C14B1388696}.Debug|Any CPU.Deploy.0 = Debug|Any CPU {D6A64926-4988-4C64-A5A8-2C14B1388696}.Debug|ARM.ActiveCfg = Debug|ARM - {D6A64926-4988-4C64-A5A8-2C14B1388696}.Debug|ARM.Build.0 = Debug|ARM - {D6A64926-4988-4C64-A5A8-2C14B1388696}.Debug|ARM.Deploy.0 = Debug|ARM {D6A64926-4988-4C64-A5A8-2C14B1388696}.Debug|ARM64.ActiveCfg = Debug|ARM64 {D6A64926-4988-4C64-A5A8-2C14B1388696}.Debug|ARM64.Build.0 = Debug|ARM64 {D6A64926-4988-4C64-A5A8-2C14B1388696}.Debug|ARM64.Deploy.0 = Debug|ARM64 @@ -1140,8 +1142,6 @@ Global {D6A64926-4988-4C64-A5A8-2C14B1388696}.Release|Any CPU.Build.0 = Release|Any CPU {D6A64926-4988-4C64-A5A8-2C14B1388696}.Release|Any CPU.Deploy.0 = Release|Any CPU {D6A64926-4988-4C64-A5A8-2C14B1388696}.Release|ARM.ActiveCfg = Release|ARM - {D6A64926-4988-4C64-A5A8-2C14B1388696}.Release|ARM.Build.0 = Release|ARM - {D6A64926-4988-4C64-A5A8-2C14B1388696}.Release|ARM.Deploy.0 = Release|ARM {D6A64926-4988-4C64-A5A8-2C14B1388696}.Release|ARM64.ActiveCfg = Release|ARM64 {D6A64926-4988-4C64-A5A8-2C14B1388696}.Release|ARM64.Build.0 = Release|ARM64 {D6A64926-4988-4C64-A5A8-2C14B1388696}.Release|ARM64.Deploy.0 = Release|ARM64 diff --git a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj b/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj index 1b8c2f3357..42ab12c8ba 100644 --- a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj +++ b/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj @@ -1,6 +1,6 @@ - + Debug @@ -18,6 +18,43 @@ Release x64 + + Debug + ARM64 + + + Release + ARM64 + + + + + + Create + + + + + + + + + + + $(OutDir)\..\WindowsAppRuntime_DLL\Microsoft.Windows.AppLifecycle.winmd + true + $(OutDir)\..\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.dll + + + $(OutDir)\..\WindowsAppRuntime_DLL\Microsoft.Windows.ToastNotifications.winmd + true + $(OutDir)\..\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.dll + + + + + {f76b776e-86f5-48c5-8fc7-d2795ecc9746} + 16.0 @@ -53,6 +90,21 @@ true Unicode + + Application + true + v142 + Unicode + false + + + Application + false + v142 + true + Unicode + false + @@ -71,6 +123,12 @@ + + + + + + true @@ -84,122 +142,142 @@ false + + true + + + false + + Use Level3 true - %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true + %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc + WIN32;_DEBUG;%(PreprocessorDefinitions) + pch.h + stdcpp17 Console - true - %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL - onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL + onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) Microsoft.WindowsAppRuntime.Bootstrap.dll;%(DelayLoadDLLs) + Use Level3 true true true - %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true + %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc + WIN32;NDEBUG;%(PreprocessorDefinitions) + pch.h + stdcpp17 Console true true - true - %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL - onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL + onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) Microsoft.WindowsAppRuntime.Bootstrap.dll;%(DelayLoadDLLs) + Use Level3 true - %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - pch.h + %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc + _DEBUG;%(PreprocessorDefinitions) + pch.h + stdcpp17 Console - true - %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL + %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) - Microsoft.WindowsAppRuntime.Bootstrap.dll;%(DelayLoadDLLs) + Microsoft.WindowsAppRuntime.Bootstrap.dll + Use Level3 true true true - %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - pch.h + %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc + NDEBUG;%(PreprocessorDefinitions) + pch.h + stdcpp17 Console true true - true - %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL + %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL + onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) + Microsoft.WindowsAppRuntime.Bootstrap.dll;%(DelayLoadDLLs) + + + + + Use + Level3 + true + %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc + _DEBUG;%(PreprocessorDefinitions) + pch.h + stdcpp17 + + + Console + %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL + onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) + Microsoft.WindowsAppRuntime.Bootstrap.dll;%(DelayLoadDLLs) + + + + + Use + Level3 + true + true + true + %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc + NDEBUG;%(PreprocessorDefinitions) + pch.h + stdcpp17 + + + Console + true + true + %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies) Microsoft.WindowsAppRuntime.Bootstrap.dll;%(DelayLoadDLLs) - - - - - - - - - - - - {f76b776e-86f5-48c5-8fc7-d2795ecc9746} - - - - - $(OutDir)\..\WindowsAppRuntime_DLL\Microsoft.Windows.AppLifecycle.winmd - true - $(OutDir)\..\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.dll - - - $(OutDir)\..\WindowsAppRuntime_DLL\Microsoft.Windows.ToastNotifications.winmd - true - $(OutDir)\..\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.dll - - - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + - \ No newline at end of file + diff --git a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.cpp b/test/TestApps/ToastNotificationsTestApp/main.cpp similarity index 100% rename from test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.cpp rename to test/TestApps/ToastNotificationsTestApp/main.cpp diff --git a/test/TestApps/ToastNotificationsTestApp/pch.cpp b/test/TestApps/ToastNotificationsTestApp/pch.cpp new file mode 100644 index 0000000000..8c646996e9 --- /dev/null +++ b/test/TestApps/ToastNotificationsTestApp/pch.cpp @@ -0,0 +1,3 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. +#include "pch.h" diff --git a/test/ToastNotificationTests/ToastNotificationTests.vcxproj b/test/ToastNotificationTests/ToastNotificationTests.vcxproj index cc3218ec7a..e7a48afeea 100644 --- a/test/ToastNotificationTests/ToastNotificationTests.vcxproj +++ b/test/ToastNotificationTests/ToastNotificationTests.vcxproj @@ -18,6 +18,14 @@ Release x64 + + Debug + ARM64 + + + Release + ARM64 + 16.0 @@ -53,6 +61,21 @@ true Unicode + + DynamicLibrary + true + v142 + Unicode + false + + + DynamicLibrary + false + v142 + true + Unicode + false + @@ -71,6 +94,12 @@ + + + + + + true @@ -84,6 +113,9 @@ false + + true + Level3 @@ -166,16 +198,56 @@ false + + + Use + Level3 + true + %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL + _DEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP + true + pch.h + + + Windows + $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL + onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies) + + + + + Use + Level3 + true + true + true + %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL + NDEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP + true + pch.h + + + Windows + true + true + $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL + onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies) + + - Create + Create Create + Create Create - Create + Create + Create + Create + Create