diff --git a/Directory.Build.props b/Directory.Build.props
index 8bec5c0bb0..e717e73fcd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -48,11 +48,8 @@
-
-
-
-
-
+
+
diff --git a/WindowsAppSDK.Build.Cpp.props b/WindowsAppSDK.Build.Cpp.props
new file mode 100644
index 0000000000..749320fc90
--- /dev/null
+++ b/WindowsAppSDK.Build.Cpp.props
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ stdcpp17
+
+
+ true
+
+
+ Level4
+
+
+ true
+
+
+ false
+
+
+ %(AdditionalOptions) /ZH:SHA_256
+
+
+
+ DebugFull
+
+
+
+
+
+
+ true
+
+
+
+
+ Disabled
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+ Guard
+
+
+ true
+ true
+ true
+ %(AdditionalOptions) /Gw
+
+
+ AnySuitable
+ true
+ Size
+ true
+
+
+
+ UseLinkTimeCodeGeneration
+ true
+ true
+
+
+
+
diff --git a/dev/DeploymentAgent/DeploymentAgent.vcxproj b/dev/DeploymentAgent/DeploymentAgent.vcxproj
index 1aedf3e821..bac8007bc7 100644
--- a/dev/DeploymentAgent/DeploymentAgent.vcxproj
+++ b/dev/DeploymentAgent/DeploymentAgent.vcxproj
@@ -47,12 +47,9 @@
true
- true
false
- true
- false
@@ -72,8 +69,7 @@
pch.h
$(IntDir)pch.pch
_CONSOLE;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)
- Level4
- %(AdditionalOptions) /permissive- /bigobj
+ %(AdditionalOptions) /bigobj
%(AdditionalIncludeDirectories);
@@ -85,7 +81,6 @@
- Disabled
_DEBUG;%(PreprocessorDefinitions)
@@ -96,15 +91,9 @@
- MaxSpeed
- true
- true
NDEBUG;%(PreprocessorDefinitions)
- Guard
- true
- true
diff --git a/dev/Detours/Detours.vcxproj b/dev/Detours/Detours.vcxproj
index b26f2d26d4..504f126f9d 100644
--- a/dev/Detours/Detours.vcxproj
+++ b/dev/Detours/Detours.vcxproj
@@ -1,14 +1,15 @@
+
-
-
- Debug
- ARM
-
Debug
ARM64
@@ -17,10 +18,6 @@
Debug
Win32
-
- Release
- ARM
-
Release
ARM64
@@ -52,12 +49,6 @@
v142
Unicode
-
- StaticLibrary
- false
- v142
- Unicode
-
StaticLibrary
false
@@ -65,13 +56,6 @@
true
Unicode
-
- StaticLibrary
- false
- v142
- true
- Unicode
-
StaticLibrary
false
@@ -106,15 +90,9 @@
-
-
-
-
-
-
@@ -131,9 +109,6 @@
true
-
- true
-
true
@@ -143,9 +118,6 @@
false
-
- false
-
false
@@ -154,26 +126,6 @@
- Level4
- %(PreprocessorDefinitions)
- true
- NotUsing
- pch.h
- true
- false
- true
- false
- true
-
-
-
-
- true
-
-
-
-
- Level4
%(PreprocessorDefinitions)
true
NotUsing
@@ -187,36 +139,10 @@
- true
- Level4
- true
- true
- %(PreprocessorDefinitions)
- true
- NotUsing
- pch.h
- true
- Disabled
- false
- false
- true
- false
-
-
-
-
- true
- true
- true
-
-
-
-
- Level4
true
true
%(PreprocessorDefinitions)
@@ -235,12 +161,10 @@
true
true
- true
- Level4
%(PreprocessorDefinitions)
true
NotUsing
@@ -251,15 +175,9 @@
false
true
-
-
-
- true
-
- Level4
%(PreprocessorDefinitions)
true
NotUsing
@@ -270,15 +188,9 @@
false
true
-
-
-
- true
-
- Level4
true
true
%(PreprocessorDefinitions)
@@ -297,12 +209,10 @@
true
true
- true
- Level4
true
true
%(PreprocessorDefinitions)
@@ -321,7 +231,6 @@
true
true
- true
@@ -364,4 +273,4 @@
-
\ No newline at end of file
+
diff --git a/dev/DynamicDependency/DynamicDependencyLifetimeManagerShadow/DynamicDependencyLifetimeManagerShadow.vcxproj b/dev/DynamicDependency/DynamicDependencyLifetimeManagerShadow/DynamicDependencyLifetimeManagerShadow.vcxproj
index f7404f9ee6..6b0dff60bb 100644
--- a/dev/DynamicDependency/DynamicDependencyLifetimeManagerShadow/DynamicDependencyLifetimeManagerShadow.vcxproj
+++ b/dev/DynamicDependency/DynamicDependencyLifetimeManagerShadow/DynamicDependencyLifetimeManagerShadow.vcxproj
@@ -3,7 +3,6 @@
-
Debug
@@ -60,21 +59,18 @@
Application
false
- true
v142
Unicode
Application
false
- true
v142
Unicode
Application
false
- true
v142
Unicode
@@ -102,31 +98,14 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
- Level4
- true
WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -135,17 +114,12 @@
- Level4
- true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -154,21 +128,12 @@
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -177,21 +142,12 @@
- Level4
- true
- true
- true
WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -200,17 +156,12 @@
- Level4
- true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -219,21 +170,12 @@
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
diff --git a/dev/DynamicDependencyDataStore/DynamicDependency.DataStore.ProxyStub/DynamicDependency.DataStore.ProxyStub.vcxproj b/dev/DynamicDependencyDataStore/DynamicDependency.DataStore.ProxyStub/DynamicDependency.DataStore.ProxyStub.vcxproj
index 920ed8e4e7..9363dc5738 100644
--- a/dev/DynamicDependencyDataStore/DynamicDependency.DataStore.ProxyStub/DynamicDependency.DataStore.ProxyStub.vcxproj
+++ b/dev/DynamicDependencyDataStore/DynamicDependency.DataStore.ProxyStub/DynamicDependency.DataStore.ProxyStub.vcxproj
@@ -3,12 +3,7 @@
-
-
- Debug
- ARM
-
Debug
ARM64
@@ -21,10 +16,6 @@
Debug
x64
-
- Release
- ARM
-
Release
ARM64
@@ -53,12 +44,6 @@
v142
Unicode
-
- DynamicLibrary
- true
- v142
- Unicode
-
DynamicLibrary
true
@@ -74,28 +59,18 @@
DynamicLibrary
false
- true
- v142
- Unicode
-
-
- DynamicLibrary
- false
- true
v142
Unicode
DynamicLibrary
false
- true
v142
Unicode
DynamicLibrary
false
- true
v142
Unicode
@@ -110,12 +85,6 @@
-
-
-
-
-
-
@@ -130,103 +99,34 @@
- true
PostBuildEvent
$(PlatformTarget)\$(Configuration)\
-
- true
- PostBuildEvent
-
-
- false
- PostBuildEvent
-
- true
PostBuildEvent
- false
PostBuildEvent
- false
PostBuildEvent
$(PlatformTarget)\$(Configuration)\
- true
PostBuildEvent
- false
PostBuildEvent
- Level4
- true
WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- Use
- pch.h
- stdcpp17
- %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
-
-
- Windows
- DebugFull
- onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
- DynamicDependency.DataStore.def
-
-
- dlldata.c
- false
- $(PlatformTarget)\$(Configuration)\
-
-
-
-
- Level4
- true
- _ARM_;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- Use
- pch.h
- stdcpp17
- %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
-
-
- Windows
- DebugFull
- onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
- DynamicDependency.DataStore.def
-
-
- dlldata.c
- false
- $(PlatformTarget)\$(Configuration)\
-
-
-
-
- Level4
- true
- true
- true
- _ARM_;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
DynamicDependency.DataStore.def
@@ -238,18 +138,13 @@
- Level4
- true
WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
DynamicDependency.DataStore.def
@@ -261,22 +156,13 @@
- Level4
- true
- true
- true
WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
DynamicDependency.DataStore.def
@@ -288,22 +174,13 @@
- Level4
- true
- true
- true
WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
DynamicDependency.DataStore.def
@@ -315,18 +192,13 @@
- Level4
- true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -340,22 +212,13 @@
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
DynamicDependency.DataStore.def
@@ -375,8 +238,6 @@
NotUsing
NotUsing
NotUsing
- NotUsing
- NotUsing
NotUsing
NotUsing
@@ -385,8 +246,6 @@
NotUsing
NotUsing
NotUsing
- NotUsing
- NotUsing
NotUsing
NotUsing
@@ -395,16 +254,12 @@
NotUsing
NotUsing
NotUsing
- NotUsing
- NotUsing
NotUsing
NotUsing
Create
Create
- Create
- Create
Create
Create
Create
@@ -443,4 +298,4 @@
-
\ No newline at end of file
+
diff --git a/dev/DynamicDependencyDataStore/DynamicDependency.DataStore/DynamicDependency.DataStore.vcxproj b/dev/DynamicDependencyDataStore/DynamicDependency.DataStore/DynamicDependency.DataStore.vcxproj
index 0403ce6eed..ace66dd1ec 100644
--- a/dev/DynamicDependencyDataStore/DynamicDependency.DataStore/DynamicDependency.DataStore.vcxproj
+++ b/dev/DynamicDependencyDataStore/DynamicDependency.DataStore/DynamicDependency.DataStore.vcxproj
@@ -4,12 +4,7 @@
-
-
- Debug
- ARM
-
Debug
ARM64
@@ -22,10 +17,6 @@
Debug
x64
-
- Release
- ARM
-
Release
ARM64
@@ -59,12 +50,6 @@
v142
Unicode
-
- Application
- true
- v142
- Unicode
-
Application
true
@@ -80,28 +65,18 @@
Application
false
- true
- v142
- Unicode
-
-
- Application
- false
- true
v142
Unicode
Application
false
- true
v142
Unicode
Application
false
- true
v142
Unicode
@@ -116,12 +91,6 @@
-
-
-
-
-
-
@@ -135,76 +104,15 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
- Level4
- true
- WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- Use
- pch.h
- stdcpp17
- %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
-
-
- Windows
- DebugFull
- onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
-
-
- false
-
-
-
-
- Level4
- true
WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- Use
- pch.h
- stdcpp17
- %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
-
-
- Windows
- DebugFull
- onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
-
-
- false
-
-
-
-
- Level4
- true
- true
- true
- WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -213,18 +121,13 @@
- Level4
- true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -233,22 +136,13 @@
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -257,22 +151,13 @@
- Level4
- true
- true
- true
WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -281,18 +166,13 @@
- Level4
- true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -301,22 +181,13 @@
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -330,8 +201,6 @@
Create
Create
- Create
- Create
Create
Create
Create
diff --git a/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.ProxyStub/DynamicDependencyLifetimeManager.ProxyStub.vcxproj b/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.ProxyStub/DynamicDependencyLifetimeManager.ProxyStub.vcxproj
index 4017fcf2b1..83f5b46772 100644
--- a/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.ProxyStub/DynamicDependencyLifetimeManager.ProxyStub.vcxproj
+++ b/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.ProxyStub/DynamicDependencyLifetimeManager.ProxyStub.vcxproj
@@ -3,12 +3,7 @@
-
-
- Debug
- ARM
-
Debug
ARM64
@@ -21,10 +16,6 @@
Debug
x64
-
- Release
- ARM
-
Release
ARM64
@@ -53,12 +44,6 @@
v142
Unicode
-
- DynamicLibrary
- true
- v142
- Unicode
-
DynamicLibrary
true
@@ -74,28 +59,18 @@
DynamicLibrary
false
- true
- v142
- Unicode
-
-
- DynamicLibrary
- false
- true
v142
Unicode
DynamicLibrary
false
- true
v142
Unicode
DynamicLibrary
false
- true
v142
Unicode
@@ -110,12 +85,6 @@
-
-
-
-
-
-
@@ -130,104 +99,33 @@
- true
PostBuildEvent
$(Platform)\$(Configuration)\
-
- true
- PostBuildEvent
-
-
- false
- PostBuildEvent
-
- true
PostBuildEvent
- false
PostBuildEvent
- false
PostBuildEvent
- true
PostBuildEvent
- false
PostBuildEvent
- Level4
- true
WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- Use
- pch.h
- stdcpp17
- %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
-
-
- Windows
- DebugFull
- onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
- DynamicDependencyLifetimeManager.def
-
-
- %(AdditionalIncludeDirectories);$(OutDir)\..\IDynamicDependencyLifetimeManager
- dlldata.c
- false
- $(PlatformTarget)\$(Configuration)\
-
-
-
-
- Level4
- true
- _ARM_;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- Use
- pch.h
- stdcpp17
- %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
-
-
- Windows
- DebugFull
- onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
- DynamicDependencyLifetimeManager.def
-
-
- %(AdditionalIncludeDirectories);$(OutDir)\..\IDynamicDependencyLifetimeManager
- dlldata.c
- false
- $(PlatformTarget)\$(Configuration)\
-
-
-
-
- Level4
- true
- true
- true
- _ARM_;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
DynamicDependencyLifetimeManager.def
@@ -240,18 +138,13 @@
- Level4
- true
WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
DynamicDependencyLifetimeManager.def
@@ -264,22 +157,13 @@
- Level4
- true
- true
- true
WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
DynamicDependencyLifetimeManager.def
@@ -292,22 +176,13 @@
- Level4
- true
- true
- true
WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
DynamicDependencyLifetimeManager.def
@@ -320,18 +195,13 @@
- Level4
- true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -346,22 +216,13 @@
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
DynamicDependencyLifetimeManager.def
@@ -382,8 +243,6 @@
NotUsing
NotUsing
NotUsing
- NotUsing
- NotUsing
NotUsing
NotUsing
@@ -392,8 +251,6 @@
NotUsing
NotUsing
NotUsing
- NotUsing
- NotUsing
NotUsing
NotUsing
@@ -402,16 +259,12 @@
NotUsing
NotUsing
NotUsing
- NotUsing
- NotUsing
NotUsing
NotUsing
Create
Create
- Create
- Create
Create
Create
Create
@@ -454,4 +307,4 @@
-
\ No newline at end of file
+
diff --git a/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.vcxproj b/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.vcxproj
index 1a72502bc9..39ac105337 100644
--- a/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.vcxproj
+++ b/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.vcxproj
@@ -3,12 +3,7 @@
-
-
- Debug
- ARM
-
Debug
ARM64
@@ -21,10 +16,6 @@
Debug
x64
-
- Release
- ARM
-
Release
ARM64
@@ -53,12 +44,6 @@
v142
Unicode
-
- Application
- true
- v142
- Unicode
-
Application
true
@@ -74,28 +59,18 @@
Application
false
- true
- v142
- Unicode
-
-
- Application
- false
- true
v142
Unicode
Application
false
- true
v142
Unicode
Application
false
- true
v142
Unicode
@@ -110,12 +85,6 @@
-
-
-
-
-
-
@@ -129,76 +98,15 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
- Level4
- true
- WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- Use
- pch.h
- stdcpp17
- %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependencyLifetimeManager.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
-
-
- Windows
- DebugFull
- onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
-
-
- false
-
-
-
-
- Level4
- true
WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- Use
- pch.h
- stdcpp17
- %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependencyLifetimeManager.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
-
-
- Windows
- DebugFull
- onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
-
-
- false
-
-
-
-
- Level4
- true
- true
- true
- WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependencyLifetimeManager.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -207,18 +115,13 @@
- Level4
- true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependencyLifetimeManager.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -227,22 +130,13 @@
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependencyLifetimeManager.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -251,22 +145,13 @@
- Level4
- true
- true
- true
WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependencyLifetimeManager.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -275,18 +160,13 @@
- Level4
- true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependencyLifetimeManager.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -295,22 +175,13 @@
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependencyLifetimeManager.ProxyStub;$(OutDir)..\WindowsAppRuntime_BootstrapDLL
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -324,8 +195,6 @@
Create
Create
- Create
- Create
Create
Create
Create
diff --git a/dev/DynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager.vcxproj b/dev/DynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager.vcxproj
index 7d69af13f4..9afb75c3b4 100644
--- a/dev/DynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager.vcxproj
+++ b/dev/DynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager.vcxproj
@@ -3,7 +3,6 @@
-
Debug
@@ -21,14 +20,6 @@
Release
x64
-
- Debug
- ARM
-
-
- Release
- ARM
-
Debug
ARM64
@@ -65,16 +56,6 @@
false
v142
-
- Makefile
- true
- v142
-
-
- Makefile
- false
- v142
-
Makefile
true
@@ -102,12 +83,6 @@
-
-
-
-
-
-
@@ -115,16 +90,6 @@
-
- nmake /f makefile.mak ProjectDir=$(ProjectDir) SolutionDir=$(SolutionDir) OutDir=$(OutDir) IntDir=$(IntDir) TargetName=$(TargetName) Configuration=$(Configuration) Platform=$(Platform)
- $(IntDir)IDynamicDependencyLifetimeManager.h
- nmake /f makefile.mak ProjectDir=$(ProjectDir) SolutionDir=$(SolutionDir) OutDir=$(OutDir) IntDir=$(IntDir) TargetName=$(TargetName) Configuration=$(Configuration) Platform=$(Platform) clean
- nmake /f makefile.mak ProjectDir=$(ProjectDir) SolutionDir=$(SolutionDir) OutDir=$(OutDir) IntDir=$(IntDir) TargetName=$(TargetName) Configuration=$(Configuration) Platform=$(Platform) rebuild
- _DEBUG;$(NMakePreprocessorDefinitions)
- $(OutDir)
- $(IntDir)
- $(SolutionDir)tools
-
nmake /C /f makefile.mak ProjectDir=$(ProjectDir) SolutionDir=$(SolutionDir) OutDir=$(OutDir) IntDir=$(IntDir) TargetName=$(TargetName) Configuration=$(Configuration) Platform=$(Platform)
$(IntDir)IDynamicDependencyLifetimeManager.h
@@ -165,16 +130,6 @@
$(IntDir)
$(SolutionDir)tools
-
- nmake /f makefile.mak ProjectDir=$(ProjectDir) SolutionDir=$(SolutionDir) OutDir=$(OutDir) IntDir=$(IntDir) TargetName=$(TargetName) Configuration=$(Configuration) Platform=$(Platform)
- $(IntDir)IDynamicDependencyLifetimeManager.h
- nmake /f makefile.mak ProjectDir=$(ProjectDir) SolutionDir=$(SolutionDir) OutDir=$(OutDir) IntDir=$(IntDir) TargetName=$(TargetName) Configuration=$(Configuration) Platform=$(Platform) clean
- nmake /f makefile.mak ProjectDir=$(ProjectDir) SolutionDir=$(SolutionDir) OutDir=$(OutDir) IntDir=$(IntDir) TargetName=$(TargetName) Configuration=$(Configuration) Platform=$(Platform) rebuild
- WIN32;NDEBUG;$(NMakePreprocessorDefinitions)
- $(OutDir)
- $(IntDir)
- $(SolutionDir)tools
-
nmake /f makefile.mak ProjectDir=$(ProjectDir) SolutionDir=$(SolutionDir) OutDir=$(OutDir) IntDir=$(IntDir) TargetName=$(TargetName) Configuration=$(Configuration) Platform=$(Platform)
$(IntDir)IDynamicDependencyLifetimeManager.h
@@ -223,4 +178,4 @@
-
\ No newline at end of file
+
diff --git a/dev/MRTCore/mrt/Core/src/MRM.cpp b/dev/MRTCore/mrt/Core/src/MRM.cpp
index 6a9c95a6a8..931122c3ec 100644
--- a/dev/MRTCore/mrt/Core/src/MRM.cpp
+++ b/dev/MRTCore/mrt/Core/src/MRM.cpp
@@ -19,7 +19,7 @@
using namespace Microsoft::Resources;
-typedef struct
+typedef struct _MrmObjects
{
CoreProfile* profile = nullptr;
UnifiedResourceView* unifiedView = nullptr;
@@ -65,7 +65,7 @@ static HRESULT BlobResultReleaseOwnershipBuffer(
static HRESULT GetQualifierInfoFromCandidateImpl(
_In_ MrmObjects* resourceManager,
_In_ const ResourceCandidateResult* candidate,
- _Out_ UINT32* qualifierCount,
+ _Out_ UINT32* qualifierCount,
_Outptr_result_buffer_(*qualifierCount) PWSTR** qualifierNames,
_Outptr_result_buffer_(*qualifierCount) PWSTR** qualifierValues)
{
@@ -93,7 +93,7 @@ static HRESULT GetQualifierInfoFromCandidateImpl(
*qualifierValues = reinterpret_cast(MrmAllocateBuffer(bufferSize));
RETURN_IF_NULL_ALLOC(*qualifierValues);
ZeroMemory(*qualifierValues, bufferSize);
-
+
PWSTR* oneName = *qualifierNames;
PWSTR* oneValue = *qualifierValues;
for (int i = 0; i < count; i++)
@@ -134,7 +134,7 @@ static HRESULT GetQualifierInfoFromCandidateImpl(
static HRESULT GetQualifierInfoFromCandidate(
_In_ MrmObjects* resourceManager,
const ResourceCandidateResult* candidate,
- _Out_ UINT32* qualifierCount,
+ _Out_ UINT32* qualifierCount,
_Outptr_result_buffer_(*qualifierCount) PWSTR** qualifierNames,
_Outptr_result_buffer_(*qualifierCount) PWSTR** qualifierValues)
{
@@ -143,7 +143,7 @@ static HRESULT GetQualifierInfoFromCandidate(
{
MrmFreeQualifierNamesOrValues(*qualifierCount, *qualifierNames);
*qualifierNames = nullptr;
-
+
MrmFreeQualifierNamesOrValues(*qualifierCount, *qualifierValues);
*qualifierValues = nullptr;
@@ -160,7 +160,7 @@ static HRESULT LoadResourceCandidate(
_In_opt_ PCWSTR resourceIdOrUri,
_Out_ ResourceCandidateResult* resourceCandidate,
_Outptr_opt_result_maybenull_ PWSTR* resourceName,
- _Out_opt_ UINT32* qualifierCount,
+ _Out_opt_ UINT32* qualifierCount,
_Outptr_opt_result_buffer_(*qualifierCount) PWSTR** qualifierNames,
_Outptr_opt_result_buffer_(*qualifierCount) PWSTR** qualifierValues)
{
@@ -388,7 +388,7 @@ static HRESULT LoadStringOrEmbeddedResource(
_Outptr_result_maybenull_ PWSTR* resourceString,
_Out_ MrmResourceData* data,
_Outptr_opt_result_maybenull_ PWSTR* resourceName,
- _Out_opt_ UINT32* qualifierCount,
+ _Out_opt_ UINT32* qualifierCount,
_Outptr_opt_result_buffer_(*qualifierCount) PWSTR** qualifierNames,
_Outptr_opt_result_buffer_(*qualifierCount) PWSTR** qualifierValues)
{
@@ -398,16 +398,16 @@ static HRESULT LoadStringOrEmbeddedResource(
ResourceCandidateResult candidate;
PWSTR localName = nullptr;
RETURN_IF_FAILED_WITH_EXPECTED(LoadResourceCandidate(
- resourceManager,
- resourceContext,
- resourceMap,
- index,
- resourceIdOrUri,
- &candidate,
+ resourceManager,
+ resourceContext,
+ resourceMap,
+ index,
+ resourceIdOrUri,
+ &candidate,
&localName,
qualifierCount,
qualifierNames,
- qualifierValues),
+ qualifierValues),
HRESULT_FROM_WIN32(ERROR_MRM_NAMED_RESOURCE_NOT_FOUND));
std::unique_ptr name(localName, MrmFreeResource);
@@ -775,22 +775,22 @@ STDAPI MrmLoadStringOrEmbeddedResourceWithQualifierValues(
_Out_ MrmType* resourceType,
_Outptr_result_maybenull_ PWSTR* resourceString,
_Out_ MrmResourceData* data,
- _Out_ UINT32* qualifierCount,
+ _Out_ UINT32* qualifierCount,
_Outptr_result_buffer_(*qualifierCount) PWSTR** qualifierNames,
_Outptr_result_buffer_(*qualifierCount) PWSTR** qualifierValues)
{
RETURN_IF_FAILED_WITH_EXPECTED(LoadStringOrEmbeddedResource(
- resourceManager,
- resourceContext,
- resourceMap,
- INDEX_RESOURCE_ID,
- resourceId,
- resourceType,
- resourceString,
- data,
- nullptr,
- qualifierCount,
- qualifierNames,
+ resourceManager,
+ resourceContext,
+ resourceMap,
+ INDEX_RESOURCE_ID,
+ resourceId,
+ resourceType,
+ resourceString,
+ data,
+ nullptr,
+ qualifierCount,
+ qualifierNames,
qualifierValues),
HRESULT_FROM_WIN32(ERROR_MRM_NAMED_RESOURCE_NOT_FOUND));
return S_OK;
@@ -834,22 +834,22 @@ STDAPI MrmLoadStringOrEmbeddedResourceByIndexWithQualifierValues(
_Outptr_ PWSTR* resourceName,
_Outptr_result_maybenull_ PWSTR* resourceString,
_Out_ MrmResourceData* data,
- _Out_ UINT32* qualifierCount,
+ _Out_ UINT32* qualifierCount,
_Outptr_result_buffer_(*qualifierCount) PWSTR** qualifierNames,
_Outptr_result_buffer_(*qualifierCount) PWSTR** qualifierValues)
{
RETURN_IF_FAILED(LoadStringOrEmbeddedResource(
- resourceManager,
- resourceContext,
- resourceMap,
- index,
- nullptr,
- resourceType,
- resourceString,
- data,
- resourceName,
- qualifierCount,
- qualifierNames,
+ resourceManager,
+ resourceContext,
+ resourceMap,
+ index,
+ nullptr,
+ resourceType,
+ resourceString,
+ data,
+ resourceName,
+ qualifierCount,
+ qualifierNames,
qualifierValues));
return S_OK;
}
@@ -878,10 +878,10 @@ STDAPI_(void) MrmFreeResource(_In_opt_ void* resource)
// For unpackaged app, the built resource name is [modulename].pri. We still search resources.pri
// because that is a supported scenario for inbox MRT (Xaml islands).
//
-// A file path is always returned even if none of the files under the above mentioned searching
+// A file path is always returned even if none of the files under the above mentioned searching
// criteria exists. In that case, we will return filename (if provided) or resources.pri (if name not
-// provided) under module file path. The reason is that we don't want to fail the creation of
-// ResourceManager even if an app doesn't have PRI file.
+// provided) under module file path. The reason is that we don't want to fail the creation of
+// ResourceManager even if an app doesn't have PRI file.
STDAPI MrmGetFilePathFromName(_In_opt_ PCWSTR filename, _Outptr_ PWSTR* filePath)
{
*filePath = nullptr;
diff --git a/dev/MRTCore/mrt/Core/src/MRM.vcxproj b/dev/MRTCore/mrt/Core/src/MRM.vcxproj
index 1f3f821ad9..ddfbcd4952 100644
--- a/dev/MRTCore/mrt/Core/src/MRM.vcxproj
+++ b/dev/MRTCore/mrt/Core/src/MRM.vcxproj
@@ -3,7 +3,6 @@
-
false
true
@@ -11,10 +10,6 @@
true
-
- Debug
- ARM
-
Debug
ARM64
@@ -23,10 +18,6 @@
Debug
Win32
-
- Release
- ARM
-
Release
ARM64
@@ -68,9 +59,6 @@
-
- true
-
true
@@ -78,30 +66,20 @@
WIN32;_WINDOWS;_USRDLL;UNICODE;_UNICODE;%(PreprocessorDefinitions)
- Level4
true
..\..\..\..\WindowsAppRuntime_Insights;..\..\mrm\include
- stdcpp17
- Guard
-
- false
$(OutDir)..\mrmmin\mrmmin.lib;rpcrt4.lib;onecoreuap.lib;%(AdditionalDependencies)
MRM.def
Windows
- true
_DEBUG;%(PreprocessorDefinitions)
- Disabled
18
-
- false
-
diff --git a/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj b/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj
index 36008d5884..96fe2a5795 100644
--- a/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj
+++ b/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj
@@ -1,10 +1,6 @@
-
- Debug
- ARM
-
Debug
ARM64
@@ -13,10 +9,6 @@
Debug
Win32
-
- Release
- ARM
-
Release
ARM64
@@ -51,26 +43,10 @@
Unicode
false
-
- DynamicLibrary
- true
- v142
- Unicode
- false
-
DynamicLibrary
false
v142
- true
- Unicode
- false
-
-
- DynamicLibrary
- false
- v142
- true
Unicode
false
@@ -92,7 +68,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -100,7 +75,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -113,24 +87,15 @@
-
- false
-
-
- true
-
true
NotUsing
- Level3
- Disabled
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
_DEBUG;%(PreprocessorDefinitions)
true
- stdcpp17
Windows
@@ -140,12 +105,9 @@
NotUsing
- Level3
- Disabled
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
_DEBUG;%(PreprocessorDefinitions)
true
- stdcpp17
Windows
@@ -155,27 +117,9 @@
NotUsing
- Level3
- Disabled
- $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;%(PreprocessorDefinitions)
- true
- stdcpp17
-
-
- Windows
- $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
-
-
-
-
- NotUsing
- Level3
- Disabled
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;%(PreprocessorDefinitions)
true
- stdcpp17
Windows
@@ -184,77 +128,37 @@
- Level3
- NotUsing
- MaxSpeed
- true
- true
- $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;%(PreprocessorDefinitions)
- true
- stdcpp17
-
-
- Windows
- true
- true
- $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
-
-
-
-
- Level3
NotUsing
- MaxSpeed
- true
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;%(PreprocessorDefinitions)
true
- stdcpp17
Windows
- true
- true
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
- Level3
NotUsing
- MaxSpeed
- true
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
NDEBUG;%(PreprocessorDefinitions)
true
- stdcpp17
Windows
- true
- true
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
- Level3
NotUsing
- MaxSpeed
- true
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
NDEBUG;%(PreprocessorDefinitions)
true
- stdcpp17
Windows
- true
- true
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
@@ -271,9 +175,7 @@
true
- true
true
- true
true
true
true
@@ -287,17 +189,13 @@
$(OutDir)\Assets\contrast-white
$(OutDir)\Assets\contrast-white
$(OutDir)\Assets\contrast-white
- $(OutDir)\Assets\contrast-white
$(OutDir)\Assets\contrast-white
$(OutDir)\Assets\contrast-white
$(OutDir)\Assets\contrast-white
- $(OutDir)\Assets\contrast-white
true
true
true
true
- true
- true
true
@@ -314,4 +212,4 @@
-
\ No newline at end of file
+
diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj
index 5d244d2af8..df158d42e1 100644
--- a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj
+++ b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj
@@ -4,7 +4,6 @@
-
true
true
@@ -62,11 +61,9 @@
true
- true
false
- true
true
@@ -89,7 +86,6 @@
Use
pch.h
$(IntDir)pch.pch
- Level4
%(AdditionalOptions) /bigobj
/DWINRT_NO_MAKE_DETECTION /ZH:SHA_256 %(AdditionalOptions)
@@ -97,25 +93,18 @@
_WINRT_DLL;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)
$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)
-
- false
Console
false
Microsoft.Windows.ApplicationModel.Resources.def
$(OutDir)..\mrm\MRM.lib;onecoreuap.lib;%(AdditionalDependencies)
- true
_DEBUG;%(PreprocessorDefinitions)
- false
-
- false
-
diff --git a/dev/MRTCore/mrt/mrm/UnitTests/Helpers.cpp b/dev/MRTCore/mrt/mrm/UnitTests/Helpers.cpp
index 0d81ce858f..7ec6608ff9 100644
--- a/dev/MRTCore/mrt/mrm/UnitTests/Helpers.cpp
+++ b/dev/MRTCore/mrt/mrm/UnitTests/Helpers.cpp
@@ -172,7 +172,7 @@ bool TestStringArray::TryInitFromTestVars(__in PCWSTR pVarPrefix)
}
}
#pragma prefast(suppress : 26045, "DefArray_AllocZeroed ensures size, but macros & intsafe make that invisible to prefast")
- return (m_ppStrings != NULL);
+ return (m_ppStrings != nullptr);
}
// Same as TryInitFromTestVars but logs an error if no data is found
@@ -192,24 +192,24 @@ bool TestStringArray::InitFromList(__in String stringsList)
{
Release();
m_ppStrings = ParseList(stringsList, m_numStrings);
- return (m_ppStrings != NULL);
+ return (m_ppStrings != nullptr);
}
// Releases the array and its contents
void TestStringArray::Release()
{
- if (m_ppStrings != NULL)
+ if (m_ppStrings != nullptr)
{
for (int i = 0; i < m_numStrings; i++)
{
- if (m_ppStrings[i] != NULL)
+ if (m_ppStrings[i] != nullptr)
{
Def_Free(m_ppStrings[i]);
- m_ppStrings[i] = NULL;
+ m_ppStrings[i] = nullptr;
}
}
Def_Free(m_ppStrings);
- m_ppStrings = NULL;
+ m_ppStrings = nullptr;
}
m_numStrings = 0;
}
@@ -221,11 +221,11 @@ bool TestStringArray::InitFromAtomPool(__in const IAtomPool* pAtomPool)
bool complete = false;
Release();
- if (pAtomPool != NULL)
+ if (pAtomPool != nullptr)
{
m_numStrings = pAtomPool->GetNumAtoms();
m_ppStrings = _DefArray_AllocZeroed(PWSTR, m_numStrings);
- if (m_ppStrings != NULL)
+ if (m_ppStrings != nullptr)
{
StringResult str;
for (int i = 0; i < m_numStrings; i++)
@@ -233,7 +233,7 @@ bool TestStringArray::InitFromAtomPool(__in const IAtomPool* pAtomPool)
if (pAtomPool->TryGetString(i, &str))
{
m_ppStrings[i] = _DefDuplicateString(str.GetRef());
- if (m_ppStrings[i] == NULL)
+ if (m_ppStrings[i] == nullptr)
{
Log::Error(L"Test setup: couldn't duplicate string");
break;
@@ -241,7 +241,7 @@ bool TestStringArray::InitFromAtomPool(__in const IAtomPool* pAtomPool)
}
}
__analysis_assume(m_numStrings > 0);
- complete = (m_ppStrings[m_numStrings - 1] != NULL);
+ complete = (m_ppStrings[m_numStrings - 1] != nullptr);
}
else if (m_numStrings > 0)
{
@@ -274,7 +274,7 @@ _Success_(return != nullptr) PWSTR* TestStringArray::ParseList(String stringsLis
PWSTR* ppStrings = _DefArray_AllocZeroed(PWSTR, sizeStrings);
if (ppStrings == nullptr)
{
- return NULL;
+ return nullptr;
}
String key;
@@ -306,14 +306,14 @@ _Success_(return != nullptr) PWSTR* TestStringArray::ParseList(String stringsLis
// static method to release an array of strings
void TestStringArray::ReleaseStrings(__in_ecount_opt(numStrings) PWSTR* ppStrings, int numStrings)
{
- if (ppStrings != NULL)
+ if (ppStrings != nullptr)
{
for (int i = 0; i < numStrings; i++)
{
if (ppStrings[i])
{
Def_Free(ppStrings[i]);
- ppStrings[i] = NULL;
+ ppStrings[i] = nullptr;
}
}
Def_Free(ppStrings);
@@ -364,7 +364,7 @@ bool TestAtomPool::Init(__in PCWSTR pDesc, __in bool isCaseInsensitive, __in Tes
return false;
}
- if ((pAtoms != NULL) && (m_pPool != NULL))
+ if ((pAtoms != nullptr) && (m_pPool != nullptr))
{
if (FAILED(pAtoms->AddAtomPool(m_pPool, bAtomGroupAssumesOwnership)))
{
@@ -373,7 +373,7 @@ bool TestAtomPool::Init(__in PCWSTR pDesc, __in bool isCaseInsensitive, __in Tes
}
}
}
- return (m_pPool != NULL);
+ return (m_pPool != nullptr);
}
bool TestAtomPool::InitFromSpecs(
@@ -408,7 +408,7 @@ bool TestAtomPool::InitFromSpecs(
Log::Error(logmsg.Format(L"Index %d is out of range", index));
return false;
}
- if (m_ppStrings[index] == NULL)
+ if (m_ppStrings[index] == nullptr)
{
m_ppStrings[index] = _DefDuplicateString(key);
}
@@ -425,14 +425,14 @@ bool TestAtomPool::InitFromSpecs(
return false;
}
- if ((pAtoms != NULL) && (m_pPool != NULL))
+ if ((pAtoms != nullptr) && (m_pPool != nullptr))
{
if (FAILED(pAtoms->AddAtomPool(m_pPool, bAtomGroupAssumesOwnership)))
{
return false;
}
}
- return (m_pPool != NULL);
+ return (m_pPool != nullptr);
}
bool TestAtomPool::InitFromList(__in PCWSTR pDesc, __in bool isCaseInsensitive, __in String stringsList, __in_opt AtomPoolGroup* pAtoms)
@@ -450,7 +450,7 @@ bool TestAtomPool::InitFromList(__in PCWSTR pDesc, __in bool isCaseInsensitive,
Log::Error(L"Test setup: coludn't create static atom pool");
Release();
}
- else if (pAtoms != NULL)
+ else if (pAtoms != nullptr)
{
if (FAILED(pAtoms->AddAtomPool(m_pPool, bAtomGroupAssumesOwnership)))
{
@@ -458,7 +458,7 @@ bool TestAtomPool::InitFromList(__in PCWSTR pDesc, __in bool isCaseInsensitive,
Release();
}
}
- return (m_pPool != NULL);
+ return (m_pPool != nullptr);
}
bool TestAtomPool::InitFromTestVarsOrClone(
@@ -474,13 +474,13 @@ bool TestAtomPool::InitFromTestVarsOrClone(
if ((!TestStringArray::TryInitFromTestVars(varName)) && (!TestStringArray::InitFromAtomPool(pOther)))
{
// If we have no data, create an empty pool
- m_ppStrings = NULL;
+ m_ppStrings = nullptr;
m_numStrings = 0;
}
if (SUCCEEDED(StaticAtomPool::CreateInstance(m_ppStrings, m_numStrings, pDesc, isCaseInsensitive, &m_pPool)))
{
- if ((pAtoms != NULL) && (FAILED(pAtoms->AddAtomPool(m_pPool, bAtomGroupAssumesOwnership))))
+ if ((pAtoms != nullptr) && (FAILED(pAtoms->AddAtomPool(m_pPool, bAtomGroupAssumesOwnership))))
{
Log::Error(L"Test setup: couldn't add atom pool to group");
Release();
@@ -491,36 +491,36 @@ bool TestAtomPool::InitFromTestVarsOrClone(
Log::Error(L"Test setup: couldn't create static atom pool");
Release();
}
- return (m_pPool != NULL);
+ return (m_pPool != nullptr);
}
void TestAtomPool::Release()
{
delete m_pPool;
- m_pPool = NULL;
+ m_pPool = nullptr;
TestStringArray::Release();
}
TestBlob::TestBlob() :
- m_pStringValue(false), m_destinationAlignment(DefaultAlignment), m_cbBuffer(0), m_cbBlob(0), m_blobOffset(0), m_pBuffer(NULL)
+ m_pStringValue(nullptr), m_destinationAlignment(DefaultAlignment), m_cbBuffer(0), m_cbBlob(0), m_blobOffset(0), m_pBuffer(nullptr)
{
m_bufferFill.ui32 = DefaultBufferFill;
}
void TestBlob::Release()
{
- if (m_pBuffer != NULL)
+ if (m_pBuffer != nullptr)
{
Def_Free(m_pBuffer);
}
m_cbBuffer = m_cbBlob = m_blobOffset = 0;
- m_pBuffer = NULL;
+ m_pBuffer = nullptr;
- if (m_pStringValue != NULL)
+ if (m_pStringValue != nullptr)
{
Def_Free(m_pStringValue);
- m_pStringValue = NULL;
+ m_pStringValue = nullptr;
}
m_destinationAlignment = DefaultAlignment;
}
@@ -733,19 +733,19 @@ TestBlob** TestBlob::CreateBlobsFromTestVars(__in PCWSTR pVarPrefix, __out int*
if ((!SUCCEEDED(TestData::TryGetValue(tmp.Format(L"%s_Count", pVarPrefix), numBlobs))) || (numBlobs < 1))
{
Log::Error(tmp.Format(L"Couldn't read the number of test blobs for %s", pVarPrefix));
- return NULL;
+ return nullptr;
}
TestBlob** ppRtrn = _DefArray_AllocZeroed(TestBlob*, numBlobs);
- if (ppRtrn == NULL)
+ if (ppRtrn == nullptr)
{
- return NULL;
+ return nullptr;
}
for (int i = 0; i < numBlobs; i++)
{
TestBlob* pBlob = new TestBlob();
- if ((pBlob == NULL) || (!pBlob->InitFromTestVars(tmp.Format(L"%s%d", pVarPrefix, i))))
+ if ((pBlob == nullptr) || (!pBlob->InitFromTestVars(tmp.Format(L"%s%d", pVarPrefix, i))))
{
Log::Error(tmp.Format(L"Couldn't initialized test blob %d", i));
*pNumBlobsOut = i;
@@ -760,10 +760,10 @@ TestBlob** TestBlob::CreateBlobsFromTestVars(__in PCWSTR pVarPrefix, __out int*
BuildHelper::~BuildHelper()
{
- if (m_pBuf != NULL)
+ if (m_pBuf != nullptr)
{
Def_Free(m_pBuf);
- m_pBuf = NULL;
+ m_pBuf = nullptr;
}
}
@@ -773,7 +773,7 @@ HRESULT BuildHelper::Build(__in ISectionBuilder* pBuilder)
UINT32 size = pBuilder->GetMaxSizeInBytes();
- BYTE* pBuffer = ((size > 0) ? _DefArray_AllocZeroed(BYTE, size) : NULL);
+ BYTE* pBuffer = ((size > 0) ? _DefArray_AllocZeroed(BYTE, size) : nullptr);
RETURN_IF_NULL_ALLOC(pBuffer);
UINT32 cbWritten = 0;
@@ -784,7 +784,7 @@ HRESULT BuildHelper::Build(__in ISectionBuilder* pBuilder)
return hr;
}
- if (m_pBuf != NULL)
+ if (m_pBuf != nullptr)
{
Def_Free(m_pBuf);
}
diff --git a/dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj b/dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj
index 6681aa051f..96620cd45e 100644
--- a/dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj
+++ b/dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj
@@ -17,14 +17,6 @@
Release
x64
-
- Debug
- ARM
-
-
- Release
- ARM
-
Debug
ARM64
@@ -54,7 +46,6 @@
false
- true
@@ -69,16 +60,26 @@
$(VCInstallDir)lib\onecore;$(LibraryPath)
$(VCInstallDir)lib\onecore\amd64;$(LibraryPath)
- $(VCInstallDir)lib\onecore\arm;$(LibraryPath)
$(VCInstallDir)lib\onecore\arm64;$(LibraryPath)
-
- true
-
-
-
-
+
+
+
+ false
+ %(AdditionalOptions) /Zc:strictStrings-
+
+
%(PreprocessorDefinitions);_WIN32_WINNT=_WIN32_WINNT_WIN10;INLINE_TEST_METHOD_MARKUP;UNICODE;_UNICODE;
@@ -92,31 +93,17 @@
- Level4
- Disabled
..\..\..\..\WindowsAppRuntime_Insights;..\include;..\mrmmin;%(AdditionalIncludeDirectories)
4309;4838;%(DisableSpecificWarnings)
- stdcpp17
-
- true
-
- Level4
- MaxSpeed
- true
- true
..\..\..\..\WindowsAppRuntime_Insights;..\include;..\mrmmin;%(AdditionalIncludeDirectories)
4309;4838;%(DisableSpecificWarnings)
- stdcpp17
Console
- true
- true
- true
diff --git a/dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj b/dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj
index 85d1e17fb7..cda6a1eebd 100644
--- a/dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj
+++ b/dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj
@@ -17,14 +17,6 @@
Release
x64
-
- Debug
- ARM
-
-
- Release
- ARM
-
Debug
ARM64
@@ -44,9 +36,6 @@
/:FULLCLASS
-
- true
-
true
@@ -60,7 +49,6 @@
StaticLibrary
false
v142
- true
Unicode
@@ -73,20 +61,6 @@
StaticLibrary
false
v142
- true
- Unicode
-
-
- StaticLibrary
- true
- v142
- Unicode
-
-
- StaticLibrary
- false
- v142
- true
Unicode
@@ -99,7 +73,6 @@
StaticLibrary
false
v142
- true
Unicode
@@ -112,162 +85,42 @@
-
-
-
- false
-
-
-
- true
-
-
- false
-
-
- true
-
-
- false
-
-
- false
-
-
- true
-
-
- false
-
- Level4
- true
WIN32;UNICODE;_UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
- true
-
- Level4
- true
- true
- true
WIN32;UNICODE;_UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
- true
- true
- true
-
- Level4
- true
UNICODE;_UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
- true
-
- Level4
- true
- true
- true
- UNICODE;_UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
-
- true
- true
- true
-
-
-
-
- Level4
- true
- true
- UNICODE;_UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
-
- true
-
-
-
-
- Level4
- true
- true
- true
- true
UNICODE;_UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
- true
- true
- true
-
..\..\..\..\WindowsAppRuntime_Insights;..\include
- stdcpp17
- Level4
true
- true
UNICODE;_UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
- true
-
- Level4
true
- true
- true
- true
UNICODE;_UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
- true
- true
- true
-
diff --git a/dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj b/dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj
index 5927e22dc3..a1f427203f 100644
--- a/dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj
+++ b/dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj
@@ -1,6 +1,5 @@
-
Debug
@@ -18,14 +17,6 @@
Release
x64
-
- Debug
- ARM
-
-
- Release
- ARM
-
Debug
ARM64
@@ -45,9 +36,6 @@
/:FULLCLASS
-
- true
-
true
@@ -61,7 +49,6 @@
StaticLibrary
false
v142
- true
Unicode
@@ -74,20 +61,6 @@
StaticLibrary
false
v142
- true
- Unicode
-
-
- StaticLibrary
- true
- v142
- Unicode
-
-
- StaticLibrary
- false
- v142
- true
Unicode
@@ -100,7 +73,6 @@
StaticLibrary
false
v142
- true
Unicode
@@ -113,169 +85,46 @@
-
-
-
- false
-
-
-
- true
-
-
- false
-
-
- true
-
-
- false
-
-
- true
-
-
- false
-
-
- true
-
-
- false
-
- Level4
true
- true
WIN32;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
- true
-
- Level4
true
- true
- true
- true
WIN32;_WINDOWS;_USRDLL;UNICODE;_UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
- true
- true
- true
-
- Level4
true
- true
_WINDOWS;_USRDLL;UNICODE;_UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
- true
-
- Level4
- true
- true
- true
- true
- _WINDOWS;_USRDLL;UNICODE;_UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
-
- true
- true
- true
-
-
-
-
- Level4
- true
- true
- _WINDOWS;_USRDLL;UNICODE;_UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
-
- true
-
-
-
-
- Level4
true
- true
- true
- true
_WINDOWS;_USRDLL;UNICODE;_UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
- true
- true
- true
-
..\..\..\..\WindowsAppRuntime_Insights;..\include
- stdcpp17
- Level4
true
- true
_WINDOWS;_USRDLL;UNICODE;_UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
- true
-
- Level4
true
- true
- true
- true
_WINDOWS;_USRDLL;UNICODE;_UNICODE;NDEBUG;_LIB;%(PreprocessorDefinitions)
- true
-
-
-
- true
- true
- true
-
diff --git a/dev/PushNotifications/PushNotificationsLongRunningTask.ProxyStub/PushNotificationsLongRunningTask.ProxyStub.vcxproj b/dev/PushNotifications/PushNotificationsLongRunningTask.ProxyStub/PushNotificationsLongRunningTask.ProxyStub.vcxproj
index f19a675cf6..c35e6a091c 100644
--- a/dev/PushNotifications/PushNotificationsLongRunningTask.ProxyStub/PushNotificationsLongRunningTask.ProxyStub.vcxproj
+++ b/dev/PushNotifications/PushNotificationsLongRunningTask.ProxyStub/PushNotificationsLongRunningTask.ProxyStub.vcxproj
@@ -3,12 +3,7 @@
-
-
- Debug
- ARM
-
Debug
ARM64
@@ -21,10 +16,6 @@
Debug
x64
-
- Release
- ARM
-
Release
ARM64
@@ -54,12 +45,6 @@
v142
Unicode
-
- DynamicLibrary
- true
- v142
- Unicode
-
DynamicLibrary
true
@@ -75,28 +60,18 @@
DynamicLibrary
false
- true
- v142
- Unicode
-
-
- DynamicLibrary
- false
- true
v142
Unicode
DynamicLibrary
false
- true
v142
Unicode
DynamicLibrary
false
- true
v142
Unicode
@@ -111,12 +86,6 @@
-
-
-
-
-
-
@@ -131,37 +100,23 @@
- true
PostBuildEvent
$(PlatformTarget)\$(Configuration)\
-
- true
- PostBuildEvent
-
-
- false
- PostBuildEvent
-
- true
PostBuildEvent
- false
PostBuildEvent
- false
PostBuildEvent
$(PlatformTarget)\$(Configuration)\
- true
PostBuildEvent
- false
PostBuildEvent
@@ -194,68 +149,13 @@
- Level4
- true
WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- Use
- pch.h
- stdcpp17
- %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
-
-
- Windows
- DebugFull
- onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
- PushNotificationsLongRunningTask.ProxyStub.def
-
-
- dlldata.c
- false
- $(PlatformTarget)\$(Configuration)\
-
-
-
-
- Level4
- true
- _ARM_;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- Use
- pch.h
- stdcpp17
- %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
-
-
- Windows
- DebugFull
- onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
- PushNotificationsLongRunningTask.ProxyStub.def
-
-
- dlldata.c
- false
- $(PlatformTarget)\$(Configuration)\
-
-
-
-
- Level4
- true
- true
- true
- _ARM_;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
PushNotificationsLongRunningTask.ProxyStub.def
@@ -267,18 +167,13 @@
- Level4
- true
WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
PushNotificationsLongRunningTask.ProxyStub.def
@@ -290,22 +185,13 @@
- Level4
- true
- true
- true
WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
PushNotificationsLongRunningTask.ProxyStub.def
@@ -317,22 +203,13 @@
- Level4
- true
- true
- true
WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
PushNotificationsLongRunningTask.ProxyStub.def
@@ -344,18 +221,13 @@
- Level4
- true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
Windows
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -369,22 +241,13 @@
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)
Windows
- true
- true
- DebugFull
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
PushNotificationsLongRunningTask.ProxyStub.def
@@ -404,8 +267,6 @@
NotUsing
NotUsing
NotUsing
- NotUsing
- NotUsing
NotUsing
NotUsing
@@ -414,8 +275,6 @@
NotUsing
NotUsing
NotUsing
- NotUsing
- NotUsing
NotUsing
NotUsing
@@ -424,16 +283,12 @@
NotUsing
NotUsing
NotUsing
- NotUsing
- NotUsing
NotUsing
NotUsing
Create
Create
- Create
- Create
Create
Create
Create
@@ -472,4 +327,4 @@
-
\ No newline at end of file
+
diff --git a/dev/PushNotifications/PushNotificationsLongRunningTask.StartupTask/PushNotificationsLongRunningTask.StartupTask.vcxproj b/dev/PushNotifications/PushNotificationsLongRunningTask.StartupTask/PushNotificationsLongRunningTask.StartupTask.vcxproj
index 96eb161826..e778fe9ba5 100644
--- a/dev/PushNotifications/PushNotificationsLongRunningTask.StartupTask/PushNotificationsLongRunningTask.StartupTask.vcxproj
+++ b/dev/PushNotifications/PushNotificationsLongRunningTask.StartupTask/PushNotificationsLongRunningTask.StartupTask.vcxproj
@@ -48,7 +48,6 @@
Application
false
v142
- true
Unicode
@@ -61,7 +60,6 @@
Application
false
v142
- true
Unicode
@@ -100,121 +98,58 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
-
- true
-
-
- false
-
- Level4
- true
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub
Windows
- DebugFull
- Level4
- true
- true
- true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- stdcpp17
- Guard
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub
Windows
- true
- true
- DebugFull
- Level4
- true
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub
Windows
- DebugFull
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- stdcpp17
- Guard
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub
Windows
- true
- true
- DebugFull
- Level4
- true
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub
Windows
- DebugFull
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- Guard
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub
Windows
- true
- true
- DebugFull
diff --git a/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj b/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj
index db21f0141d..854bc776f3 100644
--- a/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj
+++ b/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj
@@ -49,7 +49,6 @@
Application
false
v142
- true
Unicode
@@ -62,7 +61,6 @@
Application
false
v142
- true
Unicode
@@ -101,126 +99,65 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
-
- true
-
-
- false
-
- Level4
- true
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)..\WindowsAppSDK_BootstrapDLL
Windows
- DebugFull
Microsoft.Internal.FrameworkUdk.dll;%(DelayLoadDLLs)
- Level4
- true
- true
- true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- stdcpp17
- Guard
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)..\WindowsAppSDK_BootstrapDLL
Windows
- true
- true
- DebugFull
Microsoft.Internal.FrameworkUdk.dll;%(DelayLoadDLLs)
- Level4
- true
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- stdcpp17
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)..\WindowsAppSDK_BootstrapDLL
Windows
- DebugFull
Microsoft.Internal.FrameworkUdk.dll;%(DelayLoadDLLs)
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- stdcpp17
- Guard
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)..\WindowsAppSDK_BootstrapDLL
Windows
- true
- true
- DebugFull
Microsoft.Internal.FrameworkUdk.dll;%(DelayLoadDLLs)
- Level4
- true
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
stdcpp20
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)..\WindowsAppSDK_BootstrapDLL
Windows
- DebugFull
Microsoft.Internal.FrameworkUdk.dll;%(DelayLoadDLLs)
- Level4
- true
- true
- true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
- true
- Guard
stdcpp20
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)..\WindowsAppSDK_BootstrapDLL
Windows
- true
- true
- DebugFull
Microsoft.Internal.FrameworkUdk.dll;%(DelayLoadDLLs)
diff --git a/dev/RestartAgent/RestartAgent.vcxproj b/dev/RestartAgent/RestartAgent.vcxproj
index f5f4f0d77e..4897210abf 100644
--- a/dev/RestartAgent/RestartAgent.vcxproj
+++ b/dev/RestartAgent/RestartAgent.vcxproj
@@ -50,12 +50,9 @@
true
- true
false
- true
- false
@@ -75,8 +72,7 @@
pch.h
$(IntDir)pch.pch
_CONSOLE;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)
- Level4
- %(AdditionalOptions) /permissive- /bigobj
+ %(AdditionalOptions) /bigobj
%(AdditionalIncludeDirectories);$(BaseOutputPath)\WindowsAppRuntime_BootstrapDLL;$(RepoRoot)\dev\common
@@ -88,7 +84,6 @@
- Disabled
_DEBUG;%(PreprocessorDefinitions)
@@ -99,15 +94,9 @@
- MaxSpeed
- true
- true
NDEBUG;%(PreprocessorDefinitions)
- Guard
- true
- true
diff --git a/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj b/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj
index 20010da1ec..de8cf4a380 100644
--- a/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj
+++ b/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj
@@ -4,12 +4,7 @@
-
-
- Debug
- ARM
-
Debug
ARM64
@@ -18,10 +13,6 @@
Debug
Win32
-
- Release
- ARM
-
Release
ARM64
@@ -58,24 +49,10 @@
v142
Unicode
-
- DynamicLibrary
- true
- v142
- Unicode
-
DynamicLibrary
false
v142
- true
- Unicode
-
-
- DynamicLibrary
- false
- v142
- true
Unicode
@@ -94,14 +71,12 @@
DynamicLibrary
false
v142
- true
Unicode
DynamicLibrary
false
v142
- true
Unicode
@@ -111,15 +86,9 @@
-
-
-
-
-
-
@@ -134,79 +103,32 @@
- true
- Microsoft.WindowsAppRuntime.Bootstrap
-
-
- true
Microsoft.WindowsAppRuntime.Bootstrap
- true
Microsoft.WindowsAppRuntime.Bootstrap
- true
Microsoft.WindowsAppRuntime.Bootstrap
- false
- Microsoft.WindowsAppRuntime.Bootstrap
-
-
- false
Microsoft.WindowsAppRuntime.Bootstrap
- false
Microsoft.WindowsAppRuntime.Bootstrap
- false
Microsoft.WindowsAppRuntime.Bootstrap
Use
- Level4
- true
- %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\IDynamicDependencyLifetimeManager;$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(RepoRoot)\dev\common
- WIN32;_DEBUG;WINDOWSAPPRUNTIMEBOOTSTRAPDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- pch.h
- stdcpp17
-
-
- Windows
- DebugFull
- false
- %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
- onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
- WindowsAppRuntime.Bootstrap.def
- Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
-
-
- None
- None
- false
- %(Filename).h
- $(PlatformTarget)\$(Configuration)\
-
-
-
-
- Use
- Level4
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\IDynamicDependencyLifetimeManager;$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(RepoRoot)\dev\common
WIN32;_DEBUG;WINDOWSAPPRUNTIMEBOOTSTRAPDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
- stdcpp17
Windows
- DebugFull
false
%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
@@ -224,17 +146,12 @@
Use
- Level4
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\IDynamicDependencyLifetimeManager;$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(RepoRoot)\dev\common
_DEBUG;WINDOWSAPPRUNTIMEBOOTSTRAPDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
- stdcpp17
Windows
- DebugFull
false
%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
@@ -252,17 +169,12 @@
Use
- Level4
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\IDynamicDependencyLifetimeManager;$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(RepoRoot)\dev\common
_DEBUG;WINDOWSAPPRUNTIMEBOOTSTRAPDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
- stdcpp17
Windows
- DebugFull
false
%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
@@ -280,53 +192,12 @@
Use
- Level4
- true
- true
- true
- %(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\IDynamicDependencyLifetimeManager;$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(RepoRoot)\dev\common
- WIN32;NDEBUG;WINDOWSAPPRUNTIMEBOOTSTRAPDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- pch.h
- stdcpp17
-
-
- Windows
- true
- true
- DebugFull
- false
- %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
- onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
- WindowsAppRuntime.Bootstrap.def
- Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
-
-
- None
- None
- false
- %(Filename).h
- $(PlatformTarget)\$(Configuration)\
-
-
-
-
- Use
- Level4
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\IDynamicDependencyLifetimeManager;$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(RepoRoot)\dev\common
WIN32;NDEBUG;WINDOWSAPPRUNTIMEBOOTSTRAPDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
- stdcpp17
Windows
- true
- true
- DebugFull
false
%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
@@ -344,21 +215,12 @@
Use
- Level4
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\IDynamicDependencyLifetimeManager;$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(RepoRoot)\dev\common
NDEBUG;WINDOWSAPPRUNTIMEBOOTSTRAPDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
- stdcpp17
Windows
- true
- true
- DebugFull
false
%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
@@ -376,21 +238,12 @@
Use
- Level4
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\IDynamicDependencyLifetimeManager;$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(RepoRoot)\dev\common
NDEBUG;WINDOWSAPPRUNTIMEBOOTSTRAPDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
- stdcpp17
Windows
- true
- true
- DebugFull
false
%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
@@ -422,11 +275,9 @@
Create
- Create
Create
Create
Create
- Create
Create
Create
diff --git a/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj b/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj
index f300173563..cfe8a68e6a 100644
--- a/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj
+++ b/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj
@@ -4,12 +4,7 @@
-
-
- Debug
- ARM
-
Debug
ARM64
@@ -18,10 +13,6 @@
Debug
Win32
-
- Release
- ARM
-
Release
ARM64
@@ -58,24 +49,10 @@
v142
Unicode
-
- DynamicLibrary
- true
- v142
- Unicode
-
DynamicLibrary
false
v142
- true
- Unicode
-
-
- DynamicLibrary
- false
- v142
- true
Unicode
@@ -94,14 +71,12 @@
DynamicLibrary
false
v142
- true
Unicode
DynamicLibrary
false
v142
- true
Unicode
@@ -124,15 +99,9 @@
-
-
-
-
-
-
@@ -147,72 +116,32 @@
- true
- Microsoft.WindowsAppRuntime
-
-
- true
Microsoft.WindowsAppRuntime
- true
Microsoft.WindowsAppRuntime
- true
Microsoft.WindowsAppRuntime
- false
- Microsoft.WindowsAppRuntime
-
-
- false
Microsoft.WindowsAppRuntime
- false
Microsoft.WindowsAppRuntime
- false
Microsoft.WindowsAppRuntime
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)\dev\WindowsAppRuntime_Insights;$(RepoRoot)dev\licensing;$(RepoRoot)\dev\common
Use
- Level4
- true
- WIN32;_DEBUG;WINDOWSAPPRUNTIMEDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- pch.h
-
-
- Windows
- DebugFull
- false
- onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
- WindowsAppRuntime.def
- Microsoft.Internal.FrameworkUdk.dll;%(DelayLoadDLLs)
-
-
- $(RepoRoot)\dev\common
-
-
-
-
- %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)\dev\WindowsAppRuntime_Insights;$(RepoRoot)dev\licensing;$(RepoRoot)\dev\common
- Use
- Level4
- true
WIN32;_DEBUG;WINDOWSAPPRUNTIMEDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
Windows
- DebugFull
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
WindowsAppRuntime.def
@@ -226,15 +155,11 @@
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)\dev\WindowsAppRuntime_Insights;$(RepoRoot)dev\licensing;$(RepoRoot)\dev\common
Use
- Level4
- true
_DEBUG;WINDOWSAPPRUNTIMEDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
Windows
- DebugFull
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
WindowsAppRuntime.def
@@ -248,15 +173,11 @@
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)\dev\WindowsAppRuntime_Insights;$(RepoRoot)dev\licensing;$(RepoRoot)\dev\common
Use
- Level4
- true
_DEBUG;WINDOWSAPPRUNTIMEDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
Windows
- DebugFull
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
WindowsAppRuntime.def
@@ -270,45 +191,11 @@
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)\dev\WindowsAppRuntime_Insights;$(RepoRoot)dev\licensing;$(RepoRoot)\dev\common
Use
- Level4
- true
- true
- true
- WIN32;NDEBUG;WINDOWSAPPRUNTIMEDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
- pch.h
-
-
- Windows
- true
- true
- DebugFull
- false
- onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
- WindowsAppRuntime.def
- Microsoft.Internal.FrameworkUdk.dll;%(DelayLoadDLLs)
-
-
- $(RepoRoot)\dev\common
-
-
-
-
- %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)\dev\WindowsAppRuntime_Insights;$(RepoRoot)dev\licensing;$(RepoRoot)\dev\common
- Use
- Level4
- true
- true
- true
WIN32;NDEBUG;WINDOWSAPPRUNTIMEDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
Windows
- true
- true
- DebugFull
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
WindowsAppRuntime.def
@@ -322,19 +209,11 @@
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)\dev\WindowsAppRuntime_Insights;$(RepoRoot)dev\licensing;$(RepoRoot)\dev\common
Use
- Level4
- true
- true
- true
NDEBUG;WINDOWSAPPRUNTIMEDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
Windows
- true
- true
- DebugFull
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
WindowsAppRuntime.def
@@ -348,19 +227,11 @@
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)..\DynamicDependency.DataStore.ProxyStub;$(OutDir)..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)\dev\WindowsAppRuntime_Insights;$(RepoRoot)dev\licensing;$(RepoRoot)\dev\common
Use
- Level4
- true
- true
- true
NDEBUG;WINDOWSAPPRUNTIMEDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
Windows
- true
- true
- DebugFull
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
WindowsAppRuntime.def
@@ -379,11 +250,9 @@
Create
- Create
Create
Create
Create
- Create
Create
Create
diff --git a/dev/WindowsAppRuntime_MSIXInstallFromPath/WindowsAppRuntime_MSIXInstallFromPath.vcxproj b/dev/WindowsAppRuntime_MSIXInstallFromPath/WindowsAppRuntime_MSIXInstallFromPath.vcxproj
index d3b9d4a50b..e8a3f026ae 100644
--- a/dev/WindowsAppRuntime_MSIXInstallFromPath/WindowsAppRuntime_MSIXInstallFromPath.vcxproj
+++ b/dev/WindowsAppRuntime_MSIXInstallFromPath/WindowsAppRuntime_MSIXInstallFromPath.vcxproj
@@ -4,7 +4,6 @@
-
Debug
@@ -55,7 +54,6 @@
Application
false
v142
- true
Unicode
@@ -74,14 +72,12 @@
Application
false
v142
- true
Unicode
Application
false
v142
- true
Unicode
@@ -110,27 +106,21 @@
- true
WindowsAppRuntime_MSIXInstallFromPath
- true
WindowsAppRuntime_MSIXInstallFromPath
- true
WindowsAppRuntime_MSIXInstallFromPath
- false
WindowsAppRuntime_MSIXInstallFromPath
- false
WindowsAppRuntime_MSIXInstallFromPath
- false
WindowsAppRuntime_MSIXInstallFromPath
@@ -144,17 +134,12 @@
Use
- Level4
- true
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(SolutionDir)common;$(OutDir)\..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)dev\PushNotifications\PushNotificationsLongRunningTask.StartupTask
WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
- stdcpp17
Console
- DebugFull
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -162,17 +147,12 @@
Use
- Level4
- true
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(SolutionDir)common;$(OutDir)\..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)dev\PushNotifications\PushNotificationsLongRunningTask.StartupTask
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
- stdcpp17
Console
- DebugFull
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -180,17 +160,12 @@
Use
- Level4
- true
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(SolutionDir)common;$(OutDir)\..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)dev\PushNotifications\PushNotificationsLongRunningTask.StartupTask
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
- stdcpp17
Console
- DebugFull
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -198,21 +173,12 @@
Use
- Level4
- true
- true
- true
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(SolutionDir)common;$(OutDir)\..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)dev\PushNotifications\PushNotificationsLongRunningTask.StartupTask
WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
- stdcpp17
Console
- true
- true
- DebugFull
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -220,21 +186,12 @@
Use
- Level4
- true
- true
- true
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(SolutionDir)common;$(OutDir)\..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)dev\PushNotifications\PushNotificationsLongRunningTask.StartupTask
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
- stdcpp17
Console
- true
- true
- DebugFull
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
@@ -242,21 +199,12 @@
Use
- Level4
- true
- true
- true
%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)$(PlatformTarget)\$(Configuration);$(SolutionDir)common;$(OutDir)\..\PushNotificationsLongRunningTask.ProxyStub;$(RepoRoot)dev\PushNotifications\PushNotificationsLongRunningTask.StartupTask
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
pch.h
- stdcpp17
Console
- true
- true
- DebugFull
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
diff --git a/dev/WindowsAppSDK.Build.cpp.props b/dev/WindowsAppSDK.Build.cpp.props
deleted file mode 100644
index 0613e67cb1..0000000000
--- a/dev/WindowsAppSDK.Build.cpp.props
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
- %(AdditionalOptions) /ZH:SHA_256
-
-
-
-
- Guard
-
-
-
diff --git a/installer/dev/WindowsAppRuntimeInstall.vcxproj b/installer/dev/WindowsAppRuntimeInstall.vcxproj
index e60a31e5c3..3eb1d5fe77 100644
--- a/installer/dev/WindowsAppRuntimeInstall.vcxproj
+++ b/installer/dev/WindowsAppRuntimeInstall.vcxproj
@@ -47,12 +47,9 @@
true
- true
false
- true
- false
false
@@ -79,13 +76,11 @@
pch.h
$(IntDir)pch.pch
_CONSOLE;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)
- Level4
- %(AdditionalOptions) /permissive- /bigobj
+ %(AdditionalOptions) /bigobj
- Disabled
_DEBUG;%(PreprocessorDefinitions)
$(RepoRoot)dev\Common;$(RepoRoot)dev\PushNotifications;$(RepoRoot)installer\dev\Telemetry;%(AdditionalIncludeDirectories)
@@ -97,16 +92,11 @@
- MaxSpeed
- true
- true
NDEBUG;%(PreprocessorDefinitions)
$(RepoRoot)dev\Common;$(RepoRoot)dev\PushNotifications;$(RepoRoot)installer\dev\Telemetry;%(AdditionalIncludeDirectories)
Console
- true
- true
false
onecore.lib;onecoreuap.lib;%(AdditionalDependencies)
diff --git a/installer/test/InstallerFunctionalTests/InstallerFunctionalTests.vcxproj b/installer/test/InstallerFunctionalTests/InstallerFunctionalTests.vcxproj
index cee8cd7584..616cfd2503 100644
--- a/installer/test/InstallerFunctionalTests/InstallerFunctionalTests.vcxproj
+++ b/installer/test/InstallerFunctionalTests/InstallerFunctionalTests.vcxproj
@@ -47,7 +47,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -69,7 +68,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -77,7 +75,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -105,29 +102,9 @@
-
- true
-
-
- true
-
-
- true
-
-
- false
-
-
- false
-
-
- false
-
Use
- Level3
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;%(PreprocessorDefinitions)
true
@@ -141,8 +118,6 @@
Use
- Level3
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
_DEBUG;%(PreprocessorDefinitions)
true
@@ -156,8 +131,6 @@
Use
- Level3
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
_DEBUG;%(PreprocessorDefinitions)
true
@@ -171,10 +144,6 @@
Use
- Level3
- true
- true
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;%(PreprocessorDefinitions)
true
@@ -182,18 +151,12 @@
Windows
- true
- true
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
Use
- Level3
- true
- true
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
NDEBUG;%(PreprocessorDefinitions)
true
@@ -201,18 +164,12 @@
Windows
- true
- true
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
Use
- Level3
- true
- true
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
NDEBUG;%(PreprocessorDefinitions)
true
@@ -220,8 +177,6 @@
Windows
- true
- true
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
diff --git a/test/AccessControlTests/APITests.cpp b/test/AccessControlTests/APITests.cpp
index 68e5940a98..a1465ff43b 100644
--- a/test/AccessControlTests/APITests.cpp
+++ b/test/AccessControlTests/APITests.cpp
@@ -88,7 +88,7 @@ namespace Test::AccessControl
DWORD exitCode{};
VERIFY_WIN32_BOOL_SUCCEEDED(GetExitCodeProcess(m_processHandle.get(), &exitCode));
- VERIFY_ARE_EQUAL(exitCode, 0);
+ VERIFY_ARE_EQUAL(exitCode, 0u);
}
// Remove in reverse order to avoid conflicts between inter-dependent packages.
::Test::Packages::RemovePackage(GetTestPackageFamilyName());
@@ -116,7 +116,7 @@ namespace Test::AccessControl
VERIFY_IS_TRUE(wil::handle_wait(m_processHandle.get(), 10000));
DWORD exitCode{};
VERIFY_WIN32_BOOL_SUCCEEDED(GetExitCodeProcess(m_processHandle.get(), &exitCode));
- VERIFY_ARE_EQUAL(exitCode, 0);
+ VERIFY_ARE_EQUAL(exitCode, 0u);
}
VERIFY_IS_TRUE(::Test::Packages::IsPackageRegistered_WindowsAppRuntimeFramework());
VERIFY_IS_TRUE(::Test::Packages::IsPackageRegistered_DynamicDependencyDataStore());
diff --git a/test/AccessControlTests/AccessControlTests.vcxproj b/test/AccessControlTests/AccessControlTests.vcxproj
index 3ffd44c0ce..15b398f04b 100644
--- a/test/AccessControlTests/AccessControlTests.vcxproj
+++ b/test/AccessControlTests/AccessControlTests.vcxproj
@@ -51,14 +51,12 @@
DynamicLibrary
false
v142
- true
Unicode
DynamicLibrary
false
v142
- true
Unicode
@@ -71,7 +69,6 @@
DynamicLibrary
false
v142
- true
Unicode
@@ -99,148 +96,94 @@
-
- true
-
-
- true
-
-
- false
-
-
- false
-
-
- true
-
-
- false
-
- Level3
- true
WIN32;_DEBUG;%(PreprocessorDefinitions)
- true
Use
pch.h
$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;%(AdditionalIncludeDirectories)
Windows
- true
false
onecore.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies)
$(OutDir)\..\WindowsAppRuntime_DLL;%(AdditionalLibraryDirectories)
- Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
+ Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
- Level3
- true
WIN32;_DEBUG;%(PreprocessorDefinitions)
- true
Use
pch.h
$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;%(AdditionalIncludeDirectories)
Windows
- true
false
onecore.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies)
$(OutDir)\..\WindowsAppRuntime_DLL;%(AdditionalLibraryDirectories)
- Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
+ Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
- Level3
- true
- true
- true
WIN32;NDEBUG;%(PreprocessorDefinitions)
- true
Use
pch.h
$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;%(AdditionalIncludeDirectories)
Windows
- true
- true
- true
false
onecore.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies)
$(OutDir)\..\WindowsAppRuntime_DLL;%(AdditionalLibraryDirectories)
- Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
+ Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
- Level3
- true
- true
- true
WIN32;NDEBUG;%(PreprocessorDefinitions)
- true
Use
pch.h
$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;%(AdditionalIncludeDirectories)
Windows
- true
- true
- true
false
onecore.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies)
$(OutDir)\..\WindowsAppRuntime_DLL;%(AdditionalLibraryDirectories)
- Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
+ Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
- Level3
- true
_DEBUG;%(PreprocessorDefinitions)
- true
Use
pch.h
$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;%(AdditionalIncludeDirectories)
Windows
- true
false
onecore.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies)
$(OutDir)\..\WindowsAppRuntime_DLL;%(AdditionalLibraryDirectories)
- Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
+ Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
- Level3
- true
- true
- true
NDEBUG;%(PreprocessorDefinitions)
- true
Use
pch.h
$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;%(AdditionalIncludeDirectories)
Windows
- true
- true
- true
false
onecore.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies)
$(OutDir)\..\WindowsAppRuntime_DLL;%(AdditionalLibraryDirectories)
- Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
+ Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
@@ -298,4 +241,7 @@
+
+
+
diff --git a/test/AppLifecycle/AppLifecycle.vcxproj b/test/AppLifecycle/AppLifecycle.vcxproj
index 087cea7986..6b8226987b 100644
--- a/test/AppLifecycle/AppLifecycle.vcxproj
+++ b/test/AppLifecycle/AppLifecycle.vcxproj
@@ -48,7 +48,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -70,7 +69,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -78,7 +76,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -107,31 +104,9 @@
-
- false
-
-
- true
-
-
- true
-
-
- true
-
-
- false
-
-
- false
-
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
WIN32;NDEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -139,8 +114,6 @@
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)
Microsoft.WindowsAppRuntime.Bootstrap.dll;%(DelayLoadDLLs)
@@ -149,8 +122,6 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
WIN32;_DEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -166,8 +137,6 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
_DEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -183,8 +152,6 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
_DEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -200,10 +167,6 @@
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
NDEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -211,8 +174,6 @@
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)
Microsoft.WindowsAppRuntime.Bootstrap.dll;%(DelayLoadDLLs)
@@ -221,10 +182,6 @@
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
NDEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -232,8 +189,6 @@
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)
Microsoft.WindowsAppRuntime.Bootstrap.dll;%(DelayLoadDLLs)
diff --git a/test/AppLifecycle/Shared.cpp b/test/AppLifecycle/Shared.cpp
index 053264982d..1a0b17b62a 100644
--- a/test/AppLifecycle/Shared.cpp
+++ b/test/AppLifecycle/Shared.cpp
@@ -102,7 +102,7 @@ namespace Test::AppLifecycle
auto failureEventIndex = WAIT_OBJECT_0 + 1;
VERIFY_ARE_NOT_EQUAL(waitResult, failureEventIndex);
- VERIFY_ARE_NOT_EQUAL(waitResult, WAIT_TIMEOUT);
+ VERIFY_ARE_NOT_EQUAL(waitResult, static_cast(WAIT_TIMEOUT));
if (waitResult == WAIT_FAILED)
{
auto lastError = GetLastError();
diff --git a/test/Common/Common.vcxproj b/test/Common/Common.vcxproj
index 4b87f29fda..3645b19a9a 100644
--- a/test/Common/Common.vcxproj
+++ b/test/Common/Common.vcxproj
@@ -44,12 +44,9 @@
Unicode
- false
false
- true
- true
true
@@ -78,8 +75,6 @@
Use
- Level4
- true
true
pch.h
$(RepoRoot)\test\inc;$(RepoRoot)\Dev\Common;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
@@ -95,13 +90,9 @@
- true
- true
NDEBUG;%(PreprocessorDefinitions)
- true
- true
diff --git a/test/Deployment/DeploymentTests.vcxproj b/test/Deployment/DeploymentTests.vcxproj
index 79f79f8eaa..2ad077f28f 100644
--- a/test/Deployment/DeploymentTests.vcxproj
+++ b/test/Deployment/DeploymentTests.vcxproj
@@ -48,7 +48,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -70,7 +69,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -78,7 +76,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -107,31 +104,9 @@
-
- false
-
-
- true
-
-
- true
-
-
- true
-
-
- false
-
-
- false
-
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
WIN32;NDEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -139,8 +114,6 @@
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)
@@ -148,8 +121,6 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
WIN32;_DEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -164,8 +135,6 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
_DEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -180,8 +149,6 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
_DEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -196,10 +163,6 @@
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
NDEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -207,8 +170,6 @@
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)
@@ -216,10 +177,6 @@
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
NDEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -227,8 +184,6 @@
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)
diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj
index 9727a2d66b..984627598d 100644
--- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj
+++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj
@@ -41,12 +41,9 @@
Unicode
- false
false
- true
- true
true
@@ -75,10 +72,6 @@
NotUsing
- Level4
- true
- stdcpp17
- true
true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
$(RepoRoot)\test\DynamicDependency\Test_BootstrapAutoInitialize\CPP;%(AdditionalIncludeDirectories)
@@ -91,13 +84,9 @@
- true
- true
NDEBUG;%(PreprocessorDefinitions)
- true
- true
diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj
index 9d7df3a5e9..2e9e75ee91 100644
--- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj
+++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj
@@ -41,12 +41,9 @@
Unicode
- false
false
- true
- true
true
@@ -75,10 +72,6 @@
NotUsing
- Level4
- true
- stdcpp17
- true
true
MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_DEFAULT;%(PreprocessorDefinitions)
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
@@ -92,13 +85,9 @@
- true
- true
NDEBUG;%(PreprocessorDefinitions)
- true
- true
diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj
index 35e3a8edb1..4efba1e571 100644
--- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj
+++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj
@@ -41,12 +41,9 @@
Unicode
- false
false
- true
- true
true
@@ -75,10 +72,6 @@
NotUsing
- Level4
- true
- stdcpp17
- true
true
MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK;%(PreprocessorDefinitions)
MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK_IFDEBUGGERATTACHED;%(PreprocessorDefinitions)
@@ -96,13 +89,9 @@
- true
- true
NDEBUG;%(PreprocessorDefinitions)
- true
- true
diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj
index 399b675d09..d526d3a74a 100644
--- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj
+++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj
@@ -41,12 +41,9 @@
Unicode
- false
false
- true
- true
true
@@ -75,10 +72,6 @@
NotUsing
- Level4
- true
- stdcpp17
- true
true
MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_NONE;%(PreprocessorDefinitions)
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
@@ -92,13 +85,9 @@
- true
- true
NDEBUG;%(PreprocessorDefinitions)
- true
- true
diff --git a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj
index c3b3a1bb26..34c06db9d1 100644
--- a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj
+++ b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj
@@ -2,10 +2,6 @@
-
- Debug
- ARM
-
Debug
ARM64
@@ -14,10 +10,6 @@
Debug
Win32
-
- Release
- ARM
-
Release
ARM64
@@ -52,26 +44,10 @@
Unicode
false
-
- DynamicLibrary
- true
- v142
- Unicode
- false
-
DynamicLibrary
false
v142
- true
- Unicode
- false
-
-
- DynamicLibrary
- false
- v142
- true
Unicode
false
@@ -93,7 +69,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -101,7 +76,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -112,15 +86,9 @@
-
-
-
-
-
-
@@ -134,37 +102,9 @@
-
- false
-
-
- false
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- false
-
-
- false
-
Use
- Level4
- true
- true
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
WIN32;NDEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
true
@@ -172,29 +112,6 @@
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)
- Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
-
-
-
-
- Use
- Level4
- true
- true
- true
- $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
- WIN32;NDEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
- 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)
Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
@@ -203,25 +120,6 @@
Use
- Level4
- true
- $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
- WIN32;_DEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
- 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)
- Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
-
-
-
-
- Use
- Level4
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
WIN32;_DEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
true
@@ -237,8 +135,6 @@
Use
- Level4
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
_DEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
true
@@ -254,8 +150,6 @@
Use
- Level4
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
_DEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
true
@@ -271,10 +165,6 @@
Use
- Level4
- true
- true
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
NDEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
true
@@ -282,8 +172,6 @@
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)
Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
@@ -292,10 +180,6 @@
Use
- Level4
- true
- true
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
NDEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
true
@@ -303,8 +187,6 @@
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)
Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
diff --git a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj
index e8601f67a2..404a387f3e 100644
--- a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj
+++ b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj
@@ -2,10 +2,6 @@
-
- Debug
- ARM
-
Debug
ARM64
@@ -14,10 +10,6 @@
Debug
Win32
-
- Release
- ARM
-
Release
ARM64
@@ -57,26 +49,10 @@
Unicode
false
-
- DynamicLibrary
- true
- v142
- Unicode
- false
-
DynamicLibrary
false
v142
- true
- Unicode
- false
-
-
- DynamicLibrary
- false
- v142
- true
Unicode
false
@@ -98,7 +74,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -106,7 +81,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -117,15 +91,9 @@
-
-
-
-
-
-
@@ -139,37 +107,9 @@
-
- false
-
-
- false
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- false
-
-
- false
-
Use
- Level4
- true
- true
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
WIN32;NDEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
true
@@ -177,29 +117,6 @@
Windows
- true
- true
- $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
- onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
- Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
-
-
-
-
- Use
- Level4
- true
- true
- true
- $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
- WIN32;NDEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
- true
- pch.h
-
-
- Windows
- true
- true
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
@@ -208,25 +125,6 @@
Use
- Level4
- true
- $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
- WIN32;_DEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
- true
- pch.h
-
-
- Windows
- $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
- onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
- Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
-
-
-
-
- Use
- Level4
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
WIN32;_DEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
true
@@ -242,8 +140,6 @@
Use
- Level4
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
_DEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
true
@@ -259,8 +155,6 @@
Use
- Level4
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
_DEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
true
@@ -276,10 +170,6 @@
Use
- Level4
- true
- true
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
NDEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
true
@@ -287,8 +177,6 @@
Windows
- true
- true
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
@@ -297,10 +185,6 @@
Use
- Level4
- true
- true
- true
$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(OutDir)\..\Framework.Math.Add;$(OutDir)\..\Framework.Math.Multiply
NDEBUG;%(PreprocessorDefinitions);PRTEST_MODE_UWP=0
true
@@ -308,8 +192,6 @@
Windows
- true
- true
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
Microsoft.WindowsAppRuntime.Bootstrap.dll;Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
diff --git a/test/DynamicDependency/data/Framework.Math.Add/Framework.Math.Add.vcxproj b/test/DynamicDependency/data/Framework.Math.Add/Framework.Math.Add.vcxproj
index 0a1b7d844c..41a0d3c59a 100644
--- a/test/DynamicDependency/data/Framework.Math.Add/Framework.Math.Add.vcxproj
+++ b/test/DynamicDependency/data/Framework.Math.Add/Framework.Math.Add.vcxproj
@@ -55,19 +55,16 @@
DynamicLibrary
false
- true
v142
DynamicLibrary
false
- true
v142
DynamicLibrary
false
- true
v142
@@ -135,7 +132,6 @@
Use
false
- Level4
pch.h
@@ -147,7 +143,6 @@
Use
false
- Level4
pch.h
@@ -159,7 +154,6 @@
Use
false
- Level4
pch.h
@@ -171,7 +165,6 @@
Use
false
- Level4
pch.h
@@ -183,7 +176,6 @@
Use
false
- Level4
pch.h
@@ -195,7 +187,6 @@
Use
false
- Level4
pch.h
@@ -207,7 +198,6 @@
Use
false
- Level4
pch.h
@@ -219,7 +209,6 @@
Use
false
- Level4
pch.h
diff --git a/test/DynamicDependency/data/Framework.Math.Multiply/Framework.Math.Multiply.vcxproj b/test/DynamicDependency/data/Framework.Math.Multiply/Framework.Math.Multiply.vcxproj
index cea16cf83c..94c507ed63 100644
--- a/test/DynamicDependency/data/Framework.Math.Multiply/Framework.Math.Multiply.vcxproj
+++ b/test/DynamicDependency/data/Framework.Math.Multiply/Framework.Math.Multiply.vcxproj
@@ -55,19 +55,16 @@
DynamicLibrary
false
- true
v142
DynamicLibrary
false
- true
v142
DynamicLibrary
false
- true
v142
@@ -135,7 +132,6 @@
Use
false
- Level4
pch.h
@@ -148,7 +144,6 @@
Use
false
- Level4
pch.h
@@ -161,7 +156,6 @@
Use
false
- Level4
pch.h
@@ -174,7 +168,6 @@
Use
false
- Level4
pch.h
@@ -187,7 +180,6 @@
Use
false
- Level4
pch.h
@@ -200,7 +192,6 @@
Use
false
- Level4
pch.h
@@ -213,7 +204,6 @@
Use
false
- Level4
pch.h
@@ -226,7 +216,6 @@
Use
false
- Level4
pch.h
diff --git a/test/DynamicDependency/data/Framework.Widgets/Framework.Widgets.vcxproj b/test/DynamicDependency/data/Framework.Widgets/Framework.Widgets.vcxproj
index 49d140e9bb..ae68ddcfb3 100644
--- a/test/DynamicDependency/data/Framework.Widgets/Framework.Widgets.vcxproj
+++ b/test/DynamicDependency/data/Framework.Widgets/Framework.Widgets.vcxproj
@@ -61,19 +61,16 @@
DynamicLibrary
false
- true
v142
DynamicLibrary
false
- true
v142
DynamicLibrary
false
- true
v142
@@ -135,7 +132,6 @@
Use
false
- Level4
pch.h
@@ -149,7 +145,6 @@
Use
false
- Level4
pch.h
@@ -163,7 +158,6 @@
Use
false
- Level4
pch.h
@@ -177,7 +171,6 @@
Use
false
- Level4
pch.h
@@ -190,7 +183,6 @@
Use
false
- Level4
pch.h
@@ -204,7 +196,6 @@
Use
false
- Level4
pch.h
@@ -218,7 +209,6 @@
Use
false
- Level4
pch.h
@@ -232,7 +222,6 @@
Use
false
- Level4
pch.h
diff --git a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj
index baa690e7ba..5025cb2136 100644
--- a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj
+++ b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj
@@ -37,7 +37,6 @@
DynamicLibrary
false
v142
- true
Unicode
@@ -50,7 +49,6 @@
DynamicLibrary
false
v142
- true
Unicode
@@ -72,31 +70,15 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
- Level4
- true
WIN32;_DEBUG;ENVIRONMENTMANAGERTESTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Create
pch.h
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(MSBuildProjectDirectory)\..\..\dev\common
Windows
- true
false
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies)
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
@@ -105,21 +87,13 @@
- Level4
- true
- true
- true
WIN32;NDEBUG;ENVIRONMENTMANAGERTESTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Create
pch.h
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(MSBuildProjectDirectory)\..\..\dev\common
Windows
- true
- true
- true
false
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies)
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
@@ -128,17 +102,13 @@
- Level4
- true
_DEBUG;ENVIRONMENTMANAGERTESTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Create
pch.h
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(MSBuildProjectDirectory)\..\..\dev\common
Windows
- true
false
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies)
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
@@ -147,21 +117,13 @@
- Level4
- true
- true
- true
NDEBUG;ENVIRONMENTMANAGERTESTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Create
pch.h
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(MSBuildProjectDirectory)\..\..\dev\common
Windows
- true
- true
- true
false
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;wex.common.lib;wex.logger.lib;te.common.lib;%(AdditionalDependencies)
$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
diff --git a/test/PowerNotifications/PowerNotifications.vcxproj b/test/PowerNotifications/PowerNotifications.vcxproj
index e073c417db..bb13609305 100644
--- a/test/PowerNotifications/PowerNotifications.vcxproj
+++ b/test/PowerNotifications/PowerNotifications.vcxproj
@@ -37,7 +37,6 @@
DynamicLibrary
false
v142
- true
Unicode
@@ -50,7 +49,6 @@
DynamicLibrary
false
v142
- true
Unicode
@@ -71,87 +69,51 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
- Level4
- true
WIN32;_DEBUG;POWERNOTIFICATIONS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
$(ProjectDir)..\inc;$(ProjectDir)..\..\dev\WindowsAppRuntime_BootstrapDLL\
Windows
- true
false
- Level4
- true
- true
- true
WIN32;NDEBUG;POWERNOTIFICATIONS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
$(ProjectDir)..\inc;$(ProjectDir)..\..\dev\WindowsAppRuntime_BootstrapDLL\
Windows
- true
- true
- true
false
- Level4
- true
_DEBUG;POWERNOTIFICATIONS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
$(ProjectDir)..\inc;$(ProjectDir)..\..\dev\WindowsAppRuntime_BootstrapDLL\
Windows
- true
false
- Level4
- true
- true
- true
NDEBUG;POWERNOTIFICATIONS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
$(ProjectDir)..\inc;$(ProjectDir)..\..\dev\WindowsAppRuntime_BootstrapDLL\
Windows
- true
- true
- true
false
diff --git a/test/PushNotificationTests/PushNotificationTests.vcxproj b/test/PushNotificationTests/PushNotificationTests.vcxproj
index 838792d789..352b755b20 100644
--- a/test/PushNotificationTests/PushNotificationTests.vcxproj
+++ b/test/PushNotificationTests/PushNotificationTests.vcxproj
@@ -42,12 +42,9 @@
Unicode
- false
false
- true
- true
true
@@ -76,8 +73,6 @@
Use
- Level4
- true
true
pch.h
$(RepoRoot)\test\inc;$(RepoRoot)\Dev\Common;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
@@ -93,13 +88,9 @@
- true
- true
NDEBUG;%(PreprocessorDefinitions)
- true
- true
diff --git a/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj b/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj
index da48392a8a..b9f816ac55 100644
--- a/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj
+++ b/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj
@@ -69,7 +69,6 @@
Application
false
v142
- true
Unicode
@@ -82,7 +81,6 @@
Application
false
v142
- true
Unicode
@@ -96,7 +94,6 @@
Application
false
v142
- true
Unicode
false
@@ -125,33 +122,12 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
-
- true
-
-
- false
-
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
WIN32;_DEBUG;%(PreprocessorDefinitions)
pch.h
- stdcpp17
Console
@@ -163,19 +139,12 @@
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
WIN32;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)
@@ -184,36 +153,26 @@
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
+ 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)
@@ -222,12 +181,9 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
_DEBUG;%(PreprocessorDefinitions)
pch.h
- stdcpp17
Console
@@ -239,19 +195,12 @@
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)
diff --git a/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj b/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj
index ef6fae9ba6..aad8697bf0 100644
--- a/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj
+++ b/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj
@@ -2,10 +2,6 @@
-
- Debug
- ARM
-
Debug
ARM64
@@ -14,10 +10,6 @@
Debug
Win32
-
- Release
- ARM
-
Release
ARM64
@@ -52,26 +44,10 @@
Unicode
false
-
- Application
- true
- v142
- Unicode
- false
-
Application
false
v142
- true
- Unicode
- false
-
-
- Application
- false
- v142
- true
Unicode
false
@@ -93,7 +69,6 @@
Application
false
v142
- true
Unicode
false
@@ -101,7 +76,6 @@
Application
false
v142
- true
Unicode
false
@@ -114,15 +88,9 @@
-
-
-
-
-
-
@@ -136,68 +104,16 @@
-
- false
-
-
- false
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- false
-
-
- false
-
Use
- Level3
- true
- true
- true
- %(AdditionalIncludeDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL;$(BaseOutputPath)\WindowsAppRuntime_BootstrapDLL;$(RepoRoot)\dev\common;..\..\inc
- WIN32;NDEBUG;%(PreprocessorDefinitions)
- true
- pch.h
- stdcpp17
-
-
- Console
- true
- true
- %(AdditionalLibraryDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL
- onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
-
-
-
-
- Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL;$(BaseOutputPath)\WindowsAppRuntime_BootstrapDLL;$(RepoRoot)\dev\common;..\..\inc
WIN32;NDEBUG;%(PreprocessorDefinitions)
true
pch.h
- stdcpp17
Console
- true
- true
%(AdditionalLibraryDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
@@ -205,30 +121,10 @@
Use
- Level3
- true
- %(AdditionalIncludeDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL;$(BaseOutputPath)\WindowsAppRuntime_BootstrapDLL;$(RepoRoot)\dev\common;..\..\inc
- WIN32;_DEBUG;%(PreprocessorDefinitions)
- true
- pch.h
- stdcpp17
-
-
- Console
- %(AdditionalLibraryDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL
- onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
-
-
-
-
- Use
- Level3
- true
%(AdditionalIncludeDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL;$(BaseOutputPath)\WindowsAppRuntime_BootstrapDLL;$(RepoRoot)\dev\common;..\..\inc
WIN32;_DEBUG;%(PreprocessorDefinitions)
true
pch.h
- stdcpp17
Console
@@ -239,13 +135,10 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL;$(BaseOutputPath)\WindowsAppRuntime_BootstrapDLL;$(RepoRoot)\dev\common;..\..\inc
_DEBUG;%(PreprocessorDefinitions)
true
pch.h
- stdcpp17
Console
@@ -256,13 +149,10 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL;$(BaseOutputPath)\WindowsAppRuntime_BootstrapDLL;$(RepoRoot)\dev\common;..\..\inc
_DEBUG;%(PreprocessorDefinitions)
true
pch.h
- stdcpp17
Console
@@ -273,20 +163,13 @@
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL;$(BaseOutputPath)\WindowsAppRuntime_BootstrapDLL;$(RepoRoot)\dev\common;..\..\inc
NDEBUG;%(PreprocessorDefinitions)
true
pch.h
- stdcpp17
Console
- true
- true
%(AdditionalLibraryDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
@@ -294,20 +177,13 @@
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL;$(BaseOutputPath)\WindowsAppRuntime_BootstrapDLL;$(RepoRoot)\dev\common;..\..\inc
NDEBUG;%(PreprocessorDefinitions)
true
pch.h
- stdcpp17
Console
- true
- true
%(AdditionalLibraryDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
diff --git a/test/TestApps/AppLifecycleTestApp/RequestRestartTest.cpp b/test/TestApps/AppLifecycleTestApp/RequestRestartTest.cpp
index d1521a67e3..2ef58a05f4 100644
--- a/test/TestApps/AppLifecycleTestApp/RequestRestartTest.cpp
+++ b/test/TestApps/AppLifecycleTestApp/RequestRestartTest.cpp
@@ -11,7 +11,7 @@ using namespace winrt::Windows::ApplicationModel::Activation;
using namespace winrt::Microsoft::Windows::AppLifecycle;
using namespace std::chrono;
-bool RunRequestRestartTestSucceeded(const AppActivationArguments& args)
+bool RunRequestRestartTestSucceeded(const AppActivationArguments& /*args*/)
{
SignalPhase(c_testRequestRestartNowPhaseEventName);
diff --git a/test/TestApps/ManualTestApp/ManualTestApp.vcxproj b/test/TestApps/ManualTestApp/ManualTestApp.vcxproj
index d7133508e6..05f8b31b32 100644
--- a/test/TestApps/ManualTestApp/ManualTestApp.vcxproj
+++ b/test/TestApps/ManualTestApp/ManualTestApp.vcxproj
@@ -2,10 +2,6 @@
-
- Debug
- ARM
-
Debug
ARM64
@@ -14,10 +10,6 @@
Debug
Win32
-
- Release
- ARM
-
Release
ARM64
@@ -52,26 +44,10 @@
Unicode
false
-
- Application
- true
- v142
- Unicode
- false
-
Application
false
v142
- true
- Unicode
- false
-
-
- Application
- false
- v142
- true
Unicode
false
@@ -93,7 +69,6 @@
Application
false
v142
- true
Unicode
false
@@ -101,7 +76,6 @@
Application
false
v142
- true
Unicode
false
@@ -114,15 +88,9 @@
-
-
-
-
-
-
@@ -136,30 +104,6 @@
-
- false
-
-
- false
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- false
-
-
- false
-
%(AdditionalIncludeDirectories);$(BaseOutputPath)\WindowsAppRuntime_DLL;$(BaseOutputPath)\WindowsAppRuntime_BootstrapDLL;$(RepoRoot)\dev\common;$(RepoRoot)\test\inc
@@ -168,39 +112,12 @@
Use
- Level3
- true
- true
- true
- WIN32;NDEBUG;%(PreprocessorDefinitions)
- true
- pch.h
- stdcpp17
-
-
- Console
- true
- true
- %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
- onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
-
-
-
-
- Use
- Level3
- true
- true
- true
WIN32;NDEBUG;%(PreprocessorDefinitions)
true
pch.h
- stdcpp17
Console
- true
- true
%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
@@ -208,28 +125,9 @@
Use
- Level3
- true
- WIN32;_DEBUG;%(PreprocessorDefinitions)
- true
- pch.h
- stdcpp17
-
-
- Console
- %(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
- onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
-
-
-
-
- Use
- Level3
- true
WIN32;_DEBUG;%(PreprocessorDefinitions)
true
pch.h
- stdcpp17
Console
@@ -240,12 +138,9 @@
Use
- Level3
- true
_DEBUG;%(PreprocessorDefinitions)
true
pch.h
- stdcpp17
Console
@@ -256,12 +151,9 @@
Use
- Level3
- true
_DEBUG;%(PreprocessorDefinitions)
true
pch.h
- stdcpp17
Console
@@ -272,19 +164,12 @@
Use
- Level3
- true
- true
- true
NDEBUG;%(PreprocessorDefinitions)
true
pch.h
- stdcpp17
Console
- true
- true
%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
@@ -292,19 +177,12 @@
Use
- Level3
- true
- true
- true
NDEBUG;%(PreprocessorDefinitions)
true
pch.h
- stdcpp17
Console
- true
- true
%(AdditionalLibraryDirectories);$(OutDir)\..\WindowsAppRuntime_DLL
onecore.lib;onecoreuap.lib;Microsoft.WindowsAppRuntime.lib;%(AdditionalDependencies)
diff --git a/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj b/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj
index bb77792214..c0b2143424 100644
--- a/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj
+++ b/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj
@@ -45,7 +45,6 @@
Application
false
v142
- true
Unicode
@@ -58,7 +57,6 @@
Application
false
v142
- true
Unicode
@@ -72,7 +70,6 @@
Application
false
v142
- true
Unicode
false
@@ -101,33 +98,12 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
-
- true
-
-
- false
-
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
WIN32;_DEBUG;%(PreprocessorDefinitions)
pch.h
- stdcpp17
Console
@@ -139,19 +115,12 @@
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
WIN32;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)
@@ -160,12 +129,9 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
_DEBUG;%(PreprocessorDefinitions)
pch.h
- stdcpp17
Console
@@ -177,19 +143,12 @@
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)
@@ -198,12 +157,9 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
_DEBUG;%(PreprocessorDefinitions)
pch.h
- stdcpp17
Console
@@ -215,19 +171,12 @@
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)
diff --git a/test/TestApps/PushNotificationsDemoApp/main.cpp b/test/TestApps/PushNotificationsDemoApp/main.cpp
index d5084d6a84..be4228dc28 100644
--- a/test/TestApps/PushNotificationsDemoApp/main.cpp
+++ b/test/TestApps/PushNotificationsDemoApp/main.cpp
@@ -32,7 +32,7 @@ winrt::IAsyncOperation RequestChannelAsync()
// Setup the inprogress event handler
channelOperation.Progress(
- [](auto&& sender, auto&& args)
+ [](auto&& /*sender*/, auto&& args)
{
if (args.status == winrt::PushNotificationChannelStatus::InProgress)
{
diff --git a/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj b/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj
index fdcc91764a..d71cf3b4df 100644
--- a/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj
+++ b/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj
@@ -74,7 +74,6 @@
Application
false
v142
- true
Unicode
@@ -87,7 +86,6 @@
Application
false
v142
- true
Unicode
@@ -101,7 +99,6 @@
Application
false
v142
- true
Unicode
false
@@ -130,33 +127,12 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
-
- true
-
-
- false
-
Use
- Level3
- true
$(RepoRoot)\dev\Common;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
WIN32;_DEBUG;%(PreprocessorDefinitions)
pch.h
- stdcpp17
Console
@@ -169,19 +145,12 @@
Use
- Level3
- true
- true
- true
$(RepoRoot)\dev\Common;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
WIN32;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)
@@ -191,37 +160,27 @@
Use
- Level3
- true
$(RepoRoot)\dev\Common;%(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
+ Microsoft.WindowsAppRuntime.Bootstrap.dll;%(DelayLoadDLLs)
Microsoft.WindowsAppRuntime.dll;%(DelayLoadDLLs)
Use
- Level3
- true
- true
- true
$(RepoRoot)\dev\Common;%(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)
@@ -231,12 +190,9 @@
Use
- Level3
- true
$(RepoRoot)\dev\Common;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
_DEBUG;%(PreprocessorDefinitions)
pch.h
- stdcpp17
Console
@@ -249,19 +205,12 @@
Use
- Level3
- true
- true
- true
$(RepoRoot)\dev\Common;%(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)
diff --git a/test/TestApps/PushNotificationsTestApp/main.cpp b/test/TestApps/PushNotificationsTestApp/main.cpp
index f619ceb602..7ec54a2dda 100644
--- a/test/TestApps/PushNotificationsTestApp/main.cpp
+++ b/test/TestApps/PushNotificationsTestApp/main.cpp
@@ -16,7 +16,7 @@ using namespace winrt::Windows::Storage::Streams;
winrt::guid remoteId1(L"a2e4a323-b518-4799-9e80-0b37aeb0d225"); // Generated from ms.portal.azure.com
winrt::guid remoteId2(L"CA1A4AB2-AC1D-4EFC-A132-E5A191CA285A"); // Dummy guid from visual studio guid tool generator
-constexpr auto timeout{ std::chrono::seconds(300) };
+constexpr auto c_timeout{ std::chrono::seconds(300) };
inline const winrt::hstring c_rawNotificationPayload = L"";
@@ -35,7 +35,7 @@ bool ChannelRequestUsingNullRemoteId()
HRESULT ChannelRequestHelper(IAsyncOperationWithProgress const& channelOperation)
{
- if (channelOperation.wait_for(timeout) != AsyncStatus::Completed)
+ if (channelOperation.wait_for(c_timeout) != AsyncStatus::Completed)
{
channelOperation.Cancel();
return HRESULT_FROM_WIN32(ERROR_TIMEOUT); // timed out or failed
@@ -64,7 +64,7 @@ bool ChannelRequestUsingRemoteId()
bool MultipleChannelClose()
{
auto channelOperation = PushNotificationManager::Default().CreateChannelAsync(remoteId1);
- if (channelOperation.wait_for(timeout) != AsyncStatus::Completed)
+ if (channelOperation.wait_for(c_timeout) != AsyncStatus::Completed)
{
channelOperation.Cancel();
return false; // timed out or failed
@@ -237,7 +237,7 @@ bool VerifyForegroundHandlerSucceeds()
PushNotificationManager::Default().UnregisterAll();
try
{
- PushNotificationManager::Default().PushReceived([](const auto&, PushNotificationReceivedEventArgs const& args) {});
+ PushNotificationManager::Default().PushReceived([](const auto& /*sender*/, PushNotificationReceivedEventArgs const& /*args*/) {});
PushNotificationManager::Default().Register();
}
catch (...)
@@ -252,7 +252,7 @@ bool VerifyForegroundHandlerFails()
try
{
// Register is already called in main
- PushNotificationManager::Default().PushReceived([](const auto&, PushNotificationReceivedEventArgs const& args) {});
+ PushNotificationManager::Default().PushReceived([](const auto& /*sender*/, PushNotificationReceivedEventArgs const& /*args*/) {});
}
catch (...)
{
diff --git a/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj b/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj
index 3667e52383..c12b365ef4 100644
--- a/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj
+++ b/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj
@@ -45,7 +45,6 @@
Application
false
v142
- true
Unicode
@@ -58,7 +57,6 @@
Application
false
v142
- true
Unicode
@@ -72,7 +70,6 @@
Application
false
v142
- true
Unicode
false
@@ -101,33 +98,12 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
-
- true
-
-
- false
-
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
WIN32;_DEBUG;%(PreprocessorDefinitions)
pch.h
- stdcpp17
Console
@@ -139,19 +115,12 @@
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
WIN32;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)
@@ -160,12 +129,9 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
_DEBUG;%(PreprocessorDefinitions)
pch.h
- stdcpp17
Console
@@ -177,19 +143,12 @@
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)
@@ -198,12 +157,9 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
_DEBUG;%(PreprocessorDefinitions)
pch.h
- stdcpp17
Console
@@ -215,19 +171,12 @@
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)
diff --git a/test/TestApps/ToastNotificationsDemoApp/main.cpp b/test/TestApps/ToastNotificationsDemoApp/main.cpp
index 72b69a5cad..71fb31c6e5 100644
--- a/test/TestApps/ToastNotificationsDemoApp/main.cpp
+++ b/test/TestApps/ToastNotificationsDemoApp/main.cpp
@@ -36,7 +36,7 @@ winrt::IAsyncOperation RequestChannelAsync()
// Setup the inprogress event handler
channelOperation.Progress(
- [](auto&& sender, auto&& args)
+ [](auto&& /*sender*/, auto&& args)
{
if (args.status == winrt::PushNotificationChannelStatus::InProgress)
{
diff --git a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj b/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj
index 4f5f7fe17d..1578f63a40 100644
--- a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj
+++ b/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj
@@ -81,7 +81,6 @@
Application
false
v142
- true
Unicode
@@ -94,7 +93,6 @@
Application
false
v142
- true
Unicode
@@ -108,7 +106,6 @@
Application
false
v142
- true
Unicode
false
@@ -137,33 +134,12 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
-
- true
-
-
- false
-
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
WIN32;_DEBUG;%(PreprocessorDefinitions)
pch.h
- stdcpp17
Console
@@ -175,19 +151,12 @@
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
WIN32;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)
@@ -196,36 +165,26 @@
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
+ 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)
@@ -234,12 +193,9 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;..\..\inc
_DEBUG;%(PreprocessorDefinitions)
pch.h
- stdcpp17
Console
@@ -251,19 +207,12 @@
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)
diff --git a/test/TestApps/ToastNotificationsTestApp/main.cpp b/test/TestApps/ToastNotificationsTestApp/main.cpp
index 5bf10f95ea..938f57f834 100644
--- a/test/TestApps/ToastNotificationsTestApp/main.cpp
+++ b/test/TestApps/ToastNotificationsTestApp/main.cpp
@@ -348,7 +348,7 @@ bool VerifyFailedMultipleRegisterActivator()
{
return winrt::to_hresult() == E_INVALIDARG;
}
-
+
return false;
}
@@ -678,6 +678,7 @@ bool VerifyUpdateToastProgressDataUsingEmptyTagAndValidGroup()
winrt::AppNotificationProgressData progressData = GetToastProgressData(L"PStatus", L"PTitle", 0.10, L"10%", 1);
auto progressResultOperation = winrt::AppNotificationManager::Default().UpdateAsync(progressData, L"", L"Group").get();
+ (void)progressResultOperation; // Unused local, exists for debugging, optimized away in Release builds
}
catch (...)
{
@@ -701,6 +702,7 @@ bool VerifyUpdateToastProgressDataUsingEmptyTagAndEmptyGroup()
winrt::AppNotificationProgressData progressData = GetToastProgressData(L"PStatus", L"PTitle", 0.10, L"10%", 1);
auto progressResultOperation = winrt::AppNotificationManager::Default().UpdateAsync(progressData, L"", L"").get();
+ (void)progressResultOperation; // Unused local, exists for debugging, optimized away in Release builds
}
catch (...)
{
diff --git a/test/ToastNotificationTests/APITests.cpp b/test/ToastNotificationTests/APITests.cpp
index 5c3af1673b..14c20dd2cb 100644
--- a/test/ToastNotificationTests/APITests.cpp
+++ b/test/ToastNotificationTests/APITests.cpp
@@ -122,7 +122,7 @@ namespace Test::ToastNotifications
DWORD exitCode{};
VERIFY_WIN32_BOOL_SUCCEEDED(GetExitCodeProcess(m_processHandle.get(), &exitCode));
- VERIFY_ARE_EQUAL(exitCode, 0);
+ VERIFY_ARE_EQUAL(exitCode, 0u);
}
wil::unique_handle RunUnpackaged(const std::wstring& command, const std::wstring& args, const std::wstring& directory)
@@ -161,7 +161,7 @@ namespace Test::ToastNotifications
DWORD exitCode{};
VERIFY_WIN32_BOOL_SUCCEEDED(GetExitCodeProcess(processHandle.get(), &exitCode));
- VERIFY_ARE_EQUAL(exitCode, 0);
+ VERIFY_ARE_EQUAL(exitCode, 0u);
}
TEST_METHOD(VerifyBackgroundActivation)
diff --git a/test/ToastNotificationTests/ToastNotificationTests.vcxproj b/test/ToastNotificationTests/ToastNotificationTests.vcxproj
index c1f0c192f3..7ca50dd70d 100644
--- a/test/ToastNotificationTests/ToastNotificationTests.vcxproj
+++ b/test/ToastNotificationTests/ToastNotificationTests.vcxproj
@@ -45,7 +45,6 @@
DynamicLibrary
false
v142
- true
Unicode
@@ -58,7 +57,6 @@
DynamicLibrary
false
v142
- true
Unicode
@@ -72,7 +70,6 @@
DynamicLibrary
false
v142
- true
Unicode
false
@@ -101,34 +98,15 @@
-
- true
-
-
- false
-
-
- true
-
-
- false
-
-
- true
-
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
WIN32;_DEBUG;TOASTNOTIFICATIONTESTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
Windows
- 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)
false
@@ -136,22 +114,14 @@
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
WIN32;NDEBUG;TOASTNOTIFICATIONTESTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
- true
Use
pch.h
Windows
- true
- 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)
false
@@ -159,18 +129,14 @@
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
_DEBUG;TOASTNOTIFICATIONTESTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
- true
Use
pch.h
Windows
- 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)
false
@@ -178,21 +144,13 @@
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
NDEBUG;TOASTNOTIFICATIONTESTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
Use
pch.h
Windows
- true
- 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)
false
@@ -201,8 +159,6 @@
Use
- Level3
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
_DEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -217,10 +173,6 @@
Use
- Level3
- true
- true
- true
%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;..\inc;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL
NDEBUG;%(PreprocessorDefinitions);;INLINE_TEST_METHOD_MARKUP
true
@@ -228,8 +180,6 @@
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)