Use StoreAppPublish-Preview explicitly

daxian-dbw · jshigetomi · commit 873db35125c7 · 2025-10-03T17:33:30.000-05:00
Use BuildSources.Directory instead of reporoot

Add powershell

use sbConfigPath

Add variable group store publish variables

Use spaces in name

Change the AppStoreName locID

Output the PDP and config file

Temporarily disable signing

Use AppStore Xpath

Use namespace xml

Use AppID

Upload SBLog.txt on failure

Try powershell private

Remove AppID addition
diff --git a/.pipelines/store/SBConfig.json b/.pipelines/store/SBConfig.json
@@ -4,7 +4,9 @@
   "packageParameters": {
     "PDPRootPath": "",
     "Release": "",
-    "PDPInclude": [],
+    "PDPInclude": [
+      "PDP.xml"
+    ],
     "PDPExclude": [],
     "LanguageExclude": [
       "default",
@@ -21,7 +23,7 @@
   },
   "appSubmission": {
     "productId": "",
-    "targetPublishMode": "NotSet",
+    "targetPublishMode": "Immediate",
     "targetPublishDate": null,
     "visibility": "NotSet",
     "pricing": {
diff --git a/.pipelines/templates/channelSelection.yml b/.pipelines/templates/channelSelection.yml
@@ -1,7 +1,7 @@
 steps:
 - pwsh: |
     # Determine LTS, Preview, or Stable
-    $metadata = Get-Content "$repoRoot/tools/metadata.json" -Raw | ConvertFrom-Json
+    $metadata = Get-Content "$(Build.SourcesDirectory)/PowerShell/tools/metadata.json" -Raw | ConvertFrom-Json
     $LTS = $metadata.LTSRelease.Latest
     $Stable = $metadata.StableRelease.Latest
     $isPreview = '$(OutputReleaseTag.releaseTag)' -match '-'
diff --git a/.pipelines/templates/package-create-msix.yml b/.pipelines/templates/package-create-msix.yml
@@ -93,13 +93,13 @@ jobs:
       displayName: Create MsixBundle
       retryCountOnTaskFailure: 1
 
-    - task: onebranch.pipeline.signing@1
-      displayName: Sign MsixBundle
-      inputs:
-        command: 'sign'
-        signing_profile: $(MSIXProfile)
-        files_to_sign: '**/*.msixbundle'
-        search_root: '$(BundleDir)'
+    # - task: onebranch.pipeline.signing@1
+    #   displayName: Sign MsixBundle
+    #   inputs:
+    #     command: 'sign'
+    #     signing_profile: $(MSIXProfile)
+    #     files_to_sign: '**/*.msixbundle'
+    #     search_root: '$(BundleDir)'
     
     - pwsh: |
         $signedBundle = Get-ChildItem -Path $(BundleDir) -Filter "*.msixbundle" -File
@@ -137,16 +137,19 @@ jobs:
           'LTS' = @{
             AppStoreName = 'PowerShell-LTS'
             ProductId = '$(productId-LTS)'
+            AppId = '$(AppID-LTS)'
             ServiceEndpoint = "StoreAppPublish-Stable"
           }
           'Stable' = @{
             AppStoreName = 'PowerShell'
             ProductId = '$(productId-Stable)'
+            AppId = '$(AppID-Stable)'
             ServiceEndpoint = "StoreAppPublish-Stable"
           }
           'Preview' = @{
             AppStoreName = 'PowerShell (Preview)'
             ProductId = '$(productId-Preview)'
+            AppId = '$(AppID-Preview)'
             ServiceEndpoint = "StoreAppPublish-Preview"
           }
         }
@@ -171,16 +174,21 @@ jobs:
 
           [xml]$pdpXml = Get-Content $pdpPath -Raw
 
-          $appStoreNameElement = $pdpXml.SelectSingleNode("//AppStoreName[@_locID]")
+          # Create namespace manager for XML with default namespace
+          $nsManager = New-Object System.Xml.XmlNamespaceManager($pdpXml.NameTable)
+          $nsManager.AddNamespace("pd", "http://schemas.microsoft.com/appx/2012/ProductDescription")
+          
+          $appStoreNameElement = $pdpXml.SelectSingleNode("//pd:AppStoreName", $nsManager)
           if ($appStoreNameElement) {
-            $appStoreNameElement.InnerText = $config.AppStoreName
-            Write-Verbose -Verbose "Updated AppStoreName to: $($config.AppStoreName)"
+            $appStoreNameElement.SetAttribute("_locID", $config.AppStoreName)
+            Write-Verbose -Verbose "Updated AppStoreName _locID to: $($config.AppStoreName)"
           } else {
             Write-Warning "AppStoreName element not found in PDP file"
           }
 
           $pdpXml.Save($pdpPath)
           Write-Verbose -Verbose "PDP file updated successfully"
+          Get-Content -Path $pdpPath | Write-Verbose -Verbose
         } else {
           Write-Error "PDP file not found: $pdpPath"
           exit 1
@@ -198,27 +206,34 @@ jobs:
 
           $sbConfigJson | ConvertTo-Json -Depth 100 | Set-Content $sbConfigPath -Encoding UTF8
           Write-Verbose -Verbose "SBConfig file updated successfully"
+          Get-Content -Path $sbConfigPath | Write-Verbose -Verbose
         } else {
           Write-Error "SBConfig file not found: $sbConfigPath"
           exit 1
         }
 
         Write-Host "##vso[task.setvariable variable=ServiceConnection]$($config.ServiceEndpoint)"
-        Write-Host "##vso[task.setvariable variable=SBConfigPath]$($config.SBConfigPath)"
+        Write-Host "##vso[task.setvariable variable=SBConfigPath]$($sbConfigPath)"
       name: UpdateConfigs
       displayName: Update PDPs and SBConfig.json
 
     - task: MS-RDX-MRO.windows-store-publish.package-task.store-package@3
       displayName: 'Create StoreBroker Package'
       inputs:
-        serviceEndpoint: '$(ServiceConnection)'
+        serviceEndpoint: 'StoreAppPublish-Private'
         sbConfigPath: '$(SBConfigPath)'
         sourceFolder: '$(BundleDir)'
         contents: '*.msixBundle'
         outSBName: 'PowerShellStorePackage'
         pdpPath: '$(System.DefaultWorkingDirectory)/PowerShell/.pipelines/store/PDP/PDP'
         pdpMediaPath: '$(System.DefaultWorkingDirectory)/PowerShell/.pipelines/store/PDP/PDP-Media'
 
+    - pwsh: |
+        Get-Item -Path "$(System.DefaultWorkingDirectory)/SBLog.txt" -ErrorAction SilentlyContinue |
+          Copy-Item -Destination "$(ob_outputDirectory)" -Verbose
+      displayName: Upload Store Failure Log
+      condition: failed()
+
     - pwsh: |
         $submissionPackageDir = "$(System.DefaultWorkingDirectory)/SBOutDir"
         $jsonFile = "$submissionPackageDir/PowerShellStorePackage.json"
