WinUI templates for dotnet new and VSIX

.gitignore

@@ -204,6 +204,8 @@ PublishScripts/
 *.nupkg
 # NuGet Symbol Packages
 *.snupkg
+# Visual Studio Extension build output (source files are *.vsixmanifest, not affected)
+*.vsix
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.

BuildAll.ps1

@@ -1,4 +1,4 @@
-<#
+<#
 This script is to build the Foundation transport package that will be used to generate the windows app sdk package.
 This script is called from BuildAll.ps1 from the aggregator repo and should not be called directly.
 
@@ -113,7 +113,7 @@ Try {
     .\tools\GenerateDynamicDependencyOverrides.ps1 -Path "$buildOverridePath"
     .\tools\GeneratePushNotificationsOverrides.ps1 -Path "$buildOverridePath"
 
-    if ($AzureBuildStep -ne "all")
+    if ($AzureBuildStep -ne "all" -and $AzureBuildStep -ne "BuildTemplates")
     {
         # Some builds have "-branchname" appended, but when this happens the environment variable
         # TFS_BUILDNUMBER has the un-modified version.
@@ -601,6 +601,50 @@ Try {
             exit 1
         }
     }
+    if (($AzureBuildStep -eq "all") -Or ($AzureBuildStep -eq "BuildTemplates"))
+    {
+        #------------------
+        #    Build WinUI template artifacts:
+        #      - dotnet-new NuGet (Microsoft.WindowsAppSDK.WinUI.CSharp.Templates.*.nupkg)
+        #      - templates VSIX  (Standalone + Component, x C# + C++ = 4 .vsix)
+        #
+        #    All artifacts land in <repo>\localpackages\ so a single dev workflow
+        #    (the docs, the csproj's <PackageOutputPath> default, the NuGet.config
+        #    "localpackages" feed, and Test-DotnetNewTemplates.ps1) all agree on
+        #    one path. .vsix files coexist fine; NuGet only sees *.nupkg.
+        #------------------
+        $templatesOutputDir = Join-Path $env:Build_SourcesDirectory "localpackages"
+        if (-not (Test-Path $templatesOutputDir))
+        {
+            New-Item -ItemType Directory -Path $templatesOutputDir -Force | Out-Null
+        }
+
+        write-host "Packing dotnet-new templates (Microsoft.WindowsAppSDK.WinUI.CSharp.Templates) ..."
+        & dotnet pack "dev\Templates\Dotnet\WinAppSdk.CSharp.DotnetNewTemplates.csproj" `
+            --configuration $Configuration `
+            --output $templatesOutputDir
+        if ($lastexitcode -ne 0)
+        {
+            write-host "ERROR: dotnet pack WinAppSdk.CSharp.DotnetNewTemplates.csproj FAILED."
+            exit 1
+        }
+
+        # Templates VSIX (Standalone + Component, matching CI). The
+        # Microsoft.WindowsAppSDK version used for restore comes from
+        # dev\Templates\Directory.Build.props (<WindowsAppSdkVersion> default)
+        # - single source of truth.
+        write-host "Building templates VSIX (Standalone + Component) ..."
+        & "dev\Templates\VSIX\build-local-VSIX-package\Build-VSIX.ps1" `
+            -Configuration $Configuration `
+            -Deployment   Both `
+            -RepoRoot     $env:Build_SourcesDirectory `
+            -OutputDir    $templatesOutputDir
+        if ($lastexitcode -ne 0)
+        {
+            write-host "ERROR: Build-VSIX.ps1 FAILED."
+            exit 1
+        }
+    }
     $files = Get-ChildItem $OutputDirectory -File -Filter "*.nupkg"
     foreach ($file in $files)
     {

build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml

@@ -90,15 +90,15 @@ steps:
 - task: VSBuild@1
   displayName: 'Restore WindowsAppSDK.Extension.sln'
   inputs:
-    solution: $(FoundationRepoPath)dev\VSIX\WindowsAppSDK.Extension.sln
+    solution: $(FoundationRepoPath)dev\Templates\VSIX\WindowsAppSDK.Extension.sln
     platform: 'Any CPU'
     configuration: '$(buildConfiguration)'
     msBuildArgs: '/t:restore /p:OptionalVSIXVersion="${{ parameters.OptionalVSIXVersion }}" /p:WindowsAppSDKVersion="$(WindowsAppSDKPackageVersion)" /p:RestoreAdditionalProjectSources="$(System.ArtifactsDirectory)" /p:EnableExperimentalVSIXFeatures="${{ parameters.EnableExperimentalVSIXFeatures }}" /binaryLogger:$(ob_outputDirectory)\binlogs\StandaloneVSIX.restore.binlog'
 
 - task: VSBuild@1
   displayName: 'Build Standalone WindowsAppSDK.Extension.sln'
   inputs:
-    solution: $(FoundationRepoPath)dev\VSIX\WindowsAppSDK.Extension.sln
+    solution: $(FoundationRepoPath)dev\Templates\VSIX\WindowsAppSDK.Extension.sln
     platform: 'Any CPU'
     configuration: '$(buildConfiguration)'
     msBuildArgs: '/p:OptionalVSIXVersion="${{ parameters.OptionalVSIXVersion }}" /p:WindowsAppSDKVersion="$(WindowsAppSDKPackageVersion)" /p:EnableExperimentalVSIXFeatures="${{ parameters.EnableExperimentalVSIXFeatures }}" /binaryLogger:$(ob_outputDirectory)\binlogs\StandaloneVSIX.build.binlog'
@@ -124,15 +124,15 @@ steps:
 - task: VSBuild@1
   displayName: 'Restore Component WindowsAppSDK.Extension.sln'
   inputs:
-    solution: $(FoundationRepoPath)dev\VSIX\WindowsAppSDK.Extension.sln
+    solution: $(FoundationRepoPath)dev\Templates\VSIX\WindowsAppSDK.Extension.sln
     platform: 'Any CPU'
     configuration: '$(buildConfiguration)'
     msBuildArgs: '/t:restore /p:OptionalVSIXVersion="${{ parameters.OptionalVSIXVersion }}" /p:WindowsAppSDKVersion="$(WindowsAppSDKPackageVersion)" /p:RestoreAdditionalProjectSources="$(System.ArtifactsDirectory)" /p:EnableExperimentalVSIXFeatures="${{ parameters.EnableExperimentalVSIXFeatures }}" /binaryLogger:$(ob_outputDirectory)\binlogs\ComponentVSIX.restore.binlog' 
 
 - task: VSBuild@1
   displayName: 'Build Component WindowsAppSDK.Extension.sln'
   inputs:
-    solution: $(FoundationRepoPath)dev\VSIX\WindowsAppSDK.Extension.sln
+    solution: $(FoundationRepoPath)dev\Templates\VSIX\WindowsAppSDK.Extension.sln
     platform: 'Any CPU'
     configuration: '$(buildConfiguration)'
     msBuildArgs: '/restore /p:OptionalVSIXVersion="${{ parameters.OptionalVSIXVersion }}" /p:WindowsAppSDKVersion="$(WindowsAppSDKPackageVersion)" /p:EnableExperimentalVSIXFeatures="${{ parameters.EnableExperimentalVSIXFeatures }}" /p:Deployment="Component" /binaryLogger:$(ob_outputDirectory)\binlogs\ComponentVSIX.build.binlog'
@@ -165,7 +165,7 @@ steps:
   - task: CopyFiles@2
     displayName: 'Stage unsigned VSIX files for publishing'
     inputs:
-      SourceFolder: '$(FoundationRepoPath)dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)'
+      SourceFolder: '$(FoundationRepoPath)dev\Templates\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)'
       Contents: '**/WindowsAppSDK.*.vsix'
       flattenFolders: true
       TargetFolder: '$(ob_outputDirectory)\VSIX'
@@ -174,7 +174,7 @@ steps:
   - task: CopyFiles@2
     displayName: 'Stage unsigned VSIX files for signing'
     inputs:
-      SourceFolder: '$(FoundationRepoPath)dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)'
+      SourceFolder: '$(FoundationRepoPath)dev\Templates\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)'
       Contents: '**/WindowsAppSDK.*.vsix'
       flattenFolders: true
       TargetFolder: '$(Agent.TempDirectory)/UnsignedVSIX'
@@ -195,37 +195,37 @@ steps:
 
 - template: ${{variables['System.DefaultWorkingDirectory']}}\AzurePipelinesTemplates\WindowsAppSDK-PublishSymbol-Steps.yml@WindowsAppSDKConfig
   parameters:
-    SearchPattern: '$(FoundationRepoPath)dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)\**\WindowsAppSDK*.pdb'
+    SearchPattern: '$(FoundationRepoPath)dev\Templates\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)\**\WindowsAppSDK*.pdb'
     IsOfficial: ${{ parameters.IsOfficial }}
 
 - task: CopyFiles@2
   displayName: 'Stage VSIX component JSONs'
   inputs:
-    SourceFolder: '$(FoundationRepoPath)dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)'
+    SourceFolder: '$(FoundationRepoPath)dev\Templates\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)'
     Contents: '**/WindowsAppSDK*.pdb'
     flattenFolders: true
     TargetFolder: '$(ob_outputDirectory)\symbols'
 
 - task: CopyFiles@2
   displayName: 'Stage VSIX component JSONs'
   inputs:
-    SourceFolder: '$(FoundationRepoPath)dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)'
+    SourceFolder: '$(FoundationRepoPath)dev\Templates\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)'
     Contents: '**/WindowsAppSDK.*.Component.json'
     flattenFolders: true
     TargetFolder: '$(ob_outputDirectory)'
 
 - task: CopyFiles@2
   displayName: 'Stage VSIX manifest'
   inputs:
-    SourceFolder: '$(FoundationRepoPath)dev\VSIX'
+    SourceFolder: '$(FoundationRepoPath)dev\Templates\VSIX'
     Contents: 'extension.manifest.json'
     flattenFolders: true
     TargetFolder: '$(ob_outputDirectory)'
 
 - task: CopyFiles@2
   displayName: 'Stage VSIX overview markdown'
   inputs:
-    SourceFolder: '$(FoundationRepoPath)dev\VSIX'
+    SourceFolder: '$(FoundationRepoPath)dev\Templates\VSIX'
     Contents: 'overview.md'
     flattenFolders: true
     TargetFolder: '$(ob_outputDirectory)'

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

@@ -0,0 +1,53 @@
+parameters:
+- name: pool
+  type: object
+  default:
+    vmImage: 'windows-latest'
+- name: dependsOnStage
+  type: string
+  default: 'DotnetNewTemplates_Build'
+
+stages:
+- stage: DotnetNewTemplates_Publish
+  displayName: 'Publish dotnet new templates to NuGet.org'
+  dependsOn:
+  - ${{ parameters.dependsOnStage }}
+  jobs:
+  - job: PublishNuGetOrg
+    displayName: 'Publish dotnet new template pack to NuGet.org'
+    pool: ${{ parameters.pool }}
+    variables:
+      ob_outputDirectory: '$(Pipeline.Workspace)\drop_DotnetNewTemplates_Build_PackDotnetNewTemplates'
+      ob_artifactBaseName: 'dotnet-new-template-pack'
+      dotnetTemplatesArtifactPath: '$(Pipeline.Workspace)\drop_DotnetNewTemplates_Build_PackDotnetNewTemplates'
+    steps:
+    - checkout: self
+
+    - download: current
+      displayName: 'Download dotnet new template pack artifact'
+      artifact: 'drop_DotnetNewTemplates_Build_PackDotnetNewTemplates'
+
+    - task: PowerShell@2
+      displayName: 'Verify dotnet new template pack artifact exists'
+      inputs:
+        targetType: inline
+        script: |
+          $artifactPath = '$(dotnetTemplatesArtifactPath)'
+          if (-not (Test-Path $artifactPath)) {
+            throw "Expected artifact directory '$artifactPath' was not found in the downloaded drop artifact."
+          }
+          $packages = Get-ChildItem -Path $artifactPath -Filter *.nupkg -File -Recurse
+          if (-not $packages) {
+            throw "No .nupkg files were found under '$artifactPath'."
+          }
+          Write-Host "Found the following packages ready for publish:"
+          $packages | ForEach-Object { Write-Host " - $($_.FullName)" }
+
+    - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+      displayName: 'Publish dotnet new templates to NuGet.org'
+      inputs:
+        command: 'push'
+        packagesToPush: '$(dotnetTemplatesArtifactPath)\*.nupkg'
+        verbosityPush: 'Detailed'
+        nuGetFeedType: 'external'
+        publishFeedCredentials: 'NugetOrg'

build/AzurePipelinesTemplates/WindowsAppSDK-DotnetNewTemplates-Stages.yml

@@ -0,0 +1,113 @@
+parameters:
+- name: pool
+  type: object
+  default:
+    vmImage: 'windows-latest'
+- name: sourceSubdirectory
+  type: string
+  default: 'WindowsAppSDK'
+- name: publishToInternalFeed
+  type: boolean
+  default: true
+- name: SignOutput
+  type: boolean
+  default: false
+
+stages:
+- stage: DotnetNewTemplates_Build
+  displayName: 'Build and pack dotnet new templates'
+  dependsOn: []
+  jobs:
+  - job: PackDotnetNewTemplates
+    displayName: 'Pack dotnet new template NuGet'
+    dependsOn: []
+    pool: ${{ parameters.pool }}
+    variables:
+      ob_outputDirectory: '$(Build.ArtifactStagingDirectory)\dotnet-new-template-pack'
+      templateProjectDir: '$(Build.SourcesDirectory)\${{ parameters.sourceSubdirectory }}\dev\Templates\Dotnet'
+    steps:
+    - checkout: self
+
+    - task: PowerShell@2
+      displayName: 'Ensure test certificate for signing'
+      inputs:
+        targetType: inline
+        workingDirectory: '$(Build.SourcesDirectory)\${{ parameters.sourceSubdirectory }}'
+        script: |
+          $repoRoot = "$(Build.SourcesDirectory)\${{ parameters.sourceSubdirectory }}"
+          $userDir = Join-Path $repoRoot '.user'
+          $pfxPath = Join-Path $userDir 'winappsdk.certificate.test.pfx'
+          $pwdPath = Join-Path $userDir 'winappsdk.certificate.test.pwd'
+
+          if (-not (Test-Path $userDir)) {
+            New-Item -ItemType Directory -Path $userDir | Out-Null
+          }
+
+          if ((Test-Path $pfxPath) -and (Test-Path $pwdPath)) {
+            Write-Host "Test certificate already exists at $pfxPath"
+          }
+          else {
+            $password = [Guid]::NewGuid().ToString()
+            $securePwd = ConvertTo-SecureString -String $password -Force -AsPlainText
+            $subject = 'CN=WindowsAppSDK Test Certificate'
+            $cert = New-SelfSignedCertificate -Type CodeSigningCert -Subject $subject -KeyExportPolicy Exportable -KeyAlgorithm RSA -KeyLength 2048 -CertStoreLocation 'Cert:\CurrentUser\My'
+            Export-PfxCertificate -Cert $cert -FilePath $pfxPath -Password $securePwd | Out-Null
+            Set-Content -Path $pwdPath -Value $password -NoNewline
+            Write-Host "Created test certificate at $pfxPath"
+          }
+
+    - task: UseDotNet@2
+      displayName: 'Use .NET SDK'
+      inputs:
+        packageType: sdk
+        version: '8.0.x'
+
+    - task: PowerShell@2
+      displayName: 'Verify template csproj exists before restore'
+      inputs:
+        targetType: inline
+        workingDirectory: '$(templateProjectDir)'
+        script: |
+          Write-Host "Current directory: $(Get-Location)"
+          $projectPath = Join-Path (Get-Location) 'WinAppSdk.CSharp.DotnetNewTemplates.csproj'
+          if (-not (Test-Path $projectPath)) {
+            throw "Template project missing at $projectPath"
+          }
+          Write-Host "Confirmed template project at $projectPath"
+
+    - task: DotNetCoreCLI@2
+      displayName: 'Restore template project'
+      inputs:
+        command: 'restore'
+        projects: '$(templateProjectDir)\WinAppSdk.CSharp.DotnetNewTemplates.csproj'
+        workingDirectory: '$(templateProjectDir)'
+
+    - task: DotNetCoreCLI@2
+      displayName: 'Pack dotnet new templates'
+      inputs:
+        command: 'pack'
+        packagesToPack: '$(templateProjectDir)\WinAppSdk.CSharp.DotnetNewTemplates.csproj'
+        arguments: '--configuration Release --no-restore --no-build /p:WindowsAppSDKBuildPipeline=1'
+        outputDir: '$(ob_outputDirectory)'
+        workingDirectory: '$(templateProjectDir)'
+
+    - ${{ if eq(parameters.SignOutput, true) }}:
+      - template: AzurePipelinesTemplates/WindowsAppSDK-EsrpCodeSigning-Steps.yml@WindowsAppSDKConfig
+        parameters:
+          FolderPath: '$(ob_outputDirectory)'
+          Pattern: '*.nupkg'
+          KeyCode: 'CP-401405'
+          UseMinimatch: true
+
+    - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+      displayName: 'Publish dotnet template pack to internal feed'
+      condition: and(succeeded(), eq('${{ parameters.publishToInternalFeed }}', 'true'))
+      inputs:
+        command: 'push'
+        packagesToPush: '$(ob_outputDirectory)\*.nupkg'
+        verbosityPush: 'Detailed'
+        nuGetFeedType: 'internal'
+        publishVstsFeed: 'ProjectReunion/Project.Reunion.nuget.internal'
+        allowPackageConflicts: true
+
+