-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into dev/lhecker/8000-Text…
…Buffer-reflow
- Loading branch information
Showing
59 changed files
with
640 additions
and
505 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ clickable | |
| clig | ||
| CMMI | ||
| copyable | ||
| Counterintuitively | ||
| CtrlDToClose | ||
| cybersecurity | ||
| dalet | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -226,6 +226,7 @@ Vcpp | |
| Viewbox | ||
| virtualalloc | ||
| vsnwprintf | ||
| wcsnlen | ||
| wcsstr | ||
| wcstoui | ||
| WDJ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <AppInstaller | ||
| xmlns="http://schemas.microsoft.com/appx/appinstaller/2017/2" | ||
| Version="1.0.0.0" | ||
| Uri="$$ROOT$$$$NAME$$.appinstaller"> | ||
|
|
||
| <MainBundle | ||
| Name="$$NAME$$" | ||
| Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" | ||
| Version="$$VERSION$$" | ||
| Uri="$$ROOT$$$$PACKAGE$$" /> | ||
|
|
||
| <Dependencies> | ||
| <Package | ||
| Name="Microsoft.UI.Xaml.2.8" | ||
| Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" | ||
| Version="8.2305.5001.0" | ||
| ProcessorArchitecture="x64" | ||
| Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.4/Microsoft.UI.Xaml.2.8.x64.appx" /> | ||
| <Package | ||
| Name="Microsoft.UI.Xaml.2.8" | ||
| Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" | ||
| Version="8.2305.5001.0" | ||
| ProcessorArchitecture="x86" | ||
| Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.4/Microsoft.UI.Xaml.2.8.x86.appx" /> | ||
| <Package | ||
| Name="Microsoft.UI.Xaml.2.8" | ||
| Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" | ||
| Version="8.2305.5001.0" | ||
| ProcessorArchitecture="arm64" | ||
| Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.4/Microsoft.UI.Xaml.2.8.arm64.appx" /> | ||
| </Dependencies> | ||
|
|
||
| <UpdateSettings> | ||
| <OnLaunch | ||
| HoursBetweenUpdateChecks="6" /> | ||
| </UpdateSettings> | ||
| </AppInstaller> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
build/pipelines/templates-v2/job-deploy-to-azure-storage.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| parameters: | ||
| - name: buildConfiguration | ||
| type: string | ||
| - name: pool | ||
| type: object | ||
| default: [] | ||
| - name: dependsOn | ||
| type: object | ||
| default: null | ||
| - name: artifactStem | ||
| type: string | ||
| default: '' | ||
| - name: variables | ||
| type: object | ||
| default: {} | ||
| - name: environment | ||
| type: string | ||
| - name: storagePublicRootURL | ||
| type: string | ||
| - name: subscription | ||
| type: string | ||
| - name: storageAccount | ||
| type: string | ||
| - name: storageContainer | ||
| type: string | ||
|
|
||
| jobs: | ||
| - deployment: DeployAzure | ||
| ${{ if ne(length(parameters.pool), 0) }}: | ||
| pool: ${{ parameters.pool }} | ||
| displayName: Publish to Azure Storage (Prod) | ||
| dependsOn: ${{ parameters.dependsOn }} | ||
| variables: | ||
| ${{ insert }}: ${{ parameters.variables }} | ||
| environment: ${{ parameters.environment }} | ||
| strategy: | ||
| runOnce: | ||
| deploy: | ||
| steps: | ||
| - download: none | ||
|
|
||
| - checkout: self | ||
| clean: true | ||
| fetchDepth: 1 | ||
| fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here | ||
| submodules: true | ||
| persistCredentials: True | ||
|
|
||
| - task: DownloadPipelineArtifact@2 | ||
| displayName: Download MSIX Bundle Artifact | ||
| inputs: | ||
| artifactName: appxbundle-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }} | ||
| downloadPath: '$(Build.SourcesDirectory)/_out' | ||
| itemPattern: '**/*.msixbundle' | ||
|
|
||
| - pwsh: |- | ||
| $b = Get-Item _out/*.msixbundle | ||
| ./build/scripts/New-AppInstallerFromTemplateAndBundle.ps1 -BundlePath $b.FullName -AppInstallerTemplatePath ./build/config/template.appinstaller -AppInstallerRoot "${{ parameters.storagePublicRootURL }}" -OutputPath _out/Microsoft.WindowsTerminalCanary.appinstaller | ||
| displayName: "Produce AppInstaller for MSIX bundle" | ||
| - task: AzureFileCopy@5 | ||
| displayName: Publish to Storage Account | ||
| inputs: | ||
| sourcePath: _out/* | ||
| Destination: AzureBlob | ||
| azureSubscription: ${{ parameters.subscription }} | ||
| storage: ${{ parameters.storageAccount }} | ||
| ContainerName: ${{ parameters.storageContainer }} | ||
| AdditionalArgumentsForBlobCopy: "--content-type application/octet-stream" | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| [CmdletBinding()] | ||
| Param( | ||
| [Parameter(Mandatory, | ||
| HelpMessage="Path to the .msixbundle")] | ||
| [string] | ||
| $BundlePath, | ||
|
|
||
| [Parameter(Mandatory, | ||
| HelpMessage="Path to the .appinstaller template")] | ||
| [string] | ||
| $AppInstallerTemplatePath, | ||
|
|
||
| [string] | ||
| $AppInstallerRoot, | ||
|
|
||
| [Parameter(Mandatory, | ||
| HelpMessage="Output Path")] | ||
| [string] | ||
| $OutputPath | ||
| ) | ||
|
|
||
| $ErrorActionPreference = "Stop" | ||
|
|
||
| $sentinelFile = New-TemporaryFile | ||
| $directory = New-Item -Type Directory "$($sentinelFile.FullName)_Package" | ||
| Remove-Item $sentinelFile -Force -EA:Ignore | ||
|
|
||
| $bundle = (Get-Item $BundlePath) | ||
| & tar.exe -x -f $bundle.FullName -C $directory AppxMetadata/AppxBundleManifest.xml | ||
|
|
||
| $xml = [xml](Get-Content (Join-Path $directory "AppxMetadata\AppxBundleManifest.xml")) | ||
| $name = $xml.Bundle.Identity.Name | ||
| $version = $xml.Bundle.Identity.Version | ||
|
|
||
| $doc = (Get-Content -ReadCount 0 $AppInstallerTemplatePath) | ||
| $doc = $doc -Replace '\$\$ROOT\$\$',$AppInstallerRoot | ||
| $doc = $doc -Replace '\$\$NAME\$\$',$name | ||
| $doc = $doc -Replace '\$\$VERSION\$\$',$version | ||
| $doc = $doc -Replace '\$\$PACKAGE\$\$',$bundle.Name | ||
| $doc | Out-File -Encoding utf8NoBOM $OutputPath | ||
|
|
||
| Get-Item $OutputPath |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.