Resolve Merge Conflicts

Author: kythant

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -35,9 +35,9 @@ 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.0: 1.3.230331000"
+        - "Windows App SDK 1.3.1: 1.3.230502000"
         - "Windows App SDK 1.3 Preview 1: 1.3.230228005-preview1"
-        - "Windows App SDK 1.3 Experimental 1: 1.3.230202101-experimental1"
+        - "Windows App SDK 1.4 Experimental 1: 1.4.230518007-experimental1"
   - type: dropdown
     attributes:
       label: Packaging type

BuildAll.ps1

@@ -68,7 +68,7 @@ if(-not (test-path ".nuget\nuget.exe"))
 $configurationForMrtAndAnyCPU = "Release"
 $MRTSourcesDirectory = "dev\MRTCore"
 
-$VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -requires Microsoft.Component.MSBuild -property InstallationPath
+$VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath
 write-host "VCToolsInstallDir: $VCToolsInstallDir"
 
 $msBuildPath = "$VCToolsInstallDir\MSBuild\Current\Bin\msbuild.exe"

DevCheck.ps1

@@ -755,7 +755,7 @@ function Test-TAEFService
     }
 
     # Double-check the TAEF service is known as a service as far as Windows is concerned
-    $service = Get-Service |Where-Object {$_.Name -eq "TE.Service"}
+    $service = Get-Service -ErrorAction SilentlyContinue | Where-Object {$_.Name -eq "TE.Service"}
     if ([string]::IsNullOrEmpty($service))
     {
         Write-Host "TAEF service...Not Installed"
@@ -812,7 +812,7 @@ function Install-TAEFService
 
     $args = '/install:TE.Service'
     $output = Run-Process $path $args
-    $service = Get-Service |Where-Object {$_.Name -eq "TE.Service"}
+    $service = Get-Service -ErrorAction SilentlyContinue | Where-Object {$_.Name -eq "TE.Service"}
     if ([string]::IsNullOrEmpty($service))
     {
         Write-Host "Install TAEF service...Failed"
@@ -845,7 +845,7 @@ function Uninstall-TAEFService
     $filename = Get-TAEFServiceImagePath
     $args = '/remove:TE.Service'
     $output = Run-Process $filename $args
-    $service = Get-Service |Where-Object {$_.Name -eq "TE.Service"}
+    $service = Get-Service -ErrorAction SilentlyContinue | Where-Object {$_.Name -eq "TE.Service"}
     if (-not([string]::IsNullOrEmpty($service)))
     {
         Write-Host "Uninstall TAEF service...Failed"
@@ -870,7 +870,7 @@ function Start-TAEFService
     }
 
     $ok = Start-Service 'TE.Service'
-    $service = Get-Service |Where-Object {$_.Name -eq "TE.Service"}
+    $service = Get-Service -ErrorAction SilentlyContinue | Where-Object {$_.Name -eq "TE.Service"}
     if ($service.Status -ne "Running")
     {
         Write-Host "Start TAEF service...Failed"
@@ -893,7 +893,7 @@ function Stop-TAEFService
         return $false
     }
 
-    $service = Get-Service |Where-Object {$_.Name -eq "TE.Service"}
+    $service = Get-Service -ErrorAction SilentlyContinue | Where-Object {$_.Name -eq "TE.Service"}
     if ($service -eq $null)
     {
         return 'NotFound'
@@ -902,7 +902,7 @@ function Stop-TAEFService
     {
         $ok = Stop-Service 'TE.Service'
     }
-    $service = Get-Service |Where-Object {$_.Name -eq "TE.Service"}
+    $service = Get-Service -ErrorAction SilentlyContinue | Where-Object {$_.Name -eq "TE.Service"}
     if ($service -eq $null)
     {
         return 'NotFound'
@@ -1316,6 +1316,10 @@ if (($CheckAll -ne $false) -Or ($CheckTestCert -ne $false))
     if ($test -ne $true)
     {
         $null = Repair-DevTestCert
+        if ($CheckTestCert)
+        {
+            Exit 0
+        }
     }
 }
 
@@ -1384,9 +1388,11 @@ if (($RemoveAll -ne $false) -Or ($RemoveTestPfx -ne $false))
 if ($global:issues -eq 0)
 {
     Write-Output "Coding time!"
+    Exit 0
 }
 else
 {
     $n = $global:issues
     Write-Output "$n issue(s) detected"
+    Exit 2
 }

build/AzurePipelinesTemplates/WindowsAppSDK-BuildAndTestMRT-Steps.yml renamed to build/AzurePipelinesTemplates/WindowsAppSDK-BuildMRT-Steps.yml

@@ -5,9 +5,6 @@ parameters:
 - name: "IsOneBranch"
   type: boolean
   default: True
-- name: "RunVSTests"
-  type: boolean
-  default: False
 - name: "RunPrefast"
   type: boolean
   default: False
@@ -57,67 +54,6 @@ steps:
 # component detection must happen *within* the build task
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
 
-# TODO: Reenable Managed tests after https://microsoft.visualstudio.com/OS/_workitems/edit/44407037
-- ${{ if parameters.RunVSTests }}:
-  # This is required to fix VSTest failing with
-  # ##[error]This operation requires installation of Visual Studio with the Universal Windows Platform development workload selected
-  - task: PowerShell@2
-    displayName: "Installing Microsoft.VisualStudio.Workload.Universal component"
-    inputs:
-      targetType: inline
-      workingDirectory: $(Build.SourcesDirectory)
-      script: |
-        Measure-Command {Invoke-Expression "cd C:\'Program Files (x86)\Microsoft Visual Studio'\Installer\; .\vs_installer.exe modify --installPath 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' --add Microsoft.VisualStudio.Workload.Universal --downloadThenInstall --quiet | Out-Null"; Write-Host "Total time taken:"} | Select-Object Minutes, Seconds
-
-  # 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')))
-    inputs:
-      testSelector: 'testAssemblies'
-      testAssemblyVer2: '**\MrtCoreManagedTest.build.appxrecipe'
-      searchFolder: 'BuildOutput\$(buildConfiguration)\$(buildPlatform)\MrtCoreManagedTest'
-      testRunTitle: 'test MRT: ManagedTests - $(buildPlatform)'
-      platform: '$(buildPlatform)'
-      configuration: '$(buildConfiguration)'
-
-  - task: VSTest@2
-    displayName: 'test MRT: UnitTests'
-    # 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'
-      searchFolder: 'BuildOutput\$(buildConfiguration)\$(buildPlatform)\MrmUnitTest'
-      testRunTitle: 'test MRT: UnitTests - $(buildPlatform)'
-      platform: '$(buildPlatform)'
-      configuration: '$(buildConfiguration)'
-
-  - task: VSTest@2
-    displayName: 'test MRT: BaseUnitTests'
-    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'
-      searchFolder: 'BuildOutput\$(buildConfiguration)\$(buildPlatform)\MrmBaseUnitTests'
-      testRunTitle: 'test MRT: BaseUnitTests - $(buildPlatform)'
-      platform: '$(buildPlatform)'
-      configuration: '$(buildConfiguration)'
-
-  - task: VSTest@2
-    displayName: 'test MRT: UnpackagedTests'
-    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'
-      searchFolder: 'BuildOutput\$(buildConfiguration)\$(buildPlatform)\MrtCoreUnpackagedTests'
-      testRunTitle: 'test MRT: UnpackagedTests - $(buildPlatform)'
-      platform: '$(buildPlatform)'
-      configuration: '$(buildConfiguration)'
-
 - ${{ if eq(parameters.SignOutput, 'true') }}:
   - task: EsrpCodeSigning@2
     inputs:

build/AzurePipelinesTemplates/WindowsAppSDK-BuildTransportPackage-Stage.yml

@@ -83,7 +83,7 @@ stages:
         SignOutput: ${{ parameters.SignOutput }}
         IsOneBranch: ${{ parameters.IsOneBranch }}
 
-  - job: BuildAndTestMRT
+  - job: BuildMRT
     pool:
       # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
       ${{ if parameters.IsOneBranch }}:
@@ -117,7 +117,7 @@ stages:
       ob_sdl_suppression_suppressionSet: default
       ob_artifactBaseName: "MrtBinaries_$(buildConfiguration)_$(buildPlatform)"
     steps:
-    - template: WindowsAppSDK-BuildAndTestMRT-Steps.yml@self
+    - template: WindowsAppSDK-BuildMRT-Steps.yml@self
       parameters:
         SignOutput: ${{ parameters.SignOutput }}
         IsOneBranch: ${{ parameters.IsOneBranch }}
@@ -130,15 +130,15 @@ stages:
       isArm64Platfrom: false
       dependsOn:
         - BuildBinaries
-        - BuildAndTestMRT
+        - BuildMRT
 
   - template: WindowsAppSDK-RunTestsInPipeline-Job.yml@self
     parameters:
       jobName: PipelineTestsArm64
       isArm64Platfrom: true
       dependsOn:
         - BuildBinaries
-        - BuildAndTestMRT
+        - BuildMRT
 
   - job: NugetPackage
     pool:
@@ -153,7 +153,7 @@ stages:
     dependsOn:
     - BuildBinaries
     - BuildBinaries_release_anycpu
-    - BuildAndTestMRT
+    - BuildMRT
     condition: or(succeeded(), eq(${{ parameters.IgnoreFailures }}, 'true'))
     variables:
       ob_outputDirectory: '$(REPOROOT)\out'

build/ProjectReunion-CI.yml

@@ -135,7 +135,7 @@ jobs:
   steps:
   - task: NuGetToolInstaller@1
 
-  - template: AzurePipelinesTemplates\WindowsAppSDK-BuildAndTestMRT-Steps.yml
+  - template: AzurePipelinesTemplates\WindowsAppSDK-BuildMRT-Steps.yml
 
   - task: PublishBuildArtifacts@1
     displayName: 'Publish BuildOutput'
@@ -144,7 +144,7 @@ jobs:
       PathtoPublish: '$(buildOutputDir)'
 
 # 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.
+# is still being run in WindowsAppSDK-BuildMRT-Steps.yml.
 
 - job: StageAndPack
   pool:

build/WindowsAppSDK-SyncMirroredRepository.yml

@@ -6,11 +6,12 @@ parameters:
     develop: develop
     main: main
     release/1.3-stable: release/1.3-stable
+    release/1.4-stable: release/1.4-stable
 
 jobs:
 - job: SyncMirror
   strategy:
-    matrix: 
+    matrix:
       ${{ each branches in parameters.SourceToTargetBranch }}:
         ${{ branches.key }}:
           SourceBranch: ${{ branches.key }}

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ResourceContext.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation and Contributors.
+// Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 
 #include "pch.h"
@@ -40,13 +40,9 @@ void ResourceContext::InitializeQualifierNames()
 
 void ResourceContext::InitializeQualifierValueMap()
 {
-    if (m_qualifierNames.empty())
-    {
+    std::call_once(m_areQualifierNamesAndValueMapInitialized, [this] {
         InitializeQualifierNames();
-    }
 
-    if (m_qualifierValueMap == nullptr)
-    {
         m_qualifierValueMap = single_threaded_map<hstring, hstring>();
 
         if (m_resourceContext != nullptr)
@@ -74,7 +70,7 @@ void ResourceContext::InitializeQualifierValueMap()
         {
             m_qualifierValueMap.Insert(c_languageQualifierName, GetLangugageContext());
         }
-    }
+    });
 }
 
 winrt::Windows::Foundation::Collections::IMap<hstring, hstring> ResourceContext::QualifierValues()

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ResourceContext.h

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation and Contributors.
+// Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 
 #pragma once
@@ -23,6 +23,7 @@ struct ResourceContext : ResourceContextT<ResourceContext>
     void InitializeQualifierValueMap();
     hstring GetLangugageContext();
 
+    std::once_flag m_areQualifierNamesAndValueMapInitialized;
     MrmContextHandle m_resourceContext = nullptr;
     com_array<hstring> m_qualifierNames;
     winrt::Windows::Foundation::Collections::IMap<hstring, hstring> m_qualifierValueMap = nullptr;