[main] Update dependencies from microsoft/ProjectReunion/WindowsAppSDKAggregator (#4262)

[main] Update dependencies from microsoft/ProjectReunion/WindowsAppSDKAggregator

eng/Version.Details.xml

@@ -37,9 +37,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.WinAppSDK.EngCommon" Version="1.5.230711">
+    <Dependency Name="Microsoft.WinAppSDK.EngCommon" Version="1.6.240410">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator</Uri>
-      <Sha>cd02e3c39f21b488bbab4e3c494860015cdfb75e</Sha>
+      <Sha>bd9465e4d01724693e6806d168ce9fb94db24d3a</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Windows.CsWinRT" Version="2.0.3">
       <Uri>https://github.com/microsoft/CsWinRT</Uri>

eng/common/AzurePipelinesTemplates/Helper-ExtractWindowsAppSDKVersion-Steps.yml

@@ -0,0 +1,48 @@
+parameters:
+- name: WinAppSdkPackageArtifactPath
+  type: string
+  default: "$(System.ArtifactsDirectory)\\NugetPackages"
+
+steps:
+- task: PowerShell@2
+  name: ExtractWindowsAppSDKVersion
+  displayName: Extract WindowsAppSDKVersion
+  inputs:
+    targetType: 'inline'
+    script: |
+      Copy-Item -Path "${{ parameters.WinAppSdkPackageArtifactPath }}" -Destination "$(System.ArtifactsDirectory)\temp" -Recurse
+
+      $files = Get-ChildItem $(System.ArtifactsDirectory)\temp
+      foreach ($file in $files) # Iterate through each package we restored in the directory
+      {
+        Write-Host "file:" $file.FullName
+        $nupkgPaths = Get-ChildItem $file.FullName -Filter "*.nupkg"
+
+        # Extract nupkg to access the nuspec
+        # The files in this directory does not contain the nuspec by default
+        foreach ($nupkgPath in $nupkgPaths)
+        {
+          Write-Host "nupkgPath:" $nupkgPath.FullName
+          $rename = $nupkgPath.Name + ".zip"
+          Rename-Item $nupkgPath.FullName $rename
+          $renamedFilePath = $nupkgPath.FullName + ".zip"
+          $dest = $file.FullName + "/contents"
+          Expand-Archive $renamedFilePath -Destination $dest
+        }
+
+        $nuspecPaths = Get-ChildItem $file.FullName -Recurse -Filter "*.nuspec"
+        foreach ($nuspecPath in $nuspecPaths)
+        {
+          Write-Host "Found Nuspecs"
+          [xml]$nuspec = Get-Content -Path $nuspecPath.FullName
+          if ($nuspec.package.metadata.id -eq 'Microsoft.WindowsAppSDK')
+          {
+            $version = $nuspec.package.metadata.version
+            Write-Host "Found " $version
+            Write-Host "##vso[task.setvariable variable=WindowsAppSDKPackageVersion]$version"
+            Write-Host "##vso[task.setvariable variable=WindowsAppSDKPackageVersion;isOutput=true]$version"
+            Exit 0
+          }
+        }
+      }
+      Exit 1

eng/common/AzurePipelinesTemplates/Maestro-EnforceDependencyMatching-Steps.yml

@@ -1,108 +0,0 @@
-# Please see https://www.osgwiki.com/wiki/Windows_App_SDK_-_How_to_build_and_use_the_pipelines
-# for information on how to use the pipelines
-parameters:
-# The "Extract Nuspec and Enforce versions" task will fail if it see a mismatch
-# that is on this EnforcementList
-# Syntax
-# EnforcementList: |
-#   Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage
-#   Microsoft.ProjectReunion.WinUI.TransportPackage
-#   Microsoft.ProjectReunion.Foundation.TransportPackage
-- name: EnforcementList
-  type: string
-  default: ''
-steps:
-- task: PowerShell@2
-  name: ConvertVersionDetailsToPackageConfig
-  displayName: "Convert VersionDetails To PackageConfig"
-  inputs:
-    filePath: '$(Build.SourcesDirectory)\eng\common\Scripts\ConvertVersionDetailsToPackageConfig.ps1'
-    arguments: -versionDetailsPath '$(Build.SourcesDirectory)\eng\Version.Details.xml' -packageConfigPath '$(Build.SourcesDirectory)\eng\common\packages.config'
-
-- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-  displayName: RestoreNuGetPackages
-  inputs:
-    restoreSolution: eng/common/packages.config
-    feedsToUse: config
-    nugetConfigPath: eng/common/nuget.config
-    restoreDirectory: packages
-
-- task: PowerShell@2
-  displayName: Extract Nuspec and Enforce versions 
-  inputs:
-    targetType: 'inline'
-    script: |
-      $enforcementSet = @{}
-      '${{ parameters.EnforcementList }}'.split([Environment]::NewLine) | ForEach {
-        if ($_ -ne '')
-        {
-          $enforcementSet[$_] = $true
-          Write-Host "Enforcing $_"
-        }
-      }
-
-      [xml]$versionDetails = Get-Content -Path '$(Build.SourcesDirectory)\eng\Version.Details.xml'
-      $directory = "$(Build.SourcesDirectory)/eng/common/packages"
-
-      # Set up Map from the dependencies to its versions to reference later
-      $dependenciesMap = @{}
-      foreach ($dependency in $versionDetails.Dependencies.ProductDependencies.Dependency)
-      {
-        $id = $dependency.name
-        $version = $dependency.version
-        $dependenciesMap[$id] = $version
-      }
-
-      $seen = @{}
-      $files = Get-ChildItem $directory
-      foreach ($file in $files) # Iterate through each package we restored in the directory
-      {
-        Write-Host $file.FullName
-        $nupkgPaths = Get-ChildItem $file.FullName -Filter "*.nupkg"
-
-        # Extract nupkg to access the nuspec
-        # The files in this directory does not contain the nuspec by default
-        foreach ($nupkgPath in $nupkgPaths)
-        {
-          $rename = $nupkgPath.Name + ".zip"
-          Rename-Item $nupkgPath.FullName $rename
-          $renamedFilePath = $nupkgPath.FullName + ".zip"
-          $dest = $file.FullName + "/contents"
-          Expand-Archive $renamedFilePath -Destination $dest
-        }
-        
-        $nuspecPaths = Get-ChildItem $file.FullName -Recurse -Filter "*.nuspec"
-        foreach ($nuspecPath in $nuspecPaths)
-        {
-          # When Nuget restore the packages, the packages directory can have
-          # two of the same package in the directory, one with the version,
-          # and one without. This "seen" set prevents the scripts from looking at it twice
-          if (-not $seen.Contains($nuspecPath.Name.ToLower()))
-          {
-            $seen[$nuspecPath.Name.ToLower()] = $true
-            Write-Host "Found Nuspecs"
-            Write-Host "Comparing dependencies in " $nuspecPath.Name.ToLower()
-            [xml]$nuspec = Get-Content -Path $nuspecPath.FullName
-            foreach ($group in $nuspec.package.metadata.dependencies.group)
-            {
-              foreach ($dependency in $group.dependency)
-              {
-                $id = $dependency.id
-                # WinUI encapsulated their versions with brackets so we have to sanitize it
-                $version = $dependency.version.trim("[]")
-
-                Write-Host "  Checking $id : $version"
-                if (($null -ne $dependenciesMap[$id]) -and ($dependenciesMap[$id] -ne $version))
-                {
-                  Write-Host "$id has version mismatched in $nuspecPath"
-                  if ($enforcementSet.Contains($id))
-                  {
-                    Write-Host "##vso[task.complete result=Failed;]DONE"
-                  }
-                }
-              }
-            }
-            Write-Host ""
-          }
-        }
-      }

eng/common/AzurePipelinesTemplates/WindowsAppSDK-Build-Steps.yml

@@ -46,7 +46,7 @@ parameters:
 
 steps:
   - ${{ if ne(parameters.TransportPackageArtifactName, '') }}:
-    - task: DownloadPipelineArtifact@2
+    - task: DownloadBuildArtifacts@0
       inputs:
         artifactName: ${{ parameters.TransportPackageArtifactName }}
         downloadPath: '$(Build.SourcesDirectory)\localpackages'

eng/common/AzurePipelinesTemplates/WindowsAppSDK-GlobalVariables.yml

@@ -3,7 +3,8 @@
 variables:
   # Native compiler version override for win undock. The two values below are for Ge, defined in:
   # https://dev.azure.com/microsoft/OS/_git/UndockedES?path=/Pipelines/Config/CompilerToolsSettings.json
-  compilerOverridePackageName: "DevDiv.rel.LKG16.VCTools"    
+  compilerOverridePackageName: "DevDiv.rel.LKG16.VCTools"
   compilerOverridePackageVersion: "19.38.3313310000+DevDivGIT.CI20231130.01-8BB7F026181F5D52D44CA519FF6A47BFA2763E45"
   # Use the following corresponding version string instead of the above when calling nuget install directly.
   compilerOverrideNupkgVersion: "19.38.33133100-v2"
+  symbolsArtifactName: "WinAppSDKSymbols_$(System.DefinitionId)_$(Build.BuildId)_$(System.StageName)_$(Agent.JobName)"

eng/common/DevCheck.ps1

@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation and Contributors.
+# Copyright (c) Microsoft Corporation and Contributors.
 # Licensed under the MIT License.
 
 <#
@@ -318,30 +318,27 @@ $vswhere = ''
 $vswhere_url = ''
 function Get-VSWhere
 {
+    Write-Verbose "Detecting vswhere.exe..."
+    if ($OnlineVSWhere -eq $false)
+    {
+        $global:vswhere = Get-VSWhereOffline
+    }
     if ([string]::IsNullOrEmpty($global:vswhere))
     {
-        Write-Verbose "Detecting vswhere.exe..."
-        if ($OnlineVSWhere -eq $false)
+        if ($Offline -eq $false)
         {
-            $global:vswhere = Get-VSWhereOffline
+            $global:vswhere = Get-VSWhereOnline
         }
-        if ([string]::IsNullOrEmpty($global:vswhere))
-        {
-            if ($Offline -eq $false)
-            {
-                $global:vswhere = Get-VSWhereOnline
-            }
-        }
-        if ([string]::IsNullOrEmpty($global:vswhere))
-        {
-            Write-Host "ERROR: vswhere.exe not found" -ForegroundColor Red -BackgroundColor Black
-            $global:issues += 1
-            return $null
-        }
-
-        Write-Verbose "Using $vswhere"
-        $global:vswhere = $vswhere
     }
+    if ([string]::IsNullOrEmpty($global:vswhere))
+    {
+        Write-Host "ERROR: vswhere.exe not found" -ForegroundColor Red -BackgroundColor Black
+        $global:issues += 1
+        return $null
+    }
+
+    Write-Verbose "Using $vswhere"
+    $global:vswhere = $vswhere
     return $global:vswhere
 }
 
@@ -376,22 +373,18 @@ function Run-Process([string]$exe, [string]$arguments, [Ref][string]$stderr, [in
 $vspath = ''
 function Get-VisualStudio2022InstallPath
 {
-    if ([string]::IsNullOrEmpty($global:vspath))
+    Write-Verbose "Detecting VisualStudio 2022..."
+    $vswhere = Get-VSWhere
+    if ([string]::IsNullOrEmpty($global:vswhere))
     {
-        Write-Verbose "Detecting VisualStudio 2022..."
-        $vswhere = Get-VSWhere
-        if ([string]::IsNullOrEmpty($global:vswhere))
-        {
-            return $null
-        }
-        $args = " -latest -products * -version [17.0,18.0) -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath"
-        Write-Verbose "Executing $vswhere $args"
-        $path = Run-Process $vswhere $args
-        $path = $path -replace [environment]::NewLine, ''
-        Write-Verbose "Visual Studio 2022 detected at $path"
-        $global:vspath = $path
+        return $null
     }
-    return $global:vspath
+    $args = " -latest -products * -version [17.0,18.0) -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath"
+    Write-Verbose "Executing $vswhere $args"
+    $path = Run-Process $vswhere $args
+    $path = $path -replace [environment]::NewLine, ''
+    Write-Verbose "Visual Studio 2022 detected at $path"
+    $global:vspath = $path
 }
 
 function Test-VisualStudioComponent

eng/common/Scripts/GetLKGCompilerPackageInfoIfNeeded.ps1

@@ -0,0 +1,33 @@
+param
+(
+    [String] $SourceDirectory
+)
+
+$ErrorActionPreference = "Stop"
+
+# If $env:LkgVcToolsName and $env:LkgVcToolsVersion are not fully specified, try to retrieve the defaults from WindowsAppSDK-GlobalVariables.yml.
+if (($env:LkgVcToolsName -eq $null) -or ($env:LkgVcToolsVersion -eq $null))
+{
+    $Records = Get-Content $SourceDirectory\eng\common\AzurePipelinesTemplates\WindowsAppSDK-GlobalVariables.yml
+    For ($i = 0; $i -lt $Records.count; $i++)
+    {
+        if ($env:LkgVcToolsName -eq $null)
+        {
+            $Target1 = $Records[$i] -split "compilerOverridePackageName:"
+            if (($Target1.count -gt 1) -and ($Target1[1] -ne $null))
+            {
+                $env:LkgVcToolsName = $Target1[1].trim(' ')
+            }
+        }
+
+        if ($env:LkgVcToolsVersion -eq $null)
+        {
+            $Target2 = $Records[$i] -split "compilerOverrideNupkgVersion:"
+            if (($Target2.count -gt 1) -and ($Target2[1] -ne $null))
+            {
+                $env:LkgVcToolsVersion = $Target2[1].trim(' ')
+            }
+        }
+    }
+    Write-Host "Using LKG package name and version:" $env:LkgVcToolsName $env:LkgVcToolsVersion 
+}

eng/common/Scripts/MaestroHelpers.ps1

@@ -53,7 +53,7 @@ function ConvertToMaestroFriendlyAzureDevOpUri([string]$buildRepositoryUri)
 
 function IsGitHubRepo([string]$buildRepositoryUri)
 {
-    $githubUrls = @("https://github.com", "https://www.github.com")
+    $githubUrls = @("https://github.com", "https://wwww.github.com")
     for ($i = 0; $i -le ($githubUrls.length); $i += 1)
     {
         if ($buildRepositoryUri.length -ge $githubUrls[$i].length)

eng/common/Scripts/PublishPublicSymbols.ps1

@@ -0,0 +1,92 @@
+Param(
+    [string] $RequestName
+)
+
+$ProjectName = 'WindowsAppSDK'
+
+# See this page for info
+Write-Host "See this page for more info:"
+Write-Host "https://www.osgwiki.com/wiki/Symbols_Publishing_Pipeline_to_SymWeb_and_MSDL"
+
+# Get the access token for the API
+$token = (Get-AzAccessToken -ResourceUrl api://30471ccf-0966-45b9-a979-065dbedb24c1).Token
+
+# Register the request name
+Write-Host "Registering request name"
+$jsonData = @{
+  requestName = "$RequestName"
+  organizationName = "microsoft"
+}
+$jsonBody = $jsonData | ConvertTo-Json
+Write-Host $jsonBody
+Invoke-RestMethod -Method POST -Uri https://symbolrequestprod.trafficmanager.net/projects/$ProjectName/requests -Headers @{ Authorization = "Bearer $token" } -ContentType "application/json" -Body $jsonBody
+
+# Publish to public and internal server
+Write-Host
+Write-Host "Publishing to symbol server"
+$jsonData = @{
+    publishToInternalServer = "true"
+    publishToPublicServer = "true"
+}
+$jsonBody = $jsonData | ConvertTo-Json
+Write-Host $jsonBody
+Invoke-RestMethod -Method POST -Uri https://symbolrequestprod.trafficmanager.net/projects/$ProjectName/requests/$RequestName -Headers @{ Authorization = "Bearer $token" } -ContentType "application/json" -Body $jsonBody
+
+# Print publishing status information
+Write-Host
+Write-Host "Check status of symbol publishing here:"
+
+Write-Host
+Write-Host "PublishingStatus Key"
+Write-Host "0: NotRequested; The request has not been requested to publish."
+Write-Host "1: Submitted; The request is submitted to be published"
+Write-Host "2: Processing; The request is still being processed"
+Write-Host "3: Completed; The request has been completed processing. It can be failed or successful. Check PublishingResult to get more details"
+
+Write-Host
+Write-Host "PublishingResult Key"
+Write-Host "0: Pending; The request has not completed or has not been requested."
+Write-Host "1: Succeeded; The request has published successfully"
+Write-Host "2: Failed; The request has failed to publish"
+Write-Host "3: Cancelled; The request was cancelled."
+
+# Check status of publishing request
+Write-Host
+Write-Host "Publishing Status:"
+$publishToPublicServerResult = 0
+$callCount = 1
+$timeBetweenAPICalls = 20
+$maxCallCount = 20
+while ($publishToPublicServerResult -eq 0)
+{
+  Write-Host "Publishing result is pending"
+  Start-Sleep -Seconds $timeBetweenAPICalls
+  $result = Invoke-RestMethod -Method GET -Uri https://symbolrequestprod.trafficmanager.net/projects/$ProjectName/requests/$RequestName -Headers @{ Authorization = "Bearer $token" } -ContentType "application/json"
+  $callCount += 1
+  if ($result.publishToPublicServerStatus -eq 0)
+  {
+    Write-Host "Publishing Status is not showing as submitted"
+    exit 1
+  }
+  $publishToPublicServerResult = $result.publishToPublicServerResult
+  if ($publishToPublicServerResult -eq 1)
+  {
+    Write-Host "Publishing result has Succeeded"
+    exit 0
+  }
+  if ($publishToPublicServerResult -eq 2)
+  {
+    Write-Host "Publishing result has Failed"
+    exit 1
+  }
+  if ($publishToPublicServerResult -eq 3)
+  {
+    Write-Host "Publishing result has been Canceled"
+    exit 1
+  }
+  if ($callCount -eq $maxCallCount)
+  {
+    Write-Host "Timeout reached"
+    exit 1
+  }
+}

eng/common/Scripts/StripSymbols.ps1

@@ -0,0 +1,84 @@
+param(
+    [parameter(mandatory)][string] $InputDirectory,
+    [parameter(mandatory)][string] $OutputDirectory
+)
+
+$ErrorActionPreference = "Stop"
+function Get-IsAmd64Bit
+{
+    return $env:PROCESSOR_ARCHITECTURE -eq "AMD64"
+}
+
+function Get-IsArm64Bit
+{
+    return $env:PROCESSOR_ARCHITECTURE -eq "ARM64"
+}
+
+function Get-DebuggingToolsRoot
+{
+    # Constants
+    $windowsSDKRegPath = if (Get-IsAmd64Bit -or Get-IsArm64Bit) { "HKLM:\Software\WOW6432Node\Microsoft\Windows Kits\Installed Roots" } else { "HKLM:\Software\Microsoft\Windows Kits\Installed Roots" }
+    $windowsDebuggingToolsRegRootKey = "WindowsDebuggersRoot10"
+
+    try
+    {
+        return Get-ItemProperty -Path $windowsSDKRegPath | Select-Object -ExpandProperty $windowsDebuggingToolsRegRootKey
+    }
+    catch
+    {
+        return $null
+    }
+}
+
+function Remove-PrivateSymbolInformation(
+    [parameter(mandatory)][ValidateNotNullOrEmpty()] [string] $inputPdbPath,
+    [parameter(mandatory)][ValidateNotNullOrEmpty()] [string] $outputPdbPath)
+{
+    $debuggingToolsRoot = Get-DebuggingToolsRoot
+    if (Get-IsAmd64Bit)
+    {
+        $pdbCopy = Join-Path $debuggingToolsRoot "x64\pdbcopy.exe"
+    }
+    elseif (Get-IsArm64Bit)
+    {
+        $pdbCopy = Join-Path $debuggingToolsRoot "arm64\pdbcopy.exe"
+    }
+    else
+    {
+        $pdbCopy = Join-Path $debuggingToolsRoot "x86\pdbcopy.exe"
+    }
+
+    $arguments = "$inputPdbPath $outputPdbPath -p"
+
+    Write-Host "$inputPdbPath => $outputPdbPath"
+    Start-Process -Wait -NoNewWindow $pdbCopy $arguments
+} 
+
+Write-Host -NoNewline "Checking for installed Debugging Tools for Windows..."
+
+$debuggingToolsRoot = Get-DebuggingToolsRoot
+if ($debuggingToolsRoot)
+{
+    Write-Host -ForegroundColor Green "FOUND"
+}
+else
+{
+    Write-Host -ForegroundColor Yellow "MISSING"
+    exit 1
+}
+
+if (Test-Path $OutputDirectory)
+{
+    Remove-Item -Recurse $OutputDirectory
+}
+New-Item -ItemType Directory $OutputDirectory | Out-Null
+
+Write-Host "Stripping private information from symbols..."
+
+foreach ($inputPdb in (Get-ChildItem -Recurse -Filter "*.pdb" $InputDirectory))
+{
+    $inputPdbPath = $inputPdb.FullName
+    $outputPdbPath = Join-Path $OutputDirectory $inputPdb.name
+
+    Remove-PrivateSymbolInformation $inputPdbPath $outputPdbPath
+}

eng/common/Scripts/buildMockWinAppSdkPackage.ps1

@@ -1,53 +0,0 @@
-# This script will be used by BuildAll.ps1 to build a mock WindowsAppSDK Package. A path to the TransportPackage used must be provided to
-# the TransportPackagePath parameter along with the PackageName and PackageVersion in each respective parameters
-param(
-    [Parameter(Mandatory=$true)] [string] $TransportPackageName,
-    [Parameter(Mandatory=$true)] [string] $TransportPackagePath,
-    [Parameter(Mandatory=$false)] [string] $TransportPackageVersion,
-    [Parameter(Mandatory=$true)] [string] $Output,
-    [Parameter(Mandatory=$true)] [string] $RepoRoot,
-    [Parameter(Mandatory=$true)] [string] $Platform,
-    [Parameter(Mandatory=$true)] [string] $Configuration,
-    [Parameter(Mandatory=$false)] [string] $WindowsAppSDKPackageVersionBase = "999.0.0-mock",
-    [Parameter(Mandatory=$false)] [string] $PackageCache,
-    [switch] $AzurePipelineBuild,
-    [switch] $CleanOutput,
-    [switch] $Fake
-)
-
-pushd (Join-Path $RepoRoot "WindowsAppSDKAggregator")
-
-if($CleanOutput)
-{
-    . .\buildall.ps1 -Platform $Platform -Configuration $Configuration -clean
-}
-
-# Do WinAppSDK one-time setup (mainly, creating and installing test cert)
-if(!(Test-Path ".\.user\winappsdk.certificate.test.pfx" ))
-{
-    .\OneTimeSetupAll.ps1 -CertPassword "password"
-    if($LASTEXITCODE -ne 0)
-    {
-        popd
-        Write-Host ".\WindowsAppSDKAggregator\OneTimeSetupAll.ps1 failed with exit code: $LASTEXITCODE" -ForegroundColor RED
-        exit $LASTEXITCODE
-    }
-}
-
-New-Variable -Name ("$TransportPackageName"+"PackageVersion") $TransportPackageVersion
-$localPackagesPath = (Join-Path (Join-Path $RepoRoot "WindowsAppSDKAggregator") "localpackages")
-$packLocationPath = (Join-Path (Join-Path $RepoRoot "WindowsAppSDKAggregator") "PackLocation")
-
-$WindowsAppSDKPackageVersion = "$WindowsAppSDKPackageVersionBase-$TransportPackageVersion-$Platform-$Configuration"
-Copy-Item $TransportPackagePath -destination $localPackagesPath
-
-. .\buildall.ps1 -WindowsAppSDKPackageVersion $WindowsAppSDKPackageVersion -Platform $Platform -Configuration $Configuration -Channel "dev" -TransportPackages "" -BuildOutput $BuildOutput -NugetConfig $NugetConfig -PackageCache $PackageCache -PackageStore $PackageStore -LocalPackages $PackageStore -SkipVerifyProductVersion -AzurePipelineBuild:$AzurePipelineBuild -Fake:$Fake
-Copy-Item -Path "$packLocationPath/*" -Destination $Output -Recurse -Filter "*.nupkg"
-popd
-
-if($LASTEXITCODE -ne 0)
-{
-    Write-Host ".\WindowsAppSDKAggregator\buildAll.ps1 failed with exit code: $LASTEXITCODE" -ForegroundColor RED
-    exit $LASTEXITCODE
-}
-exit 0

eng/common/VersionInfo/AssemblyInfo.ver

@@ -31,7 +31,7 @@
 
 #ifndef VERSIONINFO_FILEVERSION_STRING
 #define VERSIONINFO_FILEVERSION_STRING  WINDOWSAPPSDK_PRODUCT_VERSION_STRING
-#endif 
+#endif
 
 #ifndef VERSIONINFO_FILETYPE
 #define VERSIONINFO_FILETYPE  VFT_DLL
@@ -52,7 +52,7 @@ VS_VERSION_INFO VERSIONINFO
  FILEVERSION VERSIONINFO_FILEVERSION
  FILETYPE VERSIONINFO_FILETYPE
  FILEFLAGSMASK 0x3fl;
- FILEFLAGS VERSIONINFO_FILEFLAGS 
+ FILEFLAGS VERSIONINFO_FILEFLAGS
  FILEOS VOS_NT_WINDOWS32
 
  BEGIN

eng/common/VersionInfo/GenerateVersionInfo.ps1

@@ -25,7 +25,7 @@ Param(
 $utf8NoBomEncoding = New-Object System.Text.UTF8Encoding $False
 
 $scriptFullPath =  (Split-Path -Parent $MyInvocation.MyCommand.Definition)
-Write-Host "scriptFullPath: $scriptFullPath"
+Write-Verbose "scriptFullPath: $scriptFullPath"
 
 # Default values for CompanyName, ProductName, Copyright
 $companyName = "Microsoft Corporation"
@@ -46,9 +46,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyFileVersion("$ProductMajor.$ProductMinor")]
 "@
 
-Write-Host $assemblyInfoCs
+Write-Verbose $assemblyInfoCs
 $assemblyInfoCsPath = "$scriptFullPath/AssemblyInfo.cs"
-Write-Host "Writing $assemblyInfoCsPath..."
+Write-Verbose "Writing $assemblyInfoCsPath..."
 [System.IO.File]::WriteAllLines($assemblyInfoCsPath, $assemblyInfoCs, $utf8NoBomEncoding)
 
 # Generating AssemblyInfo.ver override
@@ -128,7 +128,7 @@ VS_VERSION_INFO VERSIONINFO
  END
 "@
 
-Write-Host $assemblyInfoVer
+Write-Verbose $assemblyInfoVer
 $assemblyInfoVerPath = "$scriptFullPath/AssemblyInfo.ver"
-Write-Host "Writing $assemblyInfoVerPath..."
+Write-Verbose "Writing $assemblyInfoVerPath..."
 [System.IO.File]::WriteAllLines($assemblyInfoVerPath, $assemblyInfoVer, $utf8NoBomEncoding)

global.json

@@ -3,6 +3,6 @@
     "dotnet": "6.0.414"
   },
   "msbuild-sdks": {
-    "Microsoft.WinAppSDK.EngCommon": "1.5.230711"
+    "Microsoft.WinAppSDK.EngCommon": "1.6.240410"
   }
 }