Merge master with feature/GraphingCalculator

build/pipelines/azure-pipelines.ci.yaml

@@ -41,15 +41,9 @@ jobs:
 - template: ./templates/run-unit-tests.yaml
   parameters:
     platform: x64
-    reimageServiceConnection: essential-experiences-interactive-reimage
-    reimageSubscriptionId: a8f5eb47-e59c-44b4-8e42-e70811a047b5
-    reimageResourceGroup: EETestPublic
 
 - template: ./templates/run-unit-tests.yaml
   parameters:
     platform: x86
-    reimageServiceConnection: essential-experiences-interactive-reimage
-    reimageSubscriptionId: a8f5eb47-e59c-44b4-8e42-e70811a047b5
-    reimageResourceGroup: EETestPublic
 
 - template: ./templates/package-appxbundle.yaml

build/pipelines/azure-pipelines.loc.yaml

@@ -15,11 +15,10 @@ name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
 jobs:
 - job: Localize
   pool:
-    vmImage: vs2017-win2016
+    vmImage: windows-2019
   variables:
     skipComponentGovernanceDetection: true
   steps:
-
   - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1
     displayName: Send resources to Touchdown Build
     inputs:

build/pipelines/azure-pipelines.release.yaml

@@ -9,8 +9,8 @@ pr: none
 
 variables:
   versionMajor: 10
-  versionMinor: 1907
-  versionBuild: $[counter('10.1907.*', 0)]
+  versionMinor: 1910
+  versionBuild: $[counter('10.1910.*', 0)]
   versionPatch: 0
 
 name: '$(versionMajor).$(versionMinor).$(versionBuild).$(versionPatch)'
@@ -48,16 +48,10 @@ jobs:
 - template: ./templates/run-unit-tests.yaml
   parameters:
     platform: x64
-    reimageServiceConnection: macool-sandbox-interactiveDesktopRS5
-    reimageSubscriptionId: 012a8008-c00f-45b3-9828-41ebba30141d
-    reimageResourceGroup: interactiveDesktopRS5
 
 - template: ./templates/run-unit-tests.yaml
   parameters:
     platform: x86
-    reimageServiceConnection: macool-sandbox-interactiveDesktopRS5
-    reimageSubscriptionId: 012a8008-c00f-45b3-9828-41ebba30141d
-    reimageResourceGroup: interactiveDesktopRS5
 
 - template: ./templates/package-appxbundle.yaml
 

build/pipelines/templates/build-app-internal.yaml

@@ -21,15 +21,15 @@ jobs:
   steps:
   - checkout: self
     clean: true
-  
+
   - task: UniversalPackages@0
     displayName: Download internals package
     inputs:
       command: download
       downloadDirectory: $(Build.SourcesDirectory)
       vstsFeed: WindowsApps
       vstsFeedPackage: calculator-internals
-      vstsPackageVersion: 0.0.18
+      vstsPackageVersion: 0.0.22
 
   - template: ./build-single-architecture.yaml
     parameters:
@@ -64,4 +64,4 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: Detect open source components
     inputs:
-      sourceScanPath: $(Agent.BuildDirectory)
+      sourceScanPath: $(Agent.BuildDirectory)

build/pipelines/templates/prepare-release-internalonly.yaml

@@ -19,6 +19,12 @@ jobs:
     clean: outputs
   variables:
     skipComponentGovernanceDetection: true
+    SBMediaRootPath: '$(TEMP)\SBMedia'
+    SBPackagePath: '$(Build.ArtifactStagingDirectory)\storeBrokerPayload'
+    SBLogPath: '$(SBPackagePath)\StoreBroker.log'
+    FlightId: '161f0975-cb5f-475b-8ef6-26383c37621f'
+    AppId: '9WZDNCRFHVN5'
+    ProductId: '00009007199266248474'
   steps:
   - checkout: self
     clean: true
@@ -91,61 +97,74 @@ jobs:
       downloadDirectory: $(Build.SourcesDirectory)
       vstsFeed: WindowsApps
       vstsFeedPackage: calculator-internals
-      vstsPackageVersion: 0.0.18
+      vstsPackageVersion: 0.0.22
 
-  - task: PkgESStoreBrokerPackage@10
-    displayName: Create StoreBroker Packages
-    env:
-      XES_SERIALPOSTBUILDREADY: True
+  - powershell: |
+      # Just modify this line to indicate where your en-us PDP file is. Leave the other lines alone.
+      $enUSPdpFilePath = "$(Build.SourcesDirectory)\PDP\en-US\PDP.xml"
+
+      # This is going to save the release value from the PDP file to $(SBMediaReleaseVersion)
+      # which you can then refer to in the UniversalPackages task.
+      $release = ([xml](Get-Content $enUSPdpFilePath)).ProductDescription.Release.Trim()
+      Write-Host "##vso[task.setvariable variable=SBMediaReleaseVersion;]$release"
+    displayName: Determine the PDP Media release version from the en-us PDP file
+
+  - task: UniversalPackages@0
+    displayName: Download PDP media (screenshots, trailers) universal package
+    inputs:
+      command: download
+      downloadDirectory: $(SBMediaRootPath)/$(SBMediaReleaseVersion)
+      vstsFeed: WindowsInboxApps
+      vstsFeedPackage: calculator-pdp-media
+      vstsPackageVersion: $(SBMediaReleaseVersion)
+
+  - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@2
+    displayName: Create StoreBroker Payload
     inputs:
-      addToFlight: false
-      configPath: tools/Build/StoreBroker/SBCalculatorConfig.json
-      PDPRootPath: $(Build.SourcesDirectory)\PDP
-      imagesRootPath: $(Build.SourcesDirectory)\PDPMediaRoot
-      appxPath: $(Build.ArtifactStagingDirectory)\appxBundleSigned\Microsoft.WindowsCalculator_8wekyb3d8bbwe.appxbundle
-      useArtifactServiceForMedia: true
-      outPath: $(Build.ArtifactStagingDirectory)\StoreBrokerPayload
-      paToken: $(System.AccessToken)
-      logRootPath: $(Build.ArtifactStagingDirectory)/StoreBrokerLogs
+      serviceEndpoint: StoreBrokerProxy
+      sbConfigPath: Tools/Build/StoreBroker/SBCalculatorConfig.json
+      sourceFolder: $(Build.ArtifactStagingDirectory)/appxBundleSigned
+      contents: Microsoft.WindowsCalculator_8wekyb3d8bbwe.appxbundle
+      pdpPath: '$(Build.SourcesDirectory)\PDP'
+      pdpInclude: PDP.xml
+      pdpMediaPath: '$(SBMediaRootPath)'
+      outSBPackagePath: '$(SBPackagePath)'
+      outSBName: SBCalculator
 
   - task: PublishBuildArtifacts@1
-    displayName: Publish StoreBrokerPayload artifact
+    displayName: Publish StoreBroker Payload artifact
     inputs:
+      pathtoPublish: '$(SBPackagePath)'
       artifactName: storeBrokerPayload
-      pathToPublish: $(Build.ArtifactStagingDirectory)/StoreBrokerPayload
 
-  - task: PkgESStoreBrokerFlight@10
+  - task: MS-RDX-MRO.windows-store-publish-dev.flight-task.store-flight@2
+    displayName: 'Flight StoreBroker Payload to team ring'
     name: StoreBrokerFlight
-    displayName: Flight package with StoreBroker
-    env:
-      XES_SERIALPOSTBUILDREADY: True
-    inputs:
-      packageToFlight: Custom
-      appId: 9WZDNCRFHVN5
-      flightId: 161f0975-cb5f-475b-8ef6-26383c37621f
-      submissionDataPath: $(Build.ArtifactStagingDirectory)/StoreBrokerPayload/SBCalculator.json
-      packagePath: $(Build.ArtifactStagingDirectory)/StoreBrokerPayload/SBCalculator.zip
-      updatePackageAction: AddPackages
-      logRootPath: $(Build.ArtifactStagingDirectory)/StoreBrokerLogs
-
-  - task: PublishBuildArtifacts@1
-    displayName: Publish StoreBrokerLogs artifact
     inputs:
-      artifactName: storeBrokerLogs
-      pathToPublish: $(Build.ArtifactStagingDirectory)/StoreBrokerLogs
+      serviceEndpoint: StoreBrokerProxy
+      appId: '$(AppId)'
+      flightId: '$(FlightId)'
+      inputMethod: JsonAndZip
+      jsonPath: '$(SBPackagePath)\SBCalculator.json'
+      zipPath: '$(SBPackagePath)\SBCalculator.zip'
+      force: true
+      skipPolling: true
+      targetPublishMode: Immediate
+      logPath: '$(SBLogPath)'
 
   - task: PkgESStoreBrokerAeroUpload@10
     displayName: Upload to Aero flighting dashboard
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     inputs:
-      productId: 00009007199266248474
-      flightId: 161f0975-cb5f-475b-8ef6-26383c37621f
-      submissionId: $(StoreBrokerFlight.WS_SubmissionId)
-      submissionDataPath: $(Build.ArtifactStagingDirectory)/StoreBrokerPayload/SBCalculator.json
-      packagePath: $(Build.ArtifactStagingDirectory)/StoreBrokerPayload/SBCalculator.zip
+      ProductId: '$(ProductId)'
+      FlightId: '$(FlightId)'
+      SubmissionId: '$(StoreBrokerFlight.WS_SubmissionId)'
+      SubmissionDataPath: '$(SBPackagePath)\SBCalculator.json'
+      PackagePath: '$(SBPackagePath)\SBCalculator.zip'
+      AeroEnvironment: Production
 
   - task: PkgESLateTasks@10
     displayName: Run PackageES LateTasks
     env:
-      XES_DISABLEPROV: true
+      XES_DISABLEPROV: true

build/pipelines/templates/run-unit-tests.yaml

@@ -1,29 +1,20 @@
-# This template contains jobs to run unit tests on the interactive test agents.
+# This template contains jobs to run unit tests.
 
 parameters:
   platform: ''
-  reimageServiceConnection: ''
-  reimageSubscriptionId: ''
-  reimageResourceGroup: ''
+  runsettingsFileName: ''
 
 jobs:
 - job: UnitTests${{ parameters.platform }}
   displayName: UnitTests ${{ parameters.platform }}
   dependsOn: Build${{ parameters.platform }}
+  condition: succeeded()
   pool:
-    name: Essential Experiences Interactive
-  workspace:
-    clean: outputs
+    vmImage: windows-2019
   variables:
     skipComponentGovernanceDetection: true
   steps:
   - checkout: none
-
-  - powershell: Write-Host "##vso[task.setvariable variable=agentInstanceId;isOutput=true]$($env:AgentName -replace '\D+' -as [int])"
-    name: LogAgentStep
-    displayName: Log this agent's instance for later cleanup
-    env:
-      AgentName: $(Agent.Name)
 
   - task: DownloadBuildArtifacts@0
     displayName: Download CalculatorUnitTests
@@ -41,19 +32,4 @@ jobs:
     displayName: Run CalculatorUnitTests
     inputs:
       testAssemblyVer2: $(Build.ArtifactStagingDirectory)\drop\Release\${{ parameters.platform }}\CalculatorUnitTests\AppPackages\CalculatorUnitTests_Test\CalculatorUnitTests.appx
-      otherConsoleOptions: /Platform:${{ parameters.platform }}
-
-- job: CleanUpUnitTests${{ parameters.platform }}
-  dependsOn: UnitTests${{ parameters.platform }}
-  condition: and(always(), ne(dependencies.UnitTests${{ parameters.platform }}.Outputs['LogAgentStep.agentInstanceId'], ''))
-  pool: server
-  variables:
-    agentInstanceId: $[ dependencies.UnitTests${{ parameters.platform }}.outputs['LogAgentStep.agentInstanceId'] ]
-  steps:
-  - task: InvokeRESTAPI@1
-    displayName: Reimage test machine
-    inputs:
-      connectionType: connectedServiceNameARM
-      azureServiceConnection: ${{ parameters.reimageServiceConnection }}
-      urlSuffix: subscriptions/${{ parameters.reimageSubscriptionId }}/resourceGroups/${{ parameters.reimageResourceGroup }}/providers/Microsoft.Compute/virtualMachineScaleSets/essential/reimage?api-version=2018-10-01
-      body: '{ "instanceIds": ["$(agentInstanceId)"] }'
+      otherConsoleOptions: /Platform:${{ parameters.platform }}

src/CalcManager/CEngine/CalcInput.cpp

@@ -179,7 +179,7 @@ bool CalcInput::TryAddDecimalPt()
 
     if (m_base.IsEmpty())
     {
-        m_base.value += L"0"; // Add a leading zero
+        m_base.value += L'0'; // Add a leading zero
     }
 
     m_decPtIndex = m_base.value.size();
@@ -261,6 +261,11 @@ void CalcInput::SetDecimalSymbol(wchar_t decSymbol)
     }
 }
 
+bool CalcInput::IsEmpty()
+{
+    return m_base.IsEmpty() && !m_hasExponent && m_exponent.IsEmpty() && !m_hasDecimal;
+}
+
 wstring CalcInput::ToString(uint32_t radix)
 {
     // In theory both the base and exponent could be C_NUM_MAX_DIGITS long.

src/CalcManager/CEngine/CalcUtils.cpp

@@ -11,14 +11,14 @@ bool IsOpInRange(OpCode op, uint32_t x, uint32_t y)
 
 bool IsBinOpCode(OpCode opCode)
 {
-    return IsOpInRange(opCode, IDC_AND, IDC_PWR);
+    return IsOpInRange(opCode, IDC_AND, IDC_PWR) || IsOpInRange(opCode, IDC_BINARYEXTENDEDFIRST, IDC_BINARYEXTENDEDLAST);
 }
 
 // WARNING: IDC_SIGN is a special unary op but still this doesn't catch this. Caller has to be aware
 // of it and catch it themselves or not needing this
 bool IsUnaryOpCode(OpCode opCode)
 {
-    return IsOpInRange(opCode, IDC_UNARYFIRST, IDC_UNARYLAST);
+    return (IsOpInRange(opCode, IDC_UNARYFIRST, IDC_UNARYLAST) || IsOpInRange(opCode, IDC_UNARYEXTENDEDFIRST, IDC_UNARYEXTENDEDLAST));
 }
 
 bool IsDigitOpCode(OpCode opCode)