Compare commits
5 commits
main
...
dev/duhowe
Author | SHA1 | Date | |
---|---|---|---|
93f35a5a39 | |||
ff6945c66d | |||
a214fe77b6 | |||
d816fd43fb | |||
7bda725d18 |
|
@ -37,4 +37,19 @@ jobs:
|
||||||
|
|
||||||
- template: ./templates/check-formatting.yml
|
- 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
|
||||||
|
|
|
@ -31,16 +31,6 @@ jobs:
|
||||||
restoreSolution: OpenConsole.sln
|
restoreSolution: OpenConsole.sln
|
||||||
restoreDirectory: '$(Build.SourcesDirectory)\packages'
|
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
|
- task: VSBuild@1
|
||||||
displayName: 'Build solution **\OpenConsole.sln'
|
displayName: 'Build solution **\OpenConsole.sln'
|
||||||
inputs:
|
inputs:
|
||||||
|
|
|
@ -11,7 +11,7 @@ jobs:
|
||||||
BuildPlatform: ${{ parameters.platform }}
|
BuildPlatform: ${{ parameters.platform }}
|
||||||
|
|
||||||
pool:
|
pool:
|
||||||
name: Package ES Lab E
|
name: Package ES Standard Build
|
||||||
demands:
|
demands:
|
||||||
- msbuild
|
- msbuild
|
||||||
- visualstudio
|
- visualstudio
|
||||||
|
|
|
@ -25,16 +25,6 @@ steps:
|
||||||
restoreSolution: OpenConsole.sln
|
restoreSolution: OpenConsole.sln
|
||||||
restoreDirectory: '$(Build.SourcesDirectory)\packages'
|
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
|
- task: VSBuild@1
|
||||||
displayName: 'Build solution **\OpenConsole.sln'
|
displayName: 'Build solution **\OpenConsole.sln'
|
||||||
inputs:
|
inputs:
|
||||||
|
|
|
@ -1,74 +1,43 @@
|
||||||
parameters:
|
steps:
|
||||||
configuration: 'Release'
|
- checkout: self
|
||||||
|
clean: true
|
||||||
|
|
||||||
jobs:
|
- task: PkgESSetupBuild@10
|
||||||
- job: SignDeploy${{ parameters.configuration }}
|
displayName: 'Package ES - Setup Build'
|
||||||
displayName: Sign and Deploy for ${{ parameters.configuration }}
|
inputs:
|
||||||
|
useDfs: false
|
||||||
|
productName: WindowsTerminal
|
||||||
|
disableOutputRedirect: true
|
||||||
|
|
||||||
dependsOn:
|
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
|
||||||
- Buildx64AuditMode
|
displayName: 'Component Detection'
|
||||||
- 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')
|
|
||||||
)
|
|
||||||
|
|
||||||
variables:
|
- task: DownloadBuildArtifacts@0
|
||||||
BuildConfiguration: ${{ parameters.configuration }}
|
displayName: Download AppX artifacts
|
||||||
AppxProjectName: CascadiaPackage
|
inputs:
|
||||||
AppxBundleName: Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle
|
artifactName: 'appx-$(BuildConfiguration)'
|
||||||
|
itemPattern: |
|
||||||
|
**/*.appx
|
||||||
|
**/*.msix
|
||||||
|
downloadPath: '$(Build.ArtifactStagingDirectory)\appx'
|
||||||
|
|
||||||
pool:
|
- task: PowerShell@2
|
||||||
name: Package ES Lab E
|
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:
|
- task: PkgESCodeSign@10
|
||||||
- checkout: self
|
displayName: 'Package ES - SignConfig.WindowsTerminal.xml'
|
||||||
clean: true
|
inputs:
|
||||||
|
signConfigXml: 'build\config\SignConfig.WindowsTerminal.xml'
|
||||||
|
inPathRoot: '$(Build.ArtifactStagingDirectory)'
|
||||||
|
outPathRoot: '$(Build.ArtifactStagingDirectory)\signed'
|
||||||
|
|
||||||
- task: PkgESSetupBuild@10
|
- task: PublishBuildArtifacts@1
|
||||||
displayName: 'Package ES - Setup Build'
|
displayName: 'Publish Signed AppX'
|
||||||
inputs:
|
inputs:
|
||||||
useDfs: false
|
PathtoPublish: '$(Build.ArtifactStagingDirectory)\signed'
|
||||||
productName: WindowsTerminal
|
ArtifactName: 'appxbundle-signed-$(BuildConfiguration)'
|
||||||
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)'
|
|
||||||
|
|
|
@ -81,17 +81,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
|
||||||
extraEnvVars.emplace(L"WT_SESSION", pwszGuid);
|
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 };
|
STARTUPINFO si = { 0 };
|
||||||
si.cb = sizeof(STARTUPINFOW);
|
si.cb = sizeof(STARTUPINFOW);
|
||||||
|
|
||||||
|
@ -119,6 +108,18 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
|
||||||
si,
|
si,
|
||||||
extraEnvVars));
|
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;
|
_connected = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue