- Avoid referencing project headers from precompiled headers.

Before this change, the pchs for CalcViewModel and Calculator project referenced project headers.  If those project headers (or any of their dependencies) were to change, then the pch would be recompiled, slowing local build times.

  By removing references to project headers, the pch will be compiled once and is resilient to changes in the project.  Now that project headers are explicit about their dependencies, when there is a change to a project header only the translation units referencing the modified header will need to be rebuilt.

- Manually tested by ensuring Calculator project builds locally.

@Microsoft/calculator-team

src/Calculator/AboutFlyout.xaml.cpp

@@ -1,11 +1,12 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
 #include "AboutFlyout.xaml.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
-#include "CalcViewModel\Common\LocalizationService.h"
-#include "CalcViewModel\Common\LocalizationStringUtil.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
+#include "CalcViewModel/Common/LocalizationService.h"
+#include "CalcViewModel/Common/LocalizationStringUtil.h"
+#include "CalcViewModel/Common/TraceLogger.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;

src/Calculator/App.xaml.cpp

@@ -8,11 +8,12 @@
 
 #include "pch.h"
 #include "App.xaml.h"
-#include "CalcViewModel\ViewState.h"
-#include "CalcViewModel\Common\Automation\NarratorNotifier.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
-#include "Views\MainPage.xaml.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/Common/Automation/NarratorNotifier.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
+#include "CalcViewModel/ViewState.h"
+#include "Views/MainPage.xaml.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;

src/Calculator/Controls/CalculationResult.h

@@ -1,8 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcViewModel/Common/Utils.h"
+
 namespace CalculatorApp
 {
     namespace Controls

src/Calculator/Controls/CalculatorButton.h

@@ -1,8 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcViewModel/Common/Utils.h"
+#include "CalcViewModel/Common/CalculatorButtonUser.h"
+
 namespace CalculatorApp
 {
     namespace Controls

src/Calculator/Controls/FlipButtons.h

@@ -1,8 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcViewModel/Common/Utils.h"
+#include "CalcViewModel/Common/CalculatorButtonUser.h"
+
 namespace CalculatorApp
 {
     namespace Controls

src/Calculator/Controls/OverflowTextBlock.h

@@ -1,8 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcViewModel/Common/Utils.h"
+
 namespace CalculatorApp
 {
     namespace Controls

src/Calculator/Converters/RadixToStringConverter.cpp

@@ -1,16 +1,16 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
 #include "RadixToStringConverter.h"
-
-using namespace CalculatorApp::Common;
+#include "CalcManager/Header Files/CalcEngine.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
 
 using namespace Platform;
 using namespace Windows::Foundation;
 using namespace Windows::UI::Xaml::Interop;
 using namespace Windows::ApplicationModel::Resources;
+
 namespace CalculatorApp
 {
     namespace Converters

src/Calculator/Views/Calculator.xaml.cpp

@@ -4,10 +4,11 @@
 #include "pch.h"
 #include "Calculator.xaml.h"
 #include "CalculatorStandardOperators.xaml.h"
-#include "CalcViewModel\Common\CopyPasteManager.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\ViewState.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/Common/CopyPasteManager.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
+#include "CalcViewModel/ViewState.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
 #include "Memory.xaml.h"
 #include "HistoryList.xaml.h"
 

src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp

@@ -8,8 +8,9 @@
 
 #include "pch.h"
 #include "CalculatorProgrammerBitFlipPanel.xaml.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
-#include "Converters\BooleanToVisibilityConverter.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
+#include "Converters/BooleanToVisibilityConverter.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;

src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp

@@ -1,8 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
 #include "CalculatorProgrammerDisplayPanel.xaml.h"
+#include "CalcViewModel/Common/TraceLogger.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::ViewModel;

src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp

@@ -1,10 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
 #include "CalculatorProgrammerOperators.xaml.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
-#include "CalcViewModel\Common\CopyPasteManager.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/Common/CopyPasteManager.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;

src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 //
@@ -8,7 +8,8 @@
 
 #include "pch.h"
 #include "CalculatorScientificAngleButtons.xaml.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::ViewModel;

src/Calculator/Views/DateCalculator.xaml.cpp

@@ -8,9 +8,10 @@
 
 #include "pch.h"
 #include "DateCalculator.xaml.h"
-#include "CalcViewModel\Common\CopyPasteManager.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
-#include "CalcViewModel\DateCalculatorViewModel.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/Common/CopyPasteManager.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
+#include "CalcViewModel/DateCalculatorViewModel.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;

src/Calculator/Views/MainPage.xaml.cpp

@@ -3,13 +3,14 @@
 
 #include "pch.h"
 #include "MainPage.xaml.h"
-#include "Views\Memory.xaml.h"
-#include "Converters\BooleanToVisibilityConverter.h"
-#include "CalcViewModel\Common\KeyboardShortcutManager.h"
-#include "CalcViewModel\Common\LocalizationService.h"
-#include "CalcViewModel\Common\Automation\NarratorNotifier.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
-#include "Common\AppLifecycleLogger.h"
+#include "CalcViewModel/Common/TraceLogger.h"
+#include "CalcViewModel/Common/KeyboardShortcutManager.h"
+#include "CalcViewModel/Common/LocalizationService.h"
+#include "CalcViewModel/Common/Automation/NarratorNotifier.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
+#include "Views/Memory.xaml.h"
+#include "Converters/BooleanToVisibilityConverter.h"
+#include "Common/AppLifecycleLogger.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;

src/Calculator/Views/StateTriggers/AspectRatioTrigger.h

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 /* The AspectRatioTrigger class is a custom trigger for use with a VisualState. The trigger is designed to fire when the
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include "CalcViewModel/Common/Utils.h"
+
 namespace CalculatorApp::Views::StateTriggers
 {
     public enum class Aspect

src/Calculator/WindowFrameService.cpp

@@ -3,7 +3,8 @@
 
 #include "pch.h"
 #include "WindowFrameService.h"
-#include "CalcViewModel\Common\KeyboardShortcutManager.h"
+#include "CalcViewModel/Common/KeyboardShortcutManager.h"
+#include "CalcViewModel/Common/TraceLogger.h"
 
 using namespace concurrency;
 using namespace Platform;

src/Calculator/pch.h

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 //
@@ -42,21 +42,5 @@ namespace StandardPeers = Windows::UI::Xaml::Automation::Peers;
 namespace CalculatorApp::Common::Automation {}
 namespace CustomPeers = CalculatorApp::Common::Automation;
 
-// CalcManager Headers
-#include "CalcManager\CalculatorVector.h"
-#include "CalcManager\ExpressionCommand.h"
-#include "CalcManager\CalculatorResource.h"
-#include "CalcManager\CalculatorManager.h"
-#include "CalcManager\UnitConverter.h"
-
-//CalcViewModel Headers
-#include "CalcViewModel\Common\DelegateCommand.h"
-#include "CalcViewModel\Common\Utils.h"
-#include "CalcViewModel\Common\CalculatorButtonUser.h"
-#include "CalcViewModel\Common\MyVirtualKey.h"
-#include "CalcViewModel\Common\NavCategory.h"
-#include "CalcViewModel\Common\TraceLogger.h"
-
 // Project Headers
-
 #include "App.xaml.h"