ci: frick

Fixes #2527

build/pipelines/release.yml

@@ -37,4 +37,19 @@ jobs:
 
   - template: ./templates/check-formatting.yml
 
-  - template: ./templates/release-sign-and-bundle.yml
+  - deployment: PackageSign
+    displayName: "Package and Sign for release"
+    pool:
+      name: Package ES Standard Build
+    dependsOn:
+      - Buildx64AuditMode
+      - Buildx64Release
+      - Buildx86Release
+      - Buildarm64Release
+      - CodeFormatCheck
+    environment: store-release
+    strategy: 
+      runOnce:
+        deploy:
+          steps:
+            - template: ./templates/release-sign-and-bundle.yml

build/pipelines/templates/build-console-audit-job.yml

@@ -31,16 +31,6 @@ jobs:
       restoreSolution: OpenConsole.sln
       restoreDirectory: '$(Build.SourcesDirectory)\packages'
 
-  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-    displayName: 'NuGet restore packages for CI'
-    inputs:
-      command: restore
-      restoreSolution: build/.nuget/packages.config
-      feedsToUse: config
-      externalFeedCredentials: 'TAEF NuGet Feed'
-      nugetConfigPath: build/config/NuGet.config
-      restoreDirectory: '$(Build.SourcesDirectory)/packages'
-
   - task: VSBuild@1
     displayName: 'Build solution **\OpenConsole.sln'
     inputs:

build/pipelines/templates/build-console-int.yml

@@ -11,7 +11,7 @@ jobs:
     BuildPlatform: ${{ parameters.platform }}
 
   pool:
-    name: Package ES Lab E
+    name: Package ES Standard Build
     demands:
     - msbuild
     - visualstudio

build/pipelines/templates/build-console-steps.yml

@@ -25,16 +25,6 @@ steps:
     restoreSolution: OpenConsole.sln
     restoreDirectory: '$(Build.SourcesDirectory)\packages'
 
-- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-  displayName: 'NuGet restore packages for CI'
-  inputs:
-    command: restore
-    restoreSolution: build/.nuget/packages.config
-    feedsToUse: config
-    externalFeedCredentials: 'TAEF NuGet Feed'
-    nugetConfigPath: build/config/NuGet.config
-    restoreDirectory: '$(Build.SourcesDirectory)/packages'
-
 - task: VSBuild@1
   displayName: 'Build solution **\OpenConsole.sln'
   inputs:

build/pipelines/templates/release-sign-and-bundle.yml

@@ -1,74 +1,43 @@
-parameters:
-  configuration: 'Release'
+steps:
+- checkout: self
+  clean: true
 
-jobs:
-- job: SignDeploy${{ parameters.configuration }}
-  displayName: Sign and Deploy for ${{ parameters.configuration }}
+- task: PkgESSetupBuild@10
+  displayName: 'Package ES - Setup Build'
+  inputs:
+    useDfs: false
+    productName: WindowsTerminal
+    disableOutputRedirect: true
 
-  dependsOn:
-    - Buildx64AuditMode
-    - Buildx64Release
-    - Buildx86Release
-    - Buildarm64Release
-    - CodeFormatCheck
-  condition: |
-    and
-    (
-      in(dependencies.Buildx64AuditMode.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
-      in(dependencies.Buildx64Release.result,   'Succeeded', 'SucceededWithIssues', 'Skipped'),
-      in(dependencies.Buildx86Release.result,   'Succeeded', 'SucceededWithIssues', 'Skipped'),
-      in(dependencies.Buildarm64Release.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
-      in(dependencies.CodeFormatCheck.result,   'Succeeded', 'SucceededWithIssues', 'Skipped')
-    )
+- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+  displayName: 'Component Detection'
 
-  variables:
-    BuildConfiguration: ${{ parameters.configuration }}
-    AppxProjectName: CascadiaPackage
-    AppxBundleName: Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle
+- task: DownloadBuildArtifacts@0
+  displayName: Download AppX artifacts
+  inputs:
+    artifactName: 'appx-$(BuildConfiguration)'
+    itemPattern: |
+      **/*.appx
+      **/*.msix
+    downloadPath: '$(Build.ArtifactStagingDirectory)\appx'
 
-  pool:
-    name: Package ES Lab E
+- task: PowerShell@2
+  displayName: 'Create $(AppxBundleName)'
+  inputs:
+    targetType: filePath
+    filePath: '.\build\scripts\Create-AppxBundle.ps1'
+    arguments: |
+      -InputPath "$(Build.ArtifactStagingDirectory)\appx" -ProjectName $(AppxProjectName) -BundleVersion 0.0.0.0 -OutputPath "$(Build.ArtifactStagingDirectory)\$(AppxBundleName)"
 
-  steps:
-  - checkout: self
-    clean: true
+- task: PkgESCodeSign@10
+  displayName: 'Package ES - SignConfig.WindowsTerminal.xml'
+  inputs:
+    signConfigXml: 'build\config\SignConfig.WindowsTerminal.xml'
+    inPathRoot: '$(Build.ArtifactStagingDirectory)'
+    outPathRoot: '$(Build.ArtifactStagingDirectory)\signed'
 
-  - task: PkgESSetupBuild@10
-    displayName: 'Package ES - Setup Build'
-    inputs:
-      useDfs: false
-      productName: WindowsTerminal
-      disableOutputRedirect: true
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-
-  - task: DownloadBuildArtifacts@0
-    displayName: Download AppX artifacts
-    inputs:
-      artifactName: 'appx-$(BuildConfiguration)'
-      itemPattern: |
-        **/*.appx
-        **/*.msix
-      downloadPath: '$(Build.ArtifactStagingDirectory)\appx'
-
-  - task: PowerShell@2
-    displayName: 'Create $(AppxBundleName)'
-    inputs:
-      targetType: filePath
-      filePath: '.\build\scripts\Create-AppxBundle.ps1'
-      arguments: |
-        -InputPath "$(Build.ArtifactStagingDirectory)\appx" -ProjectName $(AppxProjectName) -BundleVersion 0.0.0.0 -OutputPath "$(Build.ArtifactStagingDirectory)\$(AppxBundleName)"
-
-  - task: PkgESCodeSign@10
-    displayName: 'Package ES - SignConfig.WindowsTerminal.xml'
-    inputs:
-      signConfigXml: 'build\config\SignConfig.WindowsTerminal.xml'
-      inPathRoot: '$(Build.ArtifactStagingDirectory)'
-      outPathRoot: '$(Build.ArtifactStagingDirectory)\signed'
-
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish Signed AppX'
-    inputs:
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)\signed'
-      ArtifactName: 'appxbundle-signed-$(BuildConfiguration)'
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish Signed AppX'
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)\signed'
+    ArtifactName: 'appxbundle-signed-$(BuildConfiguration)'

src/cascadia/TerminalConnection/ConhostConnection.cpp

@@ -81,17 +81,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             extraEnvVars.emplace(L"WT_SESSION", pwszGuid);
         }
 
-        // Create our own output handling thread
-        // Each connection needs to make sure to drain the output from its backing host.
-        _hOutputThread.reset(CreateThread(nullptr,
-                                          0,
-                                          StaticOutputThreadProc,
-                                          this,
-                                          0,
-                                          nullptr));
-
-        THROW_LAST_ERROR_IF_NULL(_hOutputThread);
-
         STARTUPINFO si = { 0 };
         si.cb = sizeof(STARTUPINFOW);
 
@@ -119,6 +108,18 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                          si,
                          extraEnvVars));
 
+        // Create our own output handling thread
+        // This must be done after the pipes are populated.
+        // Each connection needs to make sure to drain the output from its backing host.
+        _hOutputThread.reset(CreateThread(nullptr,
+                                          0,
+                                          StaticOutputThreadProc,
+                                          this,
+                                          0,
+                                          nullptr));
+
+        THROW_LAST_ERROR_IF_NULL(_hOutputThread);
+
         _connected = true;
     }