User/alexlam/43277347 1.3 stable (#3510)

* Update WindowsAppSDK-RunHelixTests-Job.yml (#3495) * Update WindowsAppSDK-RunHelixTests-Job.yml * Update WindowsAppSDK-BuildFoundation-job.yml * Add files via upload * Update MrtCoreUnpackagedTests.csproj * Add files via upload * Update MrmUnitTest.vcxproj * Add files via upload * Update MrmBaseUnitTests.vcxproj * Update WindowsAppSDK-BuildFoundation-job.yml * Update WindowsAppSDK-RunHelixTests-Job.yml * Update WindowsAppSDK-RunTestsInPipeline-Job.yml * Update WindowsAppSDK-RunHelixTests-Job.yml * Update WindowsAppSDK-BuildFoundation-job.yml * Update MrmUnitTests.testdef * Update MrtCoreUnpackagedTests.testdef * Update MrmBaseUnitTests.testdef * Update WindowsAppSDK-BuildFoundation-job.yml * Update WindowsAppSDK-RunTestsInPipeline-Job.yml * Update tsaoptions.json * Update WindowsAppSDK-BuildAndTestMRT-Steps.yml * Delete MrmUnitTests.testdef * Add files via upload * Update MrmUnitTest.vcxproj * Update WindowsAppSDK-BuildAndTestMRT-Steps.yml * Update WindowsAppSDK-BuildFoundation-job.yml * Update WindowsAppSDK-BuildFoundation-job.yml * Update WindowsAppSDK-RunTestsInPipeline-Job.yml * Delete WindowsAppSDK-RunHelixTests-Job.yml * Update tsaoptions.json * Update ProjectReunion-CI.yml * Delete RunTestsInHelix.proj * Delete global.json * Delete packages.config * Delete WindowsAppSDK.Helix.Test.sln * Delete Program.cs * Delete WindowsAppSDK.Helix.Test.NetCore.csproj * Delete TestAssembly.cs * Delete TestMachineSetup.cmd * Delete TestPass-EnsureMachineState.ps1 * Delete TestPass-OneTimeMachineSetup.ps1 * Delete TestPass-PostRun.ps1 * Delete TestPass-PreRun.ps1 * Delete WindowsAppSDK.Helix.TestCommon.csproj * Update WindowsAppSDK-BuildAndTestMRT-Steps.yml * 43277347: Manaully apply some changes in the CP to a source file that diverged between the 1.3-stable and Develop branches. --------- Co-authored-by: Alex Lam (APPX) <[email protected]>
microsoft · Mar 16, 2023 · 8420ec2 · 8420ec2
1 parent 47644a4
commit 8420ec2
Show file tree

Hide file tree

Showing 23 changed files with 53 additions and 592 deletions.
diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildAndTestMRT-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildAndTestMRT-Steps.yml
@@ -18,6 +18,7 @@ steps:
     artifactName: binlogs
 
 # Run the test locally on the Azure VM.
+# Note arm is currently not exercised.
 - task: VSTest@2
   displayName: 'test MRT: ManagedTests'
   condition: and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64')))
@@ -31,7 +32,10 @@ steps:
 
 - task: VSTest@2
   displayName: 'test MRT: UnitTests'
-  condition: and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64')))
+  # These 3 MRT test suites were previously being run in Helix, but they are now being run via WindowsAppSDK-RunTestsInPipeline-Job.yml instead.
+  # Resort to running these tests right here on the current job agent if and only if we've got here from ProjectReunion-CI.yml, because we won't 
+  # be running these tests via WindowsAppSDK-RunTestsInPipeline-Job.yml later in this specific flow. Otherwise, we can generally skip these tests.
+  condition: and(and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64'))), in(variables['Build.Reason'], 'IndividualCI', 'BatchCI'))
   inputs:
     testSelector: 'testAssemblies'
     testAssemblyVer2: '**\MrmUnitTest.dll'
@@ -42,7 +46,7 @@ steps:
 
 - task: VSTest@2
   displayName: 'test MRT: BaseUnitTests'
-  condition: and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64')))
+  condition: and(and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64'))), in(variables['Build.Reason'], 'IndividualCI', 'BatchCI'))
   inputs:
     testSelector: 'testAssemblies'
     testAssemblyVer2: '**\MrmBaseUnitTests.dll'
@@ -53,7 +57,7 @@ steps:
 
 - task: VSTest@2
   displayName: 'test MRT: UnpackagedTests'
-  condition: and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64')))
+  condition: and(and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64'))), in(variables['Build.Reason'], 'IndividualCI', 'BatchCI'))
   inputs:
     testSelector: 'testAssemblies'
     testAssemblyVer2: '**\MRTCoreUnpackagedTests.dll'

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-RunHelixTests-Job.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-RunHelixTests-Job.yml
diff --git a/build/Helix/RunTestsInHelix.proj b/build/Helix/RunTestsInHelix.proj
diff --git a/build/Helix/global.json b/build/Helix/global.json
diff --git a/build/Helix/packages.config b/build/Helix/packages.config
diff --git a/build/ProjectReunion-BuildFoundation.yml b/build/ProjectReunion-BuildFoundation.yml
@@ -266,15 +266,6 @@ jobs:
       PathtoPublish: '$(build.SourcesDirectory)\BuildOutput'
       artifactName: 'BuildOutput'
 
-- template: AzurePipelinesTemplates\WindowsAppSDK-RunHelixTests-Job.yml
-  parameters:
-    jobName: 'TestInHelix'
-    dependsOn:
-      - Build
-      - BuildAnyCPU
-      - BuildAndTestMRT
-    condition: eq(variables['Build.SourceBranch'], 'refs/heads/develop')
-
 # Arm64 uses a different VM type than x64, thus requiring them to be in different
 # pools, hence, we spilt the two scenarios into separate jobs.
 - template: AzurePipelinesTemplates\WindowsAppSDK-RunTestsInPipeline-Job.yml
@@ -296,9 +287,6 @@ jobs:
   pool: ProjectReunionESPool-2022
   timeoutInMinutes: 120      
   dependsOn:
-  - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/develop') }}:
-    - TestInHelix
-  - ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/develop') }}:
     - Build
     - BuildAnyCPU
     - BuildAndTestMRT

diff --git a/build/ProjectReunion-CI.yml b/build/ProjectReunion-CI.yml
@@ -143,13 +143,8 @@ jobs:
       artifactName: BuildOutput
       PathtoPublish: '$(buildOutputDir)'
 
-- template: AzurePipelinesTemplates\WindowsAppSDK-RunHelixTests-Job.yml
-  parameters:
-    name: 'RunTestsInHelix'
-    dependsOn:
-      - Build
-      - BuildMRT
-    condition: in(dependencies.Build.result, 'Succeeded', 'SucceededWithIssues')
+# We no longer run MRT tests in Helix here, due to dwindling Helix support. But one MRT test suite 
+# is still being run in WindowsAppSDK-BuildAndTestMRT-Steps.yml.
 
 - job: StageAndPack
   pool:
@@ -188,7 +183,6 @@ jobs:
         [xml]$publicNuspec = Get-Content -Path $(Build.SourcesDirectory)\build\NuSpecs\Microsoft.WindowsAppSDK.Foundation.nuspec
         $publicNuspec.package.metadata.version = $packageVersion
         Set-Content -Value $publicNuspec.OuterXml $(Build.SourcesDirectory)\build\NuSpecs\Microsoft.WindowsAppSDK.Foundation.nuspec
-
   - task: PowerShell@2
     name: PackNuget
     inputs:

diff --git a/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.testdef b/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.testdef
@@ -0,0 +1,11 @@
+{
+    "Tests": [
+        {
+            "Description": "Mrm Unit Tests (TAEF)",
+            "Filename": "MrmUnitTest.dll",
+            "Parameters": "",
+            "Architectures": ["x64", "x86", "arm64"],
+            "Status": "Enabled"
+        }
+    ]
+}