Merge remote-tracking branch 'upstream/master' into issuetemplates

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 **Please describe your feature request.**
-<!--For more information see https://github.com/Microsoft/calculator/blob/master/docs/NewFeatureProcess.md-->
+<!--For more information see https://github.com/Microsoft/calculator/blob/master/docs/NewFeatureProcess.md -->
 
 **Is your feature request related to a problem? Please describe.**
 <!--A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]-->

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -1,15 +1,16 @@
-# Fixes #.
+## Fixes #.
 
-## Description of the changes in this pull request:
+
+### Description of the changes:
 -
 -
 -
 
-## 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)
-- 
+### How changes were validated:
+<!--Review https://github.com/Microsoft/calculator/blob/master/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

src/CalcManager/CalcManager.vcxproj

@@ -279,6 +279,7 @@
     <ClInclude Include="Header Files\CalcInput.h" />
     <ClInclude Include="Header Files\IHistoryDisplay.h" />
     <ClInclude Include="Header Files\Number.h" />
+    <ClInclude Include="Header Files\RadixType.h" />
     <ClInclude Include="Header Files\Rational.h" />
     <ClInclude Include="Header Files\scimath.h" />
     <ClInclude Include="pch.h" />

src/CalcManager/CalcManager.vcxproj.filters

@@ -161,5 +161,8 @@
     <ClInclude Include="Header Files\Rational.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Header Files\RadixType.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

src/CalcManager/Header Files/CalcEngine.h

@@ -20,6 +20,7 @@
 #include "../Command.h"
 #include "../CalculatorVector.h"
 #include "../ExpressionCommand.h"
+#include "RadixType.h"
 #include "History.h"  // for History Collector
 #include "CalcInput.h"
 #include "ICalcDisplay.h"
@@ -38,15 +39,6 @@ enum eNUM_WIDTH {
 typedef enum eNUM_WIDTH NUM_WIDTH;
 static constexpr size_t NUM_WIDTH_LENGTH = 4;
 
-// This is expected to be in same order as IDM_HEX, IDM_DEC, IDM_OCT, IDM_BIN
-enum eRADIX_TYPE {
-    HEX_RADIX,
-    DEC_RADIX,
-    OCT_RADIX,
-    BIN_RADIX
-};
-typedef enum eRADIX_TYPE RADIX_TYPE;
-
 namespace CalculationManager
 {
     class IResourceProvider;

src/CalcManager/Header Files/Number.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "RatPack/ratpak.h"
+#include "Ratpack/ratpak.h"
 
 namespace CalcEngine
 {

src/CalcManager/Header Files/RadixType.h

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+// This is expected to be in same order as IDM_HEX, IDM_DEC, IDM_OCT, IDM_BIN
+enum eRADIX_TYPE {
+    HEX_RADIX,
+    DEC_RADIX,
+    OCT_RADIX,
+    BIN_RADIX
+};
+typedef enum eRADIX_TYPE RADIX_TYPE;

src/Calculator/Converters/RadixToStringConverter.cpp

@@ -3,7 +3,7 @@
 
 #include "pch.h"
 #include "RadixToStringConverter.h"
-#include "CalcManager/Header Files/CalcEngine.h"
+#include "CalcManager/Header Files/RadixType.h"
 #include "CalcViewModel/Common/AppResourceProvider.h"
 
 using namespace Platform;