FI: release/main to release/dev/monobuild

.github/workflows/build.yml

@@ -16,13 +16,13 @@ jobs:
 
     steps:
     - name: checkout project
-      uses: actions/checkout@v2
+      uses: actions/checkout@v6
 
     - name: setup msbuild
-      uses: microsoft/setup-msbuild@v1
+      uses: microsoft/setup-msbuild@v3
 
     - name: setup nuget
-      uses: NuGet/setup-nuget@v1.0.2
+      uses: NuGet/setup-nuget@v4
 
     - name: restore project packages
       run: nuget restore WindowsAppRuntime.sln

.gitignore

@@ -10,6 +10,9 @@
 *.userosscache
 *.sln.docstates
 
+# Backup files
+*.[Bb][Aa][Kk]
+
 # full nuget directory
 [Bb]uild/FullNuget
 

Directory.Packages.props

@@ -47,9 +47,9 @@
        otherwise falls back to the pinned version literal. -->
   <PropertyGroup Label="WindowsAppSDK Package Version Properties">
     <MicrosoftWindowsAppSDKBasePackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '2.0.6-dev.experimental1'))</MicrosoftWindowsAppSDKBasePackageVersion>
-    <MicrosoftFrameworkUdkPackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '3.0.0-experimental-27300.1878.260525-0800.0'))</MicrosoftFrameworkUdkPackageVersion>
-    <MicrosoftProjectReunionInteractiveExperiencesTransportPackagePackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '3.0.0-experimental-27300.1878.260525-0800.0'))</MicrosoftProjectReunionInteractiveExperiencesTransportPackagePackageVersion>
-    <MicrosoftWindowsAppSDKInteractiveExperiencesPackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '3.0.0-experimental-Rolling.20260525.1'))</MicrosoftWindowsAppSDKInteractiveExperiencesPackageVersion>
+    <MicrosoftFrameworkUdkPackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '3.0.0-experimental-27300.1896.260713-1015.0'))</MicrosoftFrameworkUdkPackageVersion>
+    <MicrosoftProjectReunionInteractiveExperiencesTransportPackagePackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '3.0.0-experimental-27300.1896.260713-1015.0'))</MicrosoftProjectReunionInteractiveExperiencesTransportPackagePackageVersion>
+    <MicrosoftWindowsAppSDKInteractiveExperiencesPackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '3.0.0-experimental-Rolling.20260713.2'))</MicrosoftWindowsAppSDKInteractiveExperiencesPackageVersion>
     <MicrosoftWindowsAppSDKAppLicensingInternalTransportPackagePackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '1.7.0-main.20241009.0'))</MicrosoftWindowsAppSDKAppLicensingInternalTransportPackagePackageVersion>
   </PropertyGroup>
 

build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml

@@ -10,16 +10,17 @@ parameters:
   default: true
 - name: UseCurrentBuild
   type: boolean
-  default: false 
+  default: false
 # When true, this template is being invoked from the monobuild context where
 # the WindowsAppSDK monorepo IS the self repo. PublishSymbol-Steps is invoked
 # WITHOUT the @WinAppSDK suffix.
 - name: IsMonobuild
   type: boolean
   default: false
+# To override OptionalVSIXVersion's default, add
+# OptionalVSIXVersion: 'x.y.z' to the parameters of
+# the stage that calls this template in the aggregator pipeline.
 - name: OptionalVSIXVersion
-  # if blank, the project template will select the version matching the Windows App SDK
-  # nuget. If provided, it should be a 4-part dotted version ('1.2.3.4')
   type: string
   default: 'default'
 - name: EnableExperimentalVSIXFeatures
@@ -129,6 +130,12 @@ steps:
       }
       Exit 1
 
+- task: UseDotNet@2
+  displayName: 'Use .NET SDK 10.0.110'
+  inputs:
+    packageType: 'sdk'
+    version: '10.0.110'
+
 - task: NuGetAuthenticate@1
 
 - task: VSBuild@1

build/AzurePipelinesTemplates/WindowsAppSDK-DotnetNewTemplates-Stages.yml

@@ -19,11 +19,21 @@ parameters:
 - name: IsPRBuild
   type: boolean
   default: false
+# Optional gate wiring used by the PR pipeline to short-circuit when no
+# dev/Templates files changed. Defaults preserve official-pipeline behavior.
+- name: dependsOn
+  type: object
+  default: []
+- name: condition
+  type: string
+  default: ''
 
 stages:
 - stage: DotnetNewTemplates_Build
   displayName: 'Build and pack dotnet new templates'
-  dependsOn: []
+  dependsOn: ${{ parameters.dependsOn }}
+  ${{ if ne(parameters.condition, '') }}:
+    condition: ${{ parameters.condition }}
   jobs:
   - job: PackDotnetNewTemplates
     displayName: 'Pack dotnet new template NuGet'

build/AzurePipelinesTemplates/WindowsAppSDK-DotnetNewTemplates-Test-Stage.yml

@@ -26,12 +26,27 @@ parameters:
 - name: dotnetSdkVersion
   type: string
   default: '8.0.x'
+- name: WindowsAppSdkVersion
+  type: string
+  default: '*'
+# Optional gate wiring used by the PR pipeline to short-circuit when no
+# dev/Templates files changed. Defaults preserve official-pipeline behavior.
+- name: dependsOn
+  type: object
+  default: []
+- name: condition
+  type: string
+  default: ''
 
 stages:
 - stage: DotnetNewTemplates_Test
   displayName: 'Smoke-test dotnet new templates'
   dependsOn:
   - ${{ parameters.dependsOnStage }}
+  - ${{ each s in parameters.dependsOn }}:
+    - ${{ s }}
+  ${{ if ne(parameters.condition, '') }}:
+    condition: ${{ parameters.condition }}
   jobs:
   - job: TestDotnetNewTemplates
     displayName: 'Scaffold and build dotnet new templates'
@@ -71,4 +86,9 @@ stages:
           & '$(Build.SourcesDirectory)\${{ parameters.sourceSubdirectory }}\dev\Templates\Dotnet\Test-DotnetNewTemplates.ps1' `
             -PackagePath $package.FullName `
             -Platforms $platforms `
+            -WindowsAppSdkVersion '${{ parameters.WindowsAppSdkVersion }}' `
             -SkipAppLaunch
+      env:
+        # Lets the smoke test read the latest official WindowsAppSDK version from
+        # the package source when the version is '*'.
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)

build/AzurePipelinesTemplates/WindowsAppSDK-VSIXTemplates-BuildValidation-Stage.yml

@@ -23,11 +23,21 @@ parameters:
   type: object
   default:
     type: windows
+# Optional gate wiring used by the PR pipeline to short-circuit when no
+# dev/Templates files changed. Defaults preserve official-pipeline behavior.
+- name: dependsOn
+  type: object
+  default: []
+- name: condition
+  type: string
+  default: ''
 
 stages:
 - stage: VSIXTemplates_BuildValidation
   displayName: 'Validate VSIX templates build'
-  dependsOn: []
+  dependsOn: ${{ parameters.dependsOn }}
+  ${{ if ne(parameters.condition, '') }}:
+    condition: ${{ parameters.condition }}
   jobs:
   - job: BuildVSIX
     displayName: 'Restore + build WindowsAppSDK.Extension.sln (Standalone + Component)'
@@ -74,6 +84,7 @@ stages:
         runStaticAnalysis: false
         PublishSymbols: false
         UseCurrentBuild: false
+        UseLatestNightlyFromBranch: true
         IsOfficial: false
         OptionalVSIXVersion: '$(OptionalVSIXVersion)'
 

build/CopyFilesToStagingDir.ps1

@@ -231,6 +231,7 @@ PublishFile $FullBuildOutput\WindowsAppRuntime_UniversalBGTaskDLL\Microsoft.Wind
 # Common Auto-Initializer Files
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\WindowsAppRuntimeAutoInitializer.cpp $NugetDir\include
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\WindowsAppRuntimeAutoInitializer.cs $NugetDir\include
+PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\WindowsAppRuntimeBaseDirectoryAutoInitializer.cs $NugetDir\include
 #
 # Bootstrap Auto-Initializer Files
 PublishFile $FullBuildOutput\WindowsAppRuntime_BootstrapDLL\MddBootstrapAutoInitializer.cpp $NugetDir\include

build/NuSpecs/AppxManifest.xml

@@ -46,6 +46,10 @@
         <ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.DynamicDependency.PackageDependencyContext" ThreadingModel="both" />
         <ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.DynamicDependency.PackageDependencyRank" ThreadingModel="both" />
 
+        <!-- Package -->
+        <ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.Package" ThreadingModel="both" />
+        <ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.PackageGraph" ThreadingModel="both" />
+
         <!-- WinAppSDK Deployment -->
         <ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.WindowsAppRuntime.DeploymentManager" ThreadingModel="both" />
         <ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.WindowsAppRuntime.DeploymentResult" ThreadingModel="both" />

build/NuSpecs/Microsoft.WindowsAppSDK.AutoInitializer.CS.targets

@@ -6,13 +6,18 @@
       <DefineConstants Condition="'$(WindowsAppSdkBootstrapInitialize)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_BOOTSTRAP</DefineConstants>
       <DefineConstants Condition="'$(WindowsAppSdkDeploymentManagerInitialize)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_DEPLOYMENTMANAGER</DefineConstants>
       <DefineConstants Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitialize)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_UNDOCKEDREGFREEWINRT</DefineConstants>
+      <!-- The resource base directory (%MICROSOFT_WINDOWSAPPRUNTIME_BASE_DIRECTORY%, used by the app
+           manifest's SxS DLL redirection and by MRTCore) is published for self-contained apps. It shares
+           the self-contained trigger with undocked reg-free WinRT initialization. See issue #5987. -->
+      <DefineConstants Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitialize)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_BASEDIRECTORY</DefineConstants>
       <DefineConstants Condition="'$(WindowsAppSdkCompatibilityInitialize)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_COMPATIBILITY</DefineConstants>
   </PropertyGroup>
 
   <!-- "BeforeCompile" is used here to ensure this happens at the same time as possible codegen from WindowsAppSdkCompatibilitySetterTarget -->
   <Target Name="WindowsAppRuntimeAutoInitializer" BeforeTargets="BeforeCompile">
     <ItemGroup>
         <Compile Include="$(MSBuildThisFileDirectory)..\include\WindowsAppRuntimeAutoInitializer.cs" />
+        <Compile Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitialize)'=='true'" Include="$(MSBuildThisFileDirectory)..\include\WindowsAppRuntimeBaseDirectoryAutoInitializer.cs" />
     </ItemGroup>
   </Target>
 

build/WindowsAppSDK-Templates-PR.yml

@@ -6,17 +6,22 @@
 # published. PR-stamped versions keep PR artifacts from colliding with
 # canonical packages -- see each stage for the exact format.
 #
-# Triggers are configured in the Azure DevOps UI (Edit pipeline -> Triggers),
-# NOT in this YAML -- matches the WindowsAppSDK-Foundation-PR.yml convention.
-# In the UI, under Pull request validation:
-#   - Override the YAML pull request trigger from here: ON
-#   - Enable pull request validation:                   ON
-#   - Branch filters:  Include refs/heads/main
-#                      Include refs/heads/release/*
-#   - Path filters:    Include dev/Templates/**
+# Triggered via the existing "/azp run" comment, same as TransportPackage-Foundation-PR.
+# Stays its own independent pipeline; "/azp run" just fans out to every PR-enabled
+# pipeline. To be a required GitHub check, it must report on EVERY PR -- so there is
+# NO path filter. Instead the EvaluateTemplatesPaths gate below diffs against the PR
+# target branch and, when nothing under dev/Templates/** changed, skips the heavy
+# build/test/VSIX stages and reports a fast success. Configure only branch filters
+# (refs/heads/main, refs/heads/release/*) in the ADO UI; do NOT add a path filter.
 
 trigger: none
 
+parameters:
+- name: WindowsAppSDKVersion
+  displayName: 'WindowsAppSDK version for template validation (* = latest stable)'
+  type: string
+  default: '*'
+
 # Shared variable templates:
 #   - Foundation-TestConfig: test matrices reused from the main pipeline.
 #   - Versions: MajorVersion / MinorVersion / PatchVersion (consumed by CommonVariables).
@@ -85,6 +90,58 @@ extends:
         enabled: false
 
     stages:
+      # Gate: only do real work when this PR touched dev/Templates/**. Diffs against
+      # the PR target branch; manual/non-PR runs default to true so they still build.
+      # The downstream stages condition on this output, so non-Templates PRs get a
+      # fast success and the required check is always reported.
+      - stage: EvaluateTemplatesPaths
+        displayName: 'Detect dev/Templates changes'
+        dependsOn: []
+        jobs:
+          - job: Evaluate
+            pool:
+              type: windows
+            variables:
+              ob_outputDirectory: '$(Build.ArtifactStagingDirectory)\evaluate'
+            steps:
+              - checkout: self
+                fetchDepth: 0
+              - task: PowerShell@2
+                name: detect
+                displayName: 'Detect dev/Templates changes'
+                inputs:
+                  targetType: inline
+                  workingDirectory: '$(Build.SourcesDirectory)'
+                  script: |
+                    # The repo is checked out under a WindowsAppSDK subfolder
+                    # (1ES convention, matching the other Templates stages which
+                    # all reference $(Build.SourcesDirectory)\WindowsAppSDK). The
+                    # task cwd is not the repo root, so point git at it with -C.
+                    #
+                    # git writes normal progress (e.g. "From https://github.com/...")
+                    # to stderr even on success, so keep ErrorActionPreference at
+                    # Continue -- otherwise that stderr becomes a terminating
+                    # NativeCommandError. Fail-fast is enforced via $LASTEXITCODE +
+                    # throw, so a real git failure still turns the gate red.
+                    $ErrorActionPreference = 'Continue'
+                    $repo = Join-Path $env:BUILD_SOURCESDIRECTORY 'WindowsAppSDK'
+                    Write-Host "Using repo: $repo"
+
+                    # Non-PR runs (manual queue) build everything.
+                    $changed = 'True'
+                    if ($env:BUILD_REASON -eq 'PullRequest') {
+                      $target = $env:SYSTEM_PULLREQUEST_TARGETBRANCH
+                      $fetchOut = git -C $repo fetch --no-tags origin $target 2>&1
+                      if ($LASTEXITCODE -ne 0) { throw "git fetch failed (exit $LASTEXITCODE) for target '$target': $fetchOut" }
+                      $files = git -C $repo diff --name-only FETCH_HEAD HEAD 2>&1
+                      if ($LASTEXITCODE -ne 0) { throw "git diff failed (exit $LASTEXITCODE): $files" }
+                      $hit = $files | Where-Object { $_ -like 'dev/Templates/*' }
+                      $changed = if ($hit) { 'True' } else { 'False' }
+                    }
+                    Write-Host "templatesChanged=$changed"
+                    Write-Host "##vso[task.setvariable variable=templatesChanged;isOutput=true]$changed"
+                    exit 0
+
       # Build + pack the templates NuGet. IsPRBuild=true makes the stage stamp
       # every pack as <csproj-Version>-<yyyy>-<MMdd>-<HHmm>-pr<PR# or 0> so the
       # .nupkg filename uniquely identifies the run (manual replays without a
@@ -96,18 +153,25 @@ extends:
           publishToInternalFeed: false
           SignOutput: false
           IsPRBuild: true
+          dependsOn: [EvaluateTemplatesPaths]
+          condition: eq(dependencies.EvaluateTemplatesPaths.outputs['Evaluate.detect.templatesChanged'], 'True')
 
       # Smoke-test: scaffold every template from the pack and dotnet build each.
       - template: AzurePipelinesTemplates\WindowsAppSDK-DotnetNewTemplates-Test-Stage.yml@self
         parameters:
           pool:
             type: windows
           dependsOnStage: 'DotnetNewTemplates_Build'
+          dependsOn: [EvaluateTemplatesPaths]
+          condition: eq(dependencies.EvaluateTemplatesPaths.outputs['Evaluate.detect.templatesChanged'], 'True')
+          WindowsAppSdkVersion: ${{ parameters.WindowsAppSDKVersion }}
 
       # Build-validate the VSIX. Runs the production VSIX pack steps so
       # VSIX-pack regressions (e.g. VSSDK1300 path overflow) surface at PR
       # time. See WindowsAppSDK-VSIXTemplates-BuildValidation-Stage.yml.
       - template: AzurePipelinesTemplates\WindowsAppSDK-VSIXTemplates-BuildValidation-Stage.yml@self
         parameters:
           pool:
-            type: windows
+            type: windows
+          dependsOn: [EvaluateTemplatesPaths]
+          condition: eq(dependencies.EvaluateTemplatesPaths.outputs['Evaluate.detect.templatesChanged'], 'True')

dev/ApplicationData/UnpackagedApplicationData.cpp

@@ -168,7 +168,7 @@ namespace winrt::Microsoft::Windows::Storage::implementation
 
         wil::unique_hkey currentUserKey;
         THROW_IF_WIN32_ERROR(::RegOpenCurrentUser(KEY_READ | KEY_WRITE, currentUserKey.put()));
-        auto subKey{ std::format(L"SOFTWARE\\{}\\{}", m_publisher, m_product) };
+        auto subKey{ std::format(L"SOFTWARE\\Classes\\Local Settings\\SOFTWARE\\{}\\{}", m_publisher, m_product) };
         auto key{ wil::reg::create_shared_key(currentUserKey.get(), subKey.c_str(), wil::reg::key_access::readwrite) };
         return winrt::make<UnpackagedApplicationDataContainer>(
             std::move(key), winrt::hstring{}, winrt::Microsoft::Windows::Storage::ApplicationDataLocality::Local);
@@ -223,7 +223,7 @@ namespace winrt::Microsoft::Windows::Storage::implementation
         {
             wil::unique_hkey currentUserKey;
             THROW_IF_WIN32_ERROR(::RegOpenCurrentUser(KEY_READ | KEY_WRITE, currentUserKey.put()));
-            auto subKey{ std::format(L"SOFTWARE\\{}\\{}", publisher, product) };
+            auto subKey{ std::format(L"SOFTWARE\\Classes\\Local Settings\\SOFTWARE\\{}\\{}", publisher, product) };
             const auto hr{ HRESULT_FROM_WIN32(::RegDeleteTreeW(currentUserKey.get(), subKey.c_str())) };
             if (hr != HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) && hr != HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND))
             {