Migrate Calculator ViewModels from C++ to C#

.github/workflows/action-ci.yml

@@ -137,6 +137,35 @@ jobs:
       name: Setup dev tools
     - run: vstest.console.exe ${{ env.testDir }}/CalculatorUnitTests.msix /Platform:${{ matrix.platform }}
       name: Run unit tests
+
+  managedUnitTests:
+    needs: [defineBuilds, build]
+    runs-on: windows-2025-vs2026
+    name: Run managed unit tests
+    strategy:
+      matrix:
+        platform: ${{ fromJSON(needs.defineBuilds.outputs.unitTestPlatformList) }}
+    env:
+      testDir: ${{ github.workspace }}/download/Calculator.Tests/AppPackages/Calculator.Tests_Test
+    steps:
+    - uses: actions/download-artifact@v4
+      name: Download build outputs
+      with:
+        name: Build-${{ matrix.platform }}
+        path: ${{ github.workspace }}/download
+    - uses: actions/download-artifact@v4
+      name: Download tools
+      with:
+        name: Tools-${{ matrix.platform }}
+        path: ${{ github.workspace }}/download/tools
+    - run: |
+        ${{ github.workspace }}/download/tools/SignTestApp.ps1 -AppToSign ${{ env.testDir }}/Calculator.Tests.msix
+      shell: pwsh
+      name: Install test certificate
+    - uses: ilammy/msvc-dev-cmd@v1
+      name: Setup dev tools
+    - run: vstest.console.exe ${{ env.testDir }}/Calculator.Tests.msix /Platform:${{ matrix.platform }} -- RunConfiguration.TreatNoTestsAsError=true
+      name: Run managed unit tests
 
   uiTests:
     needs: build

.gitignore

@@ -292,7 +292,6 @@ __pycache__/
 # Calculator specific
 Generated Files/
 src/GraphControl/GraphingImplOverrides.props
-src/CalcViewModel/DataLoaders/DataLoaderConstants.h
 !src/x64
 !src/x86
 !src/out

build/pipelines/azure-pipelines.ci-internal.yaml

@@ -75,4 +75,11 @@ extends:
         parameters:
           platform: x64
 
+      - template: /build/pipelines/templates/run-unit-tests.yaml@self
+        parameters:
+          platform: x64
+          testAppName: Calculator.Tests
+          jobName: ManagedUnitTests
+          treatNoTestsAsError: true
+
       - template: /build/pipelines/templates/package-msixbundle.yaml@self

build/pipelines/azure-pipelines.release.yaml

@@ -105,6 +105,13 @@ extends:
         parameters:
           platform: x64
 
+      - template: /build/pipelines/templates/run-unit-tests.yaml@self
+        parameters:
+          platform: x64
+          testAppName: Calculator.Tests
+          jobName: ManagedUnitTests
+          treatNoTestsAsError: true
+
       - template: /build/pipelines/templates/run-unit-tests.yaml@self
         parameters:
           platform: x86

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

@@ -3,10 +3,14 @@
 parameters:
   platform: ''
   runsettingsFileName: ''
+  testAppName: 'CalculatorUnitTests'
+  jobName: 'UnitTests'
+  continueOnTestFailure: true
+  treatNoTestsAsError: false
 
 jobs:
-- job: UnitTests${{ parameters.platform }}
-  displayName: UnitTests ${{ parameters.platform }}
+- job: ${{ parameters.jobName }}${{ parameters.platform }}
+  displayName: ${{ parameters.testAppName }} ${{ parameters.platform }}
   dependsOn: Build${{ parameters.platform }}
   condition: succeeded()
   pool:
@@ -15,10 +19,10 @@ jobs:
     name: EssentialExperiences-windows-2022
   variables:
     skipComponentGovernanceDetection: true
-    UnitTestsDir: $(Pipeline.Workspace)\drop-${{ parameters.platform }}\CalculatorUnitTests\AppPackages\CalculatorUnitTests_Test
+    UnitTestsDir: $(Pipeline.Workspace)\drop-${{ parameters.platform }}\${{ parameters.testAppName }}\AppPackages\${{ parameters.testAppName }}_Test
     # Test results are just log files, not release binaries — skip SDL scanning
     ob_outputDirectory: '$(Common.TestResultsDirectory)'
-    ob_artifactBaseName: 'drop-unit-tests-${{ parameters.platform }}-Attempt$(System.JobAttempt)'
+    ob_artifactBaseName: 'drop-${{ parameters.jobName }}-${{ parameters.platform }}-Attempt$(System.JobAttempt)'
     ob_sdl_binskim_enabled: false
     ob_sdl_sbom_enabled: false
 
@@ -30,18 +34,22 @@ jobs:
       version: '10.x'
 
   - task: DownloadPipelineArtifact@2
-    displayName: Download CalculatorUnitTests
+    displayName: Download ${{ parameters.testAppName }}
     inputs:
       artifactName: drop-${{ parameters.platform }}
-      itemPattern: '**/CalculatorUnitTests_Test/**'
+      itemPattern: '**/${{ parameters.testAppName }}_Test/**'
       targetPath: $(Pipeline.Workspace)\drop-${{ parameters.platform }}
 
   - powershell: |
-      $(Build.SourcesDirectory)/build/scripts/SignTestApp.ps1 -AppToSign '$(UnitTestsDir)\CalculatorUnitTests.msix'
+      $(Build.SourcesDirectory)/build/scripts/SignTestApp.ps1 -AppToSign '$(UnitTestsDir)\${{ parameters.testAppName }}.msix'
     displayName: Sign unit tests
 
   - task: VSTest@2
-    displayName: Run CalculatorUnitTests
+    displayName: Run ${{ parameters.testAppName }}
+    continueOnError: ${{ parameters.continueOnTestFailure }}
     inputs:
-      testAssemblyVer2: $(UnitTestsDir)\CalculatorUnitTests.msix
-      otherConsoleOptions: /Platform:${{ parameters.platform }}
+      testAssemblyVer2: $(UnitTestsDir)\${{ parameters.testAppName }}.msix
+      ${{ if eq(parameters.treatNoTestsAsError, true) }}:
+        otherConsoleOptions: /Platform:${{ parameters.platform }} -- RunConfiguration.TreatNoTestsAsError=true
+      ${{ else }}:
+        otherConsoleOptions: /Platform:${{ parameters.platform }}

src/CalcManager.Interop/CalcManager.Interop.CategorySelectionResult.h

@@ -0,0 +1,2 @@
+#pragma once
+#include "CategorySelectionResult.h"

src/CalcManager.Interop/CalcManager.Interop.ExpressionCommandWrapper.h

@@ -0,0 +1,2 @@
+#pragma once
+#include "ExpressionCommandWrapper.h"

src/CalcManager.Interop/CalcManager.Interop.HistoryItemWrapper.h

@@ -0,0 +1,2 @@
+#pragma once
+#include "HistoryItemWrapper.h"

src/CalcManager.Interop/CalcManager.Interop.vcxproj

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A2D3E6B4-88C1-4D6F-9A7E-2B4C5D6E7F80}</ProjectGuid>
+    <Keyword>WindowsRuntimeComponent</Keyword>
+    <ProjectName>CalcManager.Interop</ProjectName>
+    <TargetName>CalcManager</TargetName>
+    <RootNamespace>CalcManager.Interop</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>18.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.26100.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
+    <CppWinRTEnabled>true</CppWinRTEnabled>
+    <CppWinRTPackage>true</CppWinRTPackage>
+    <CppWinRTEnableLegacyCoroutines>false</CppWinRTEnableLegacyCoroutines>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v145</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v145</PlatformToolset>
+    <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v145</PlatformToolset>
+    <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v145</PlatformToolset>
+    <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <PropertyGroup>
+    <GenerateManifest>false</GenerateManifest>
+    <GenerateProjectSpecificOutputFolder>true</GenerateProjectSpecificOutputFolder>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/Zm250 /await:strict /std:c++17 /permissive- /Zc:twoPhase- /utf-8 /w44242 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)CalcManager;$(SolutionDir)CalcManager\Header Files;$(SolutionDir)..\src\;$(GeneratedFilesDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
+      <PreprocessorDefinitions>_WINRT_DLL;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
+      <ModuleDefinitionFile>CalcManager.def</ModuleDefinitionFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Midl>
+      <AdditionalIncludeDirectories>$(GeneratedFilesDir);$(WindowsSdkDir)Include\$(WindowsTargetPlatformVersion)\winrt;$(WindowsSdkDir)Include\$(WindowsTargetPlatformVersion)\um;$(WindowsSdkDir)Include\$(WindowsTargetPlatformVersion)\shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </Midl>
+    <Lib />
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="CalcManagerInterop.h" />
+    <ClInclude Include="ExpressionCommandWrapper.h" />
+    <ClInclude Include="HistoryItemWrapper.h" />
+    <ClInclude Include="HistoryToken.h" />
+    <ClInclude Include="UnitConverterInterop.h" />
+    <ClInclude Include="CategorySelectionResult.h" />
+    <ClInclude Include="CalculatorManagerWrapper.h" />
+    <ClInclude Include="UnitConverterWrapper.h" />
+    <ClInclude Include="ConverterDataLoaderBase.h" />
+    <ClInclude Include="UnitConverterVMCallbackBase.h" />
+    <ClInclude Include="ViewModelCurrencyCallbackBase.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="CalcManagerImpl.cpp" />
+    <ClCompile Include="ExpressionCommandWrapper.cpp" />
+    <ClCompile Include="HistoryItemWrapper.cpp" />
+    <ClCompile Include="UnitConverterImpl.cpp" />
+    <ClCompile Include="CategorySelectionResult.cpp" />
+    <ClCompile Include="pch.cpp" />
+    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="CalcManagerInterop.idl" />
+    <Midl Include="UnitConverterInterop.idl" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="CalcManager.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\CalcManager\CalcManager.vcxproj">
+      <Project>{311e866d-8b93-4609-a691-265941fee101}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.CppWinRT">
+      <Version>2.0.240405.15</Version>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>

src/CalcManager.Interop/CalcManager.def

@@ -0,0 +1,3 @@
+EXPORTS
+    DllCanUnloadNow = WINRT_CanUnloadNow PRIVATE
+    DllGetActivationFactory = WINRT_GetActivationFactory PRIVATE