- 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/CalcManager/CalculatorManager.h

@@ -2,8 +2,11 @@
 // Licensed under the MIT License.
 
 #pragma once
+
 #include "CalculatorHistory.h"
-#include "Header Files\Rational.h"
+#include "Header Files/CalcEngine.h"
+#include "Header Files/Rational.h"
+#include "Header Files/ICalcDisplay.h"
 
 namespace CalculationManager
 {

src/CalcManager/Header Files/CalcEngine.h

@@ -17,9 +17,9 @@
 #include "scimath.h"
 #include "CCommand.h"
 #include "EngineStrings.h"
-#include "Command.h"
+#include "../Command.h"
-#include "CalculatorVector.h"
+#include "../CalculatorVector.h"
-#include "ExpressionCommand.h"
+#include "../ExpressionCommand.h"
 #include "History.h"  // for History Collector
 #include "CalcInput.h"
 #include "ICalcDisplay.h"

src/CalcManager/Header Files/ICalcDisplay.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 "../CalculatorVector.h"
+#include "../ExpressionCommandInterface.h"
+
 // Callback interface to be implemented by the clients of CCalcEngine
 class ICalcDisplay {
 public:

src/CalcManager/Header Files/scimath.h

@@ -22,7 +22,7 @@
 //
 // RETAIL version of NUMOBJ math that uses Infinite Precision
 //
-#include "Ratpack/ratpak.h"
+#include "../Ratpack/ratpak.h"
 
 //
 // Unary functions

src/CalcViewModel/ApplicationViewModel.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 "ApplicationViewModel.h"
+#include "Common\TraceLogger.h"
+#include "Common\AppResourceProvider.h"
 #include "StandardCalculatorViewModel.h"
 #include "DateCalculatorViewModel.h"
-#include "Common\AppResourceProvider.h"
 #include "DataLoaders\CurrencyHttpClient.h"
 #include "DataLoaders\CurrencyDataLoader.h"
 #include "DataLoaders\UnitConverterDataLoader.h"

src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.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 "CalculatorButtonUser.h"
+#include "Utils.h"
+
 namespace CalculatorApp
 {
     namespace Common

src/CalcViewModel/Common/CalculatorButtonUser.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 "CalcManager/Command.h"
+
 namespace CalculatorApp
 {
     namespace CM = CalculationManager;

src/CalcViewModel/Common/CalculatorDisplay.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 "CalcManager/Header Files/ICalcDisplay.h"
+
 namespace CalculatorApp
 {
     // Callback interface to be implemented by the CalculatorManager

src/CalcViewModel/Common/CopyPasteManager.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 "CopyPasteManager.h"
+#include "Common\TraceLogger.h"
 #include "Common\LocalizationSettings.h"
 
 using namespace std;

src/CalcViewModel/Common/CopyPasteManager.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 "AppResourceProvider.h"
+#include "NavCategory.h"
 
 namespace CalculatorUnitTests
 {

src/CalcViewModel/Common/DisplayExpressionToken.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 "Utils.h"
+
 namespace CalculatorApp::Common
 {
     public enum class TokenType

src/CalcViewModel/Common/EngineResourceProvider.h

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include "CalcManager\CalculatorResource.h"
+
 namespace CalculatorApp
 {
     class EngineResourceProvider : public CalculationManager::IResourceProvider

src/CalcViewModel/Common/ExpressionCommandDeserializer.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 "CalcManager/ExpressionCommand.h"
+
 namespace CalculatorApp
 {
     namespace Common

src/CalcViewModel/Common/ExpressionCommandSerializer.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 "CalcManager/ExpressionCommand.h"
+
 namespace CalculatorApp
 {
     namespace Common

src/CalcViewModel/Common/KeyboardShortcutManager.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 "Utils.h"
+#include "MyVirtualKey.h"
+
 namespace CalculatorApp
 {
     namespace Common

src/CalcViewModel/Common/LocalizationService.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 "Utils.h"
+
 namespace CalculatorApp { namespace Common
 {
     namespace LocalizationServiceProperties

src/CalcViewModel/Common/NavCategory.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 NavCategory group of classes and enumerations is intended to serve
@@ -14,6 +14,9 @@
 
 #pragma once
 
+#include "Utils.h"
+#include "MyVirtualKey.h"
+
 namespace CalculatorApp
 {
     namespace Common
@@ -59,7 +62,7 @@ namespace CalculatorApp
                 wchar_t const * nameKey,
                 wchar_t const * glyph,
                 CategoryGroupType group,
-                CalculatorApp::Common::MyVirtualKey vKey,
+                MyVirtualKey vKey,
                 bool categorySupportsNegative)
                 :
                 viewMode(mode),
@@ -78,7 +81,7 @@ namespace CalculatorApp
             const wchar_t * const nameResourceKey;
             const wchar_t * const glyph;
             const CategoryGroupType groupType;
-            const CalculatorApp::Common::MyVirtualKey virtualKey;
+            const MyVirtualKey virtualKey;
             const bool supportsNegative;
         };
 
@@ -173,7 +176,7 @@ namespace CalculatorApp
             static int GetIndexInGroup(ViewMode mode, CategoryGroupType type);
             static int GetPosition(ViewMode mode);
 
-            static ViewMode GetViewModeForVirtualKey(CalculatorApp::Common::MyVirtualKey virtualKey);
+            static ViewMode GetViewModeForVirtualKey(MyVirtualKey virtualKey);
 
         internal:
             NavCategory(Platform::String^ name, Platform::String^ automationName, Platform::String^ glyph, Platform::String^ accessKey, Platform::String^ mode, ViewMode viewMode, bool supportsNegative) :
@@ -188,7 +191,7 @@ namespace CalculatorApp
                 m_position = NavCategory::GetPosition(m_viewMode);
             }
 
-            static std::vector<CalculatorApp::Common::MyVirtualKey> GetCategoryAcceleratorKeys();
+            static std::vector<MyVirtualKey> GetCategoryAcceleratorKeys();
 
         private:
             static bool IsModeInCategoryGroup(ViewMode mode, CategoryGroupType groupType);

src/CalcViewModel/Common/TraceLogger.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
@@ -6,6 +6,7 @@
 #include "pch.h"
 #include "TraceLogger.h"
 #include "NetworkManager.h"
+#include "CalculatorButtonUser.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;

src/CalcViewModel/Common/TraceLogger.h

@@ -1,9 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcManager/Command.h"
 #include "TraceActivity.h"
+#include "NavCategory.h"
 
 static const int maxFunctionSize = (int)CalculationManager::Command::CommandBINEDITEND;
 

src/CalcViewModel/Common/Utils.h

@@ -1,8 +1,12 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcManager/CalculatorVector.h"
+#include "CalcManager/ExpressionCommandInterface.h"
+#include "DelegateCommand.h"
+
 // Utility macros to make Models easier to write
 // generates a member variable called m_<n>
 #define PROPERTY_R(t, n)\

src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp

@@ -1,13 +1,14 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
 #include "CurrencyDataLoader.h"
-#include "UnitConverterDataConstants.h"
 #include "Common\AppResourceProvider.h"
 #include "Common\LocalizationStringUtil.h"
 #include "Common\LocalizationService.h"
 #include "Common\LocalizationSettings.h"
+#include "Common\TraceLogger.h"
+#include "UnitConverterDataConstants.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;

src/CalcViewModel/DataLoaders/CurrencyDataLoader.h

@@ -1,8 +1,9 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
+#include "CalcManager\UnitConverter.h"
 #include "Common\NetworkManager.h"
 #include "ICurrencyHttpClient.h"
 

src/CalcViewModel/DataLoaders/UnitConverterDataLoader.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 "CalcManager\UnitConverter.h"
+#include "Common/NavCategory.h"
+
 namespace CalculatorApp
 {
     namespace ViewModel

src/CalcViewModel/DateCalculatorViewModel.cpp

@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "DateCalculatorViewModel.h"
+#include "Common\TraceLogger.h"
 #include "Common\LocalizationStringUtil.h"
 #include "Common\LocalizationService.h"
 #include "Common\LocalizationSettings.h"

src/CalcViewModel/DateCalculatorViewModel.h

@@ -1,9 +1,10 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
-#include "Common\DateCalculator.h"
+#include "Common/Utils.h"
+#include "Common/DateCalculator.h"
 
 const int c_maxOffsetValue = 999;
 

src/CalcViewModel/HistoryItemViewModel.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 "CalcManager/CalculatorVector.h"
+#include "CalcManager/ExpressionCommandInterface.h"
+
 namespace CalculatorApp
 {
     namespace ViewModel

src/CalcViewModel/HistoryViewModel.cpp

@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "HistoryViewModel.h"
+#include "Common\TraceLogger.h"
 #include "Common\LocalizationStringUtil.h"
 #include "Common\LocalizationSettings.h"
 
@@ -17,7 +18,6 @@ using namespace Windows::Storage;
 using namespace Windows::Storage::Streams;
 using namespace Windows::Security::Cryptography;
 using namespace Windows::Foundation::Collections;
-using CalculatorApp::TraceLogger;
 
 static StringReference HistoryVectorLengthKey{ L"HistoryVectorLength" };
 

src/CalcViewModel/HistoryViewModel.h

@@ -1,9 +1,12 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
-#include "Common\Automation\NarratorAnnouncement.h"
+
-#include "Common\CalculatorDisplay.h"
+#include "CalcManager/CalculatorManager.h"
+#include "Common/Automation/NarratorAnnouncement.h"
+#include "Common/CalculatorDisplay.h"
+#include "Common/NavCategory.h"
 #include "HistoryItemViewModel.h"
 
 namespace CalculatorApp

src/CalcViewModel/MemoryItemViewModel.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 "Common/Utils.h"
+
 namespace CalculatorApp
 {
     namespace ViewModel

src/CalcViewModel/StandardCalculatorViewModel.cpp

@@ -7,6 +7,7 @@
 #include "Common\LocalizationStringUtil.h"
 #include "Common\LocalizationSettings.h"
 #include "Common\CopyPasteManager.h"
+#include "Common\TraceLogger.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::Common;

src/CalcViewModel/StandardCalculatorViewModel.h

@@ -1,13 +1,14 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 #include "Common\Automation\NarratorAnnouncement.h"
 #include "Common\DisplayExpressionToken.h"
 #include "Common\CalculatorDisplay.h"
+#include "Common\EngineResourceProvider.h"
+#include "Common\CalculatorButtonUser.h"
 #include "HistoryViewModel.h"
 #include "MemoryItemViewModel.h"
-#include "Common\EngineResourceProvider.h"
 
 namespace CalculatorFunctionalTests
 {

src/CalcViewModel/UnitConverterViewModel.cpp

@@ -1,13 +1,15 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
 #include "UnitConverterViewModel.h"
+#include "CalcManager/Header Files/EngineStrings.h"
 #include "Common\CalculatorButtonPressedEventArgs.h"
 #include "Common\CopyPasteManager.h"
 #include "Common\LocalizationStringUtil.h"
 #include "Common\LocalizationService.h"
 #include "Common\LocalizationSettings.h"
+#include "Common\TraceLogger.h"
 #include "DataLoaders\CurrencyHttpClient.h"
 #include "DataLoaders\CurrencyDataLoader.h"
 #include "DataLoaders\UnitConverterDataLoader.h"

src/CalcViewModel/UnitConverterViewModel.h

@@ -1,11 +1,15 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
 
-#include "Common\NetworkManager.h"
+#include "CalcManager/UnitConverter.h"
-#include "Common\Automation\NarratorAnnouncement.h"
+#include "Common/Utils.h"
-#include "Common\ConversionResultTaskHelper.h"
+#include "Common/NetworkManager.h"
+#include "Common/Automation/NarratorAnnouncement.h"
+#include "Common/ConversionResultTaskHelper.h"
+#include "Common/CalculatorButtonUser.h"
+#include "Common/NavCategory.h"
 
 namespace CalculatorApp
 {

src/CalcViewModel/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.
 
 #pragma once
@@ -43,19 +43,3 @@
 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"
-
-// Project Headers
-#include "Common\DelegateCommand.h"
-#include "Common\Utils.h"
-#include "Common\MyVirtualKey.h"
-#include "Common\NavCategory.h"
-#include "Common\TraceLogger.h"
-#include "Common\CalculatorButtonUser.h"
-

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/AppResourceProvider.h"
-#include "CalcViewModel\Common\LocalizationService.h"
+#include "CalcViewModel/Common/LocalizationService.h"
-#include "CalcViewModel\Common\LocalizationStringUtil.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/TraceLogger.h"
-#include "CalcViewModel\Common\Automation\NarratorNotifier.h"
+#include "CalcViewModel/Common/Automation/NarratorNotifier.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "CalcViewModel/Common/LocalizationSettings.h"
-#include "Views\MainPage.xaml.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"
-
+#include "CalcManager/Header Files/CalcEngine.h"
-using namespace CalculatorApp::Common;
+#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/Common/TraceLogger.h"
-#include "CalcViewModel\StandardCalculatorViewModel.h"
+#include "CalcViewModel/Common/CopyPasteManager.h"
-#include "CalcViewModel\ViewState.h"
+#include "CalcViewModel/StandardCalculatorViewModel.h"
-#include "CalcViewModel\Common\LocalizationSettings.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 "CalcViewModel/Common/TraceLogger.h"
-#include "Converters\BooleanToVisibilityConverter.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/TraceLogger.h"
-#include "CalcViewModel\Common\CopyPasteManager.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/TraceLogger.h"
-#include "CalcViewModel\Common\LocalizationSettings.h"
+#include "CalcViewModel/Common/CopyPasteManager.h"
-#include "CalcViewModel\DateCalculatorViewModel.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 "CalcViewModel/Common/TraceLogger.h"
-#include "Converters\BooleanToVisibilityConverter.h"
+#include "CalcViewModel/Common/KeyboardShortcutManager.h"
-#include "CalcViewModel\Common\KeyboardShortcutManager.h"
+#include "CalcViewModel/Common/LocalizationService.h"
-#include "CalcViewModel\Common\LocalizationService.h"
+#include "CalcViewModel/Common/Automation/NarratorNotifier.h"
-#include "CalcViewModel\Common\Automation\NarratorNotifier.h"
+#include "CalcViewModel/Common/AppResourceProvider.h"
-#include "CalcViewModel\Common\AppResourceProvider.h"
+#include "Views/Memory.xaml.h"
-#include "Common\AppLifecycleLogger.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"