Merge branch 'main' into user/DinahK-2SO/feature_settingsidentifier_filetypefilterindex

Author: DinahK-2SO

README.md

@@ -23,7 +23,7 @@
 
 [Windows App SDK](https://aka.ms/winappsdk) (formerly Project Reunion) is a set of libraries, frameworks, components, and tools that you can use in your apps to access powerful Windows platform functionality from all kinds of apps on many versions of Windows. The Windows App SDK combines the powers of Win32 native applications alongside modern API usage techniques, so your apps light up everywhere your users are.
 
-- **WinUI 3 support:** [WinUI](https://aka.ms/winui) embodies Fluent Design to enable intuitive, accessible, and powerful experiences and the latest user interface patterns.
+- **WinUI 3 support:** [WinUI](https://learn.microsoft.com/windows/apps/winui/winui3/) embodies Fluent Design to enable intuitive, accessible, and powerful experiences and the latest user interface patterns.
 - **Access modern features:** [Modern resource tooling](https://github.com/microsoft/WindowsAppSDK/issues/11), [modern lifecycle helpers](https://github.com/microsoft/WindowsAppSDK/issues/9), [startup tasks](https://github.com/microsoft/WindowsAppSDK/issues/10), and more without having to rewrite your app.
 - **Backwards compatibility:** Down to Windows 10 1809 (build 17763). There may be some API that are dependent on new OS features
 (like new Action Center functionality), however we will do our best to ensure this is the exception and not the norm, and provide reasonable fallbacks when possible.
@@ -32,7 +32,7 @@
 
 ## 📋 Getting started with Windows App SDK
 
-* [Build your first app with Windows App SDK](https://learn.microsoft.com/windows/apps/winui/winui3/create-your-first-winui3-app)
+* [Build your first app with WinUI](https://learn.microsoft.com/windows/apps/get-started/start-here)
 * [Developer documentation](https://aka.ms/windowsappsdkdocs)
 * [Samples & resources](https://learn.microsoft.com/windows/apps/get-started/samples)
   * [Windows App SDK samples](https://github.com/microsoft/WindowsAppSDK-Samples)

WindowsAppRuntime.sln

@@ -750,6 +750,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StoragePickers", "StoragePi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Deployment.WindowsAppRuntime.Test.SingletonHigherVersion", "test\Deployment\data\WindowsAppRuntime.Test.SingletonHigherVersion\WindowsAppRuntime.Test.SingletonHigherVersion.vcxproj", "{462CF10A-E6B5-4005-8E25-132D1DE589B7}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Deployment.WindowsAppRuntime.Test.SingletonLowerVersion", "test\Deployment\data\WindowsAppRuntime.Test.SingletonLowerVersion\WindowsAppRuntime.Test.SingletonLowerVersion.vcxproj", "{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -2644,6 +2646,22 @@ Global
 		{462CF10A-E6B5-4005-8E25-132D1DE589B7}.Release|x64.Build.0 = Release|x64
 		{462CF10A-E6B5-4005-8E25-132D1DE589B7}.Release|x86.ActiveCfg = Release|Win32
 		{462CF10A-E6B5-4005-8E25-132D1DE589B7}.Release|x86.Build.0 = Release|Win32
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Debug|Any CPU.Build.0 = Debug|x64
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Debug|ARM64.Build.0 = Debug|ARM64
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Debug|x64.ActiveCfg = Debug|x64
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Debug|x64.Build.0 = Debug|x64
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Debug|x86.ActiveCfg = Debug|Win32
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Debug|x86.Build.0 = Debug|Win32
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|Any CPU.ActiveCfg = Release|x64
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|Any CPU.Build.0 = Release|x64
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|ARM64.Build.0 = Release|ARM64
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|x64.ActiveCfg = Release|x64
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|x64.Build.0 = Release|x64
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|x86.ActiveCfg = Release|Win32
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2871,6 +2889,7 @@ Global
 		{346E099B-45E4-FF40-E63D-8B34915223C1} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
 		{06AA7FD7-36BE-41AC-9008-56919D1612C6} = {3B706C5C-55E0-4B76-BF59-89E20FE46795}
 		{462CF10A-E6B5-4005-8E25-132D1DE589B7} = {2B653A15-2482-40E5-9509-C531E69D0749}
+		{7A3C8F5D-9B2E-4A1F-8D6C-3E9F7B4A2C1D} = {2B653A15-2482-40E5-9509-C531E69D0749}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}

build/WindowsAppSDK-Foundation-Official.yml

@@ -129,28 +129,29 @@ extends:
 
     stages:
 
-    - stage: ManualValidation_RuntimeCompatibility
-      displayName: 'Manual Validation - RuntimeCompatibilityChange Enums'
-      # Only run this validation for release branches
-      condition: and(contains(variables['Build.SourceBranch'], 'release/'), eq(parameters.validateRuntimeCompatibility, true))
-      dependsOn: []
-      jobs:
-      - job: waitForValidation
-        displayName: 'Wait for external validation'
-        pool: server
-        timeoutInMinutes: 120 # 2 hours timeout
-        steps:
-        - task: ManualValidation@0
-          displayName: 'Confirm RuntimeCompatibilityChange Enums Added'
-          inputs:
-            notifyUsers: ''
-            instructions: |
-              SERVICING BUILD - RuntimeCompatibilityChange VALIDATION
-
-              Verify dev/RuntimeCompatibilityOptions/RuntimeCompatibilityOptions.idl in Foundation
-
-              Unless none of the servicing changes have containment, Foundation MUST include the RuntimeCompatibilityChange
-              enum values associated with this servicing release before kicking off this official build.
+    - ${{ if eq(parameters.validateRuntimeCompatibility, 'true') }}:
+      - stage: ManualValidation_RuntimeCompatibility
+        displayName: 'Manual Validation - RuntimeCompatibilityChange Enums'
+        # Only run this validation for release branches
+        condition: contains(variables['Build.SourceBranch'], 'release/')
+        dependsOn: []
+        jobs:
+        - job: waitForValidation
+          displayName: 'Wait for external validation'
+          pool: server
+          timeoutInMinutes: 120 # 2 hours timeout
+          steps:
+          - task: ManualValidation@0
+            displayName: 'Confirm RuntimeCompatibilityChange Enums Added'
+            inputs:
+              notifyUsers: ''
+              instructions: |
+                SERVICING BUILD - RuntimeCompatibilityChange VALIDATION
+
+                Verify dev/RuntimeCompatibilityOptions/RuntimeCompatibilityOptions.idl in Foundation
+
+                Unless none of the servicing changes have containment, Foundation MUST include the RuntimeCompatibilityChange
+                enum values associated with this servicing release before kicking off this official build.
     
     - template: AzurePipelinesTemplates\WindowsAppSDK-Build-Stage.yml@self
       parameters:

build/scripts/DownloadDotNetRuntimeInstaller.ps1

@@ -41,7 +41,7 @@ else
 if(-not(Test-Path $outputPath))
 {
     Write-Host "Downloading $downloadurl to $outputPath"
-    Invoke-WebRequest $downloadurl -OutFile $outputPath
+    Invoke-WebRequest $downloadurl -OutFile $outputPath -UseBasicParsing
 }
 else
 {

build/scripts/DownloadVCLibsDesktop.ps1

@@ -21,7 +21,7 @@ $downloadurl = "https://aka.ms/Microsoft.VCLibs.$Platform.14.00.Desktop.appx"
 if(-not(Test-Path $outputPath))
 {
     Write-Host "Downloading $downloadurl to $outputPath"
-    Invoke-WebRequest $downloadurl -OutFile $outputPath
+    Invoke-WebRequest $downloadurl -OutFile $outputPath -UseBasicParsing
 }
 else
 {

build/scripts/DownloadVCRedistInstaller.ps1

@@ -21,7 +21,7 @@ $downloadurl = "https://aka.ms/vs/17/release/vc_redist.$Platform.exe"
 if(-not(Test-Path $outputPath))
 {
     Write-Host "Downloading $downloadurl to $outputPath"
-    Invoke-WebRequest $downloadurl -OutFile $outputPath
+    Invoke-WebRequest $downloadurl -OutFile $outputPath -UseBasicParsing
 }
 else
 {

build/scripts/windows-sdk.ps1

@@ -26,7 +26,7 @@ function Install-EXE
         Write-Host "Downloading $Name..."
         $FilePath = "${env:Temp}\$Name"
 
-        Invoke-WebRequest -Uri $Url -OutFile $FilePath
+        Invoke-WebRequest -Uri $Url -OutFile $FilePath -UseBasicParsing
 
         Write-Host "Starting Install $Name..."
         $process = Start-Process -FilePath $FilePath -ArgumentList $ArgumentList -Wait -PassThru

dev/Deployment/DeploymentManager.cpp

@@ -368,7 +368,8 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
         const std::wstring& packageIdentifier) try
     {
         auto packageFullNames{ FindPackagesByFamily(packageFamilyName) };
-        bool match{};
+        UINT64 highestVersionFound{ 0 }; // There is no package with version 0
+        std::wstring highestVersionPackageFullName{};
         for (const auto& packageFullName : packageFullNames)
         {
             auto packagePath{ GetPackagePath(packageFullName) };
@@ -378,18 +379,20 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
             }
 
             auto packageId{ AppModel::Identity::PackageIdentity::FromPackageFullName(packageFullName.c_str()) };
-            if (packageId.Version().Version >= targetVersion.Version)
+            const auto packageVersion{ packageId.Version().Version };
+            if (packageVersion > highestVersionFound)
             {
-                match = true;
-                if (packageId.Version().Version > targetVersion.Version)
-                {
-                    g_existingTargetPackagesIfHigherVersion.insert(std::make_pair(packageIdentifier, packageFullName));
-                }
-                break;
+                highestVersionFound = packageVersion;
+                highestVersionPackageFullName = packageFullName;
             }
         }
 
-        RETURN_HR_IF(HRESULT_FROM_WIN32(ERROR_NOT_FOUND), !match);
+        if (highestVersionFound > targetVersion.Version)
+        {
+            g_existingTargetPackagesIfHigherVersion[packageIdentifier] = highestVersionPackageFullName;
+        }
+
+        RETURN_HR_IF(HRESULT_FROM_WIN32(ERROR_NOT_FOUND), highestVersionFound < targetVersion.Version);
         return S_OK;
     }
     CATCH_RETURN()

dev/MRTCore/build/DownloadDotNetCoreSdk.ps1

@@ -154,7 +154,7 @@ Write-Host "Installing .NET SDK..."
 
 [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Ssl3,Tls,Tls11,Tls12'
 
-Invoke-WebRequest https://dot.net/v1/dotnet-install.ps1 -OutFile $dotnetInstallScript
+Invoke-WebRequest https://dot.net/v1/dotnet-install.ps1 -OutFile $dotnetInstallScript -UseBasicParsing
 
 if (-not $latestAlreadyInstalled)
 {

dev/MRTCore/build/MSBuildFunctions.psm1

@@ -18,7 +18,7 @@ $MSBuildUninstallParams = "uninstall --norestart --quiet --wait --force --instal
 function Download-MSBuild([string]$OutFile)
 {
     Write-Host -NoNewline "Downloading $OutFile... "
-    Invoke-WebRequest -Uri $MSBuildInstallURI -OutFile $OutFile
+    Invoke-WebRequest -Uri $MSBuildInstallURI -OutFile $OutFile -UseBasicParsing
     Write-Host -ForegroundColor Green Done.
 }