Merge branch 'master' into rational-math

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -0,0 +1,15 @@
+# Fixes #.
+
+## Description of the changes in this pull request:
+-
+-
+-
+
+## How this pull request was validated:
+### Review [Contributing.md](../Contributing.md) and ensure all contributing requirements are met.
+### Specify how you tested your changes (i.e. manual/ad-hoc testing, automated testing, new automated tests added)
+- 
+-
+-
+
+@Microsoft/calculator-team

README.md

@@ -41,3 +41,25 @@ Want to contribute? The team encourages community feedback and contributions. Pl
 
 If Calculator is not working properly, please file a report in the [Feedback Hub](https://insider.windows.com/en-us/fb/?contextid=130).
 We also welcome [issues submitted on GitHub](https://github.com/Microsoft/calculator/issues).
+
+# Data / Telemetry
+This project collects usage data and sends it to Microsoft to help improve our products and services.
+Read our [privacy statement](http://go.microsoft.com/fwlink/?LinkId=521839) to learn more.
+Telemetry is disabled in development builds by default, and can be enabled with the `SEND_TELEMETRY`
+build flag.
+
+# Reporting Security Issues
+Security issues and bugs should be reported privately, via email, to the
+Microsoft Security Response Center (MSRC) at <[secure@microsoft.com](mailto:secure@microsoft.com)>.
+You should receive a response within 24 hours. If for some reason you do not, please follow up via
+email to ensure we received your original message. Further information, including the
+[MSRC PGP](https://technet.microsoft.com/en-us/security/dn606155) key, can be found in the
+[Security TechCenter](https://technet.microsoft.com/en-us/security/default).
+
+# License
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Licensed under the [MIT License](.\LICENSE).
+
+# Contact
+Questions that can't be answered on GitHub? Reach out to the team: <[calculator@microsoft.com](mailto:calculator@microsoft.com)>

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/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/DateCalculator.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
@@ -273,13 +273,27 @@ bool DateCalculationEngine::TryGetCalendarDaysInYear(_In_ DateTime date, _Out_ U
 // Adds/Subtracts certain value for a particular date unit
 DateTime DateCalculationEngine::AdjustCalendarDate(Windows::Foundation::DateTime date, DateUnit dateUnit, int difference)
 {
+
     m_calendar->SetDateTime(date);
 
     switch (dateUnit)
     {
         case DateUnit::Year:
+        {
+            // In the Japanese calendar, transition years have 2 partial years.
+            // It is not guaranteed that adding 1 year will always add 365 days in the Japanese Calendar.
+            // To work around this quirk, we will change the calendar system to Gregorian before adding 1 year in the Japanese Calendar case only.
+            // We will then return the calendar system back to the Japanese Calendar.
+            auto currentCalendarSystem = m_calendar->GetCalendarSystem();
+            if (currentCalendarSystem == CalendarIdentifiers::Japanese)
+            {
+                m_calendar->ChangeCalendarSystem(CalendarIdentifiers::Gregorian);
+            }
+
             m_calendar->AddYears(difference);
+            m_calendar->ChangeCalendarSystem(currentCalendarSystem);
             break;
+        }
         case DateUnit::Month:
             m_calendar->AddMonths(difference);
             break;

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;
@@ -255,9 +256,9 @@ void App::OnAppLaunch(IActivatedEventArgs^ args, String^ argument)
     // For very first launch, set the size of the calc as size of the default standard mode
     if (!localSettings->Values->HasKey(L"VeryFirstLaunch"))
     {
-        appView->PreferredLaunchViewSize = minWindowSize;
-        appView->PreferredLaunchWindowingMode = ApplicationViewWindowingMode::PreferredLaunchViewSize;
         localSettings->Values->Insert(ref new String(L"VeryFirstLaunch"), false);
+        appView->SetPreferredMinSize(minWindowSize);
+        appView->TryResizeView(minWindowSize);
     }
     else
     {

src/Calculator/Calculator.vcxproj

@@ -840,7 +840,7 @@
   </Target>
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets" Condition="Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets')" />
-    <Import Project="..\..\packages\Microsoft.UI.Xaml.2.0.181018003.1\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\packages\Microsoft.UI.Xaml.2.0.181018003.1\build\native\Microsoft.UI.Xaml.targets')" />
+    <Import Project="..\..\packages\Microsoft.UI.Xaml.2.0.181018004\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\packages\Microsoft.UI.Xaml.2.0.181018004\build\native\Microsoft.UI.Xaml.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -848,6 +848,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.props'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.UI.Xaml.2.0.181018003.1\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.UI.Xaml.2.0.181018003.1\build\native\Microsoft.UI.Xaml.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.UI.Xaml.2.0.181018004\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.UI.Xaml.2.0.181018004\build\native\Microsoft.UI.Xaml.targets'))" />
   </Target>
 </Project>

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/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.UI.Xaml" version="2.0.181018003.1" targetFramework="native" />
+  <package id="Microsoft.UI.Xaml" version="2.0.181018004" targetFramework="native" />
   <package id="Microsoft.WindowsCalculator.PGO" version="1.0.2" targetFramework="native" />
 </packages>

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"