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

build/pipelines/azure-pipelines.loc.yaml

@@ -30,7 +30,7 @@ jobs:
     displayName: Send resources to Touchdown Build
     inputs:
       teamId: 86
-      authId: d3dd8113-65b3-4526-bdca-a00a7d1c37ba
+      authId: bf6d44ca-3210-4cfa-833f-c79f164ea27b
       authKey: $(LocServiceKey)
       isPreview: false
       relativePathRoot: src/Calculator/Resources/en-US/

build/pipelines/azure-pipelines.release.yaml

@@ -16,8 +16,8 @@ pr: none
 
 variables:
   versionMajor: 10
-  versionMinor: 2101
+  versionMinor: 2102
-  versionBuild: $[counter('10.2101.*', 0)]
+  versionBuild: $[counter('10.2102.*', 0)]
   versionPatch: 0
 
 name: '$(versionMajor).$(versionMinor).$(versionBuild).$(versionPatch)'

docs/ManualTests.md

@@ -10,7 +10,7 @@ These manual tests are run before every release of the Calculator app.
 **Test 1**
 Steps:
 1. From the Standard Calculator page, input “3”, “+”, “3”, “Enter” on the keyboard 
-Expected: “6” shows up in the display 
+*Expected: “6” shows up in the display *
 2. Input “4”, “-”, “2”, “=” using the in-app buttons 
 *Expected: “2” shows up in the display*
  

src/CalcManager/CEngine/History.cpp

@@ -4,6 +4,7 @@
 #include "Header Files/CalcEngine.h"
 #include "Command.h"
 #include "ExpressionCommand.h"
+#include "winerror_cross_platform.h"
 
 constexpr int ASCII_0 = 48;
 

src/CalcManager/CEngine/scicomm.cpp

@@ -13,7 +13,9 @@
 * Author:
 \****************************************************************************/
 
+#include <iomanip>
 #include <string>
+#include <sstream>
 #include "Header Files/CalcEngine.h"
 #include "Header Files/CalcUtils.h"
 #include "NumberFormattingUtils.h"

src/CalcManager/CEngine/scifunc.cpp

@@ -17,6 +17,7 @@
 /***                                                                    ***/
 /**************************************************************************/
 #include "Header Files/CalcEngine.h"
+#include "winerror_cross_platform.h"
 
 using namespace std;
 using namespace CalcEngine;

src/CalcManager/ExpressionCommandInterface.h

@@ -6,6 +6,7 @@
 #include <memory> // for std::shared_ptr
 #include <vector>
 #include "Command.h"
+#include "sal_cross_platform.h"
 
 class ISerializeCommandVisitor;
 

src/CalcManager/NumberFormattingUtils.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+#include "sal_cross_platform.h"
 
 namespace CalcManager::NumberFormattingUtils
 {

src/CalcViewModel/Common/NavCategory.cpp

@@ -60,7 +60,7 @@ bool IsGraphingModeAvailable()
 }
 
 Box<bool> ^ _isGraphingModeEnabledCached = nullptr;
-bool IsGraphingModeEnabled()
+bool IsGraphingModeEnabled(User ^ currentUser = nullptr)
 {
     if (!IsGraphingModeAvailable())
     {
@@ -72,17 +72,19 @@ bool IsGraphingModeEnabled()
         return _isGraphingModeEnabledCached->Value;
     }
 
-    User ^ firstUser;
+    if (!currentUser)
-    create_task(User::FindAllAsync(UserType::LocalUser)).then([&firstUser](IVectorView<User ^> ^ users) {
+    {
-        firstUser = users->GetAt(0); }).wait();
+        return true;
-        auto namedPolicyData = NamedPolicy::GetPolicyFromPathForUser(firstUser, L"Education", L"AllowGraphingCalculator");
+    }
+
+    auto namedPolicyData = NamedPolicy::GetPolicyFromPathForUser(currentUser, L"Education", L"AllowGraphingCalculator");
     _isGraphingModeEnabledCached = namedPolicyData->GetBoolean() == true;
 
     return _isGraphingModeEnabledCached->Value;
 }
 
 // The order of items in this list determines the order of items in the menu.
-static const list<NavCategoryInitializer> s_categoryManifest = [] {
+static list<NavCategoryInitializer> s_categoryManifest = [] {
     auto res = list<NavCategoryInitializer>{ NavCategoryInitializer{ ViewMode::Standard,
                                                                      STANDARD_ID,
                                                                      L"Standard",
@@ -108,7 +110,7 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
     bool supportGraphingCalculator = IsGraphingModeAvailable();
     if (supportGraphingCalculator)
     {
-        const bool isEnabled = IsGraphingModeEnabled();
+        bool isEnabled = IsGraphingModeEnabled();
         res.push_back(NavCategoryInitializer{ ViewMode::Graphing,
                                               GRAPHING_ID,
                                               L"Graphing",
@@ -276,6 +278,25 @@ static const list<NavCategoryInitializer> s_categoryManifest = [] {
     return res;
 }();
 
+void NavCategory::InitializeCategoryManifest(User ^ user)
+{
+    int i = 0;
+    for (NavCategoryInitializer category : s_categoryManifest)
+    {
+        if (category.viewMode == ViewMode::Graphing)
+        {
+            auto navCatInit = s_categoryManifest.begin();
+            std::advance(navCatInit, i);
+            (*navCatInit).isEnabled = IsGraphingModeEnabled(user);
+            break;
+        }
+        else
+        {
+            i++;
+        }
+    }
+ }
+
 // This function should only be used when storing the mode to app data.
 int NavCategory::Serialize(ViewMode mode)
 {

src/CalcViewModel/Common/NavCategory.h

@@ -92,7 +92,7 @@ namespace CalculatorApp
             const MyVirtualKey virtualKey;
             const wchar_t* const accessKey;
             const bool supportsNegative;
-            const bool isEnabled;
+            bool isEnabled;
         };
 
     private
@@ -140,6 +140,8 @@ namespace CalculatorApp
             static bool IsDateCalculatorViewMode(ViewMode mode);
             static bool IsConverterViewMode(ViewMode mode);
 
+            static void InitializeCategoryManifest(Windows::System::User ^ user);
+
             static Platform::String ^ GetFriendlyName(ViewMode mode);
             static Platform::String ^ GetNameResourceKey(ViewMode mode);
             static CategoryGroupType GetGroupType(ViewMode mode);

src/Calculator/App.xaml.cpp

@@ -225,12 +225,12 @@ void App::OnLaunched(LaunchActivatedEventArgs ^ args)
         // If the app got pre-launch activated, then save that state in a flag
         m_preLaunched = true;
     }
+    NavCategory::InitializeCategoryManifest(args->User);
     OnAppLaunch(args, args->Arguments);
 }
 
 void App::OnAppLaunch(IActivatedEventArgs ^ args, String ^ argument)
 {
-
     // Uncomment the following lines to display frame-rate and per-frame CPU usage info.
     //#if _DEBUG
     //    if (IsDebuggerPresent())

src/nuget.config

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
   <packageSources>
-    <add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="EEApps" value="https://eeapps.blob.core.windows.net/eeapps/index.json" />
   </packageSources>
-  <config>
+  <disabledPackageSources>
-    <add key="dependencyversion" value="Highest" />
+    <clear />
-  </config>
+  </disabledPackageSources>
 </configuration>