[Cherrypick] Updated WindowsAppSDK-RunTestsInPipeline-Job.yml

.config/tsaoptions.json

@@ -1,8 +1,8 @@
 {
     "instanceUrl": "https://microsoft.visualstudio.com",
     "projectName": "os",
-    "areaPath": "OS\\Windows Client and Services\\ADEPT\\OWL (Open Windows pLatform)\\Rendering\\WinAppSDK Engineering System",
-    "iterationPath": "OS\\2211",
+    "areaPath": "OS\\Windows Client and Services\\ADEPT\\NEON\\Windex\\WinAppSDK Engineering System",
+    "iterationPath": "OS\\2311",
     "notificationAliases": [ "WinAppSDK-Build@microsoft.com" ],
     "ignoreBranchName": true,
     "codebaseName": "WinAppSDK-Foundation"

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -35,8 +35,7 @@ body:
       label: NuGet package version
       description: Specify the version of Windows App SDK (or Project Reunion) you're using.
       options:
-        - "Windows App SDK 1.3.2: 1.3.230602002"
-        - "Windows App SDK 1.4 Preview 1: 1.4.230628000-preview1"
+        - "Windows App SDK 1.4.2: 1.4.231008000"
         - "Windows App SDK 1.4 Experimental 1: 1.4.230518007-experimental1"
   - type: dropdown
     attributes:

Directory.Build.props

@@ -19,6 +19,8 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
 
     <NugetPackageDirectory>$(RepoRoot)\packages</NugetPackageDirectory>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(RepoRoot)\WasdkStrongNameSign.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <!-- Compilation differs for the build pipeline vs local development -->

NuGet.config

@@ -7,7 +7,7 @@
   <packageSources>
     <clear />
     <add key="ProjectReunion internal" value="https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json" />
-    <add key="WindowsAppSDK Protobuf" value="tools/nuget" />
+    <add key="WindowsAppSDK Local" value="tools/nuget" />
   </packageSources>
   <disabledPackageSources>
     <clear />

TestAll.ps1

@@ -1,16 +1,33 @@
 <#
 .SYNOPSIS
-    Run the TAEF dlls generated by WinAppSDK
+    Run the WinAppSDK tests
 
 .DESCRIPTION
     The TestAll script will take the folder input and look for subfolders containing a .testdef file. WinAppSDK
-    components define a testdef with the following schema and runs the TAEF dll in the subfolder.
+    components define a testdef with the following schema and runs the test in the subfolder.
+
+    *.testdef are JSON files with the schema per JSON Schema 2020-12 (https://json-schema.org):
+        {
+          "$id": "https://microsoft.com/windowsappsdk/schemas/testdef/2023/08",
+
+          "type": "object",
+          "properties": {
+            "Description": { "type": "string" },
+            "Type": { "enum": ["TAEF", "Powershell"], "default": "TAEF" },
+            "Filename": { "type": "string" },
+            "Parameters": { "type": "string" },
+            "Architectures": { "type": "array", "items": { "type": "string" } },
+            "Status": { "enum": ["Enabled", "Disabled"] },
+          },
+          "required": ["Description", "Filename", "Architectures", "Status"]
+        }
 
     Example:
     {
         "Tests": [
             {
                 "Description": "This module tests the push notifications component in WinAppSDK.",
+                "Type": "TAEF",
                 "Filename": "PushNotificationTests.dll",
                 "Parameters": "",
                 "Architectures": ["x86", "x64", "arm64"],
@@ -38,12 +55,16 @@
 param(
         [Parameter(Mandatory=$true)]
         [string]$OutputFolder,
+
         [Parameter(Mandatory=$true)]
         [string]$Platform,
+
         [Parameter(Mandatory=$true)]
         [string]$Configuration,
+
         [Parameter(Mandatory=$false)]
         [Switch]$Test,
+
         [Parameter(Mandatory=$false)]
         [Switch]$List
 )
@@ -52,7 +73,7 @@ $StartTime = Get-Date
 $lastexitcode = 0
 Set-StrictMode -Version 3.0
 
-function Get-TaefTests
+function Get-Tests
 {
     $configPlat = Join-Path $Configuration $Platform
     $outputFolderPath = Join-Path $OutputFolder $configPlat
@@ -66,6 +87,16 @@ function Get-TaefTests
         $baseId = $testdef.BaseName
         foreach ($testConfig in $testJson.Tests)
         {
+            $testConfig | Write-Host
+            if ($testConfig -contains 'Type')
+            {
+                $testType = $testConfig.Type
+            }
+            else
+            {
+                $testType = 'TAEF'
+            }
+
             $id = $baseId + "-Test$count"
             $t = [PSCustomObject]@{}
             $t | Add-Member -MemberType NoteProperty -Name 'Test' -Value $id
@@ -75,6 +106,7 @@ function Get-TaefTests
             $t | Add-Member -MemberType NoteProperty -Name 'Architectures' -Value $testConfig.Architectures
             $t | Add-Member -MemberType NoteProperty -Name 'Status' -Value $testConfig.Status
             $t | Add-Member -MemberType NoteProperty -Name 'TestDef' -Value $testdef.FullName
+            $t | Add-Member -MemberType NoteProperty -Name 'Type' -Value $testType
 
             $tests += $t
             $count += 1
@@ -84,26 +116,52 @@ function Get-TaefTests
     $tests
 }
 
-function List-TaefTests
+function List-Tests
+{
+    $tests = Get-Tests
+    $tests | Sort-Object -Property Test | Format-Table Test,Description,Type,Filename,Parameters,Architectures,Status -AutoSize | Out-String -Width 512
+}
+
+function Run-TaefTest
 {
-    $tests = Get-TaefTests
-    $tests | Sort-Object -Property Test | Format-Table Test,Description,Filename,Parameters,Architectures,Status -AutoSize | Out-String -Width 512
+    param($test)
+
+    $testFolder = Split-Path -parent $test.TestDef
+    $tePath = Join-Path $testFolder "te.exe"
+    $dllFile = Join-Path $testFolder $test.Filename
+    & $tePath $dllFile $test.Parameters
+}
+
+function Run-PowershellTest
+{
+    param($test)
+
+    Write-Host "Powershell tests not supported"
 }
 
-function Run-TaefTests
+function Run-Tests
 {
-    $tests = Get-TaefTests
+    $tests = Get-Tests
     foreach ($test in $tests)
     {
         Write-Host "$($test.Filename) - $($test.Description)"
         $validPlatform = $test.Architectures.Contains($Platform)
         $testEnabled = $test.Status -eq "Enabled"
         if ($validPlatform -and $testEnabled)
         {
-            $testFolder = Split-Path -parent $test.TestDef
-            $tePath = Join-Path $testFolder "te.exe"
-            $dllFile = Join-Path $testFolder $test.Filename
-            & $tePath $dllFile $test.Parameters
+            if ($test.Type -eq 'TAEF')
+            {
+                Run-TaefTest $test
+            }
+            elseif ($test.Type -eq 'Powershell')
+            {
+                Run-PowershellTest $test
+            }
+            else
+            {
+                Write-Host "Unknown test type '$test.Type'. Not running."
+                Exit 1
+            }
         }
         elseif (-not($validPlatform))
         {
@@ -118,12 +176,12 @@ function Run-TaefTests
 
 if ($List -eq $true)
 {
-    $null = List-TaefTests
+    List-Tests | Out-String
 }
 
 if ($Test -eq $true)
 {
-    Run-TaefTests
+    Run-Tests
 }
 
 $TotalTime = (Get-Date)-$StartTime