From 96c1a4577492c7129c6053ca80fb3d4bcc4a7920 Mon Sep 17 00:00:00 2001 From: Stephanie Anderl <46726333+sanderl@users.noreply.github.com> Date: Tue, 25 Aug 2020 09:31:40 -0700 Subject: [PATCH] Revert "Updated the Calculator projects to include the /Z7 compiler flag" (#1356) * Revert "Updated the Calculator projects to include the /Z7 compiler flag (#1337)" This reverts commit 6299ec2303fab8e7b7f36ed57236afefa40fd73d. * Update Calculator.vcxproj Add %(AdditionalOptions) where it is missing * Update TraceLogging.vcxproj Updated the AdditionalOptions to add /await /std:c++17 /utf-8 so this project is consistent with the other projects. --- src/CalcManager/CalcManager.vcxproj | 16 ++++++++-------- src/CalcViewModel/CalcViewModel.vcxproj | 18 +++++++++--------- src/Calculator/Calculator.vcxproj | 16 ++++++++-------- .../CalculatorUnitTests.vcxproj | 18 +++++++++--------- src/GraphControl/GraphControl.vcxproj | 18 +++++++++--------- src/GraphingImpl/GraphingImpl.vcxproj | 18 +++++++++--------- src/TraceLogging/TraceLogging.vcxproj | 16 ++++++++-------- 7 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/CalcManager/CalcManager.vcxproj b/src/CalcManager/CalcManager.vcxproj index 24fcb57..80940c6 100644 --- a/src/CalcManager/CalcManager.vcxproj +++ b/src/CalcManager/CalcManager.vcxproj @@ -141,7 +141,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true @@ -158,7 +158,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true @@ -176,7 +176,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true @@ -193,7 +193,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true @@ -211,7 +211,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) _UNICODE;UNICODE;%(PreprocessorDefinitions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 @@ -229,7 +229,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true @@ -247,7 +247,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true @@ -264,7 +264,7 @@ Use false true - /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /Zm250 /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 true diff --git a/src/CalcViewModel/CalcViewModel.vcxproj b/src/CalcViewModel/CalcViewModel.vcxproj index 81943e4..c2a69b5 100644 --- a/src/CalcViewModel/CalcViewModel.vcxproj +++ b/src/CalcViewModel/CalcViewModel.vcxproj @@ -133,7 +133,7 @@ true $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) Level4 true @@ -153,7 +153,7 @@ true $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) Level4 true @@ -173,7 +173,7 @@ true $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) Level4 true @@ -193,7 +193,7 @@ true $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) Level4 true @@ -213,7 +213,7 @@ true $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) Level4 true @@ -233,7 +233,7 @@ true $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) Level4 true @@ -253,7 +253,7 @@ true $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) Level4 true @@ -273,7 +273,7 @@ true $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) 4453 - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) Level4 true @@ -408,4 +408,4 @@ - + \ No newline at end of file diff --git a/src/Calculator/Calculator.vcxproj b/src/Calculator/Calculator.vcxproj index d802ffa..de554cd 100644 --- a/src/Calculator/Calculator.vcxproj +++ b/src/Calculator/Calculator.vcxproj @@ -135,7 +135,7 @@ - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 @@ -144,7 +144,7 @@ - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 @@ -153,7 +153,7 @@ - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 @@ -165,7 +165,7 @@ - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 @@ -177,7 +177,7 @@ - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 @@ -186,7 +186,7 @@ - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 @@ -198,7 +198,7 @@ - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 @@ -207,7 +207,7 @@ - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir)..\src\;%(AdditionalIncludeDirectories) Level4 diff --git a/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj b/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj index 1b68ecb..d93931c 100644 --- a/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj +++ b/src/CalculatorUnitTests/CalculatorUnitTests.vcxproj @@ -131,7 +131,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -140,7 +140,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -149,7 +149,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -158,7 +158,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -167,7 +167,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -176,7 +176,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -185,7 +185,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -194,7 +194,7 @@ - /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /permissive- /Zc:twoPhase- /utf-8 %(AdditionalOptions) 4453;28204 $(SolutionDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcViewModel;%(AdditionalIncludeDirectories) Level4 @@ -290,4 +290,4 @@ - + \ No newline at end of file diff --git a/src/GraphControl/GraphControl.vcxproj b/src/GraphControl/GraphControl.vcxproj index 128e1e0..8b8c0b8 100644 --- a/src/GraphControl/GraphControl.vcxproj +++ b/src/GraphControl/GraphControl.vcxproj @@ -138,7 +138,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /Z7 %(AdditionalOptions) + /bigobj /await %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -158,7 +158,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /d2CoroOptsWorkaround /Z7 %(AdditionalOptions) + /bigobj /await /d2CoroOptsWorkaround %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -178,7 +178,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /Z7 %(AdditionalOptions) + /bigobj /await %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -198,7 +198,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /d2CoroOptsWorkaround /Z7 %(AdditionalOptions) + /bigobj /await /d2CoroOptsWorkaround %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -218,7 +218,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /Z7 %(AdditionalOptions) + /bigobj /await %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -238,7 +238,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /d2CoroOptsWorkaround /Z7 %(AdditionalOptions) + /bigobj /await /d2CoroOptsWorkaround %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -258,7 +258,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /Z7 %(AdditionalOptions) + /bigobj /await %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -278,7 +278,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /d2CoroOptsWorkaround /Z7 %(AdditionalOptions) + /bigobj /await /d2CoroOptsWorkaround %(AdditionalOptions) 28204 stdcpp17 $(ProjectDir);$(GraphingInterfaceDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -345,4 +345,4 @@ - + \ No newline at end of file diff --git a/src/GraphingImpl/GraphingImpl.vcxproj b/src/GraphingImpl/GraphingImpl.vcxproj index 00abb36..d8b2903 100644 --- a/src/GraphingImpl/GraphingImpl.vcxproj +++ b/src/GraphingImpl/GraphingImpl.vcxproj @@ -132,7 +132,7 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL /Z7 %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -146,7 +146,7 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL /Z7 %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -160,7 +160,7 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL /Z7 %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -174,7 +174,7 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL /Z7 %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -188,7 +188,7 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL /Z7 %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -202,7 +202,7 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL /Z7 %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -216,7 +216,7 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL /Z7 %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -230,7 +230,7 @@ Use false stdcpp17 - /DGRAPHING_ENGINE_IMPL /Z7 %(AdditionalOptions) + /DGRAPHING_ENGINE_IMPL %(AdditionalOptions) $(ProjectDir);$(ProjectDir)\..\;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -275,4 +275,4 @@ - + \ No newline at end of file diff --git a/src/TraceLogging/TraceLogging.vcxproj b/src/TraceLogging/TraceLogging.vcxproj index 1030dfb..b167a79 100644 --- a/src/TraceLogging/TraceLogging.vcxproj +++ b/src/TraceLogging/TraceLogging.vcxproj @@ -153,7 +153,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 28204 @@ -168,7 +168,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 28204 @@ -183,7 +183,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 28204 @@ -198,7 +198,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 28204 @@ -213,7 +213,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 28204 @@ -228,7 +228,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 28204 @@ -243,7 +243,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 28204 @@ -258,7 +258,7 @@ pch.h $(IntDir)pch.pch $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) - /bigobj /await /std:c++17 /utf-8 /Z7 %(AdditionalOptions) + /bigobj /await /std:c++17 /utf-8 %(AdditionalOptions) 28204