Skip to content

Commit 999e35f

Browse files
nmetulevnmetulev
authored
Merge branch 'main' into hamza/gui-preview
2 parents db57eea + 15dbc49 commit 999e35f

File tree

8 files changed

+436
-399
lines changed

8 files changed

+436
-399
lines changed

‎.github/workflows/build-package.yml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,8 @@ jobs:
6666
name: npm-package
6767
path: artifacts/*.tgz
6868

69-
# - name: Upload MSIX bundle distribution
70-
# uses: actions/upload-artifact@v4
71-
# with:
72-
# name: msix-bundle
73-
# path: artifacts/msix-bundle/
74-
75-
# - name: Upload MSIX layout
76-
# uses: actions/upload-artifact@v4
77-
# with:
78-
# name: msix-layout
79-
# path: artifacts/msix-layout/
69+
- name: Upload MSIX packages
70+
uses: actions/upload-artifact@v4
71+
with:
72+
name: msix-packages
73+
path: artifacts/msix-packages/*.msix

‎.pipelines/release.yml‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -72,34 +72,31 @@ extends:
7272
signingIdentity: ${{ parameters.signingIdentity }}
7373
- task: PowerShell@2
7474
name: SetMeta
75-
displayName: Build + compute versions
75+
displayName: Export version
7676
inputs:
7777
targetType: inline
7878
script: |
7979
# Get version info
8080
$versionJson = Get-Content "version.json" | ConvertFrom-Json
8181
$baseVersion = $versionJson.version
82-
$buildNumber = & ".\scripts\get-build-number.ps1"
83-
$fullVersion = "$baseVersion-prerelease.$buildNumber"
82+
$fullVersion = "$baseVersion"
8483
85-
Write-Host "BaseVersion: $baseVersion"
86-
Write-Host "BuildNumber: $buildNumber"
87-
Write-Host "FullVersion: $fullVersion"
84+
Write-Host "Version: $fullVersion"
8885
89-
# Export as **output variables** for other stages/jobs
9086
Write-Host "##vso[task.setvariable variable=version;isOutput=true]$fullVersion"
91-
Write-Host "##vso[task.setvariable variable=base_version;isOutput=true]$baseVersion"
92-
Write-Host "##vso[task.setvariable variable=build_number;isOutput=true]$buildNumber"
9387
9488
- stage: Release
9589
displayName: Create GitHub Pre-release
9690
dependsOn: Build
9791
variables:
98-
version: $[ stageDependencies.Build.Build.outputs['SetMeta.version'] ]
99-
base_version: $[ stageDependencies.Build.Build.outputs['SetMeta.base_version'] ]
100-
build_number: $[ stageDependencies.Build.Build.outputs['SetMeta.build_number'] ]
92+
version: $[ stageDependencies.Build.Build.outputs['SetMeta.version'] ]
10193
jobs:
10294
- job: create_release
95+
pool:
96+
name: Azure-Pipelines-1ESPT-ExDShared
97+
image: windows-latest
98+
os: windows
99+
hostArchitecture: amd64
103100
displayName: GitHub Pre-release
104101
templateContext:
105102
type: releaseJob
@@ -111,6 +108,9 @@ extends:
111108
- input: pipelineArtifact
112109
artifactName: npm-package
113110
targetPath: $(Pipeline.Workspace)/npm-package
111+
- input: pipelineArtifact
112+
artifactName: msix-packages
113+
targetPath: $(Pipeline.Workspace)/msix-packages
114114
steps:
115115
- task: ArchiveFiles@2
116116
displayName: Archive CLI binaries - x64
@@ -122,7 +122,7 @@ extends:
122122
- task: ArchiveFiles@2
123123
displayName: Archive CLI binaries - arm64
124124
inputs:
125-
rootFolderOrFile: $(Pipeline.Workspace)/cli-binaries/arm64
125+
rootFolderOrFile: $(Pipeline.Workspace)/cli-binaries/win-arm64
126126
includeRootFolder: false
127127
archiveFile: $(Pipeline.Workspace)/winappcli-arm64.zip
128128

@@ -133,13 +133,14 @@ extends:
133133
repositoryName: 'microsoft/winappcli'
134134
action: 'create'
135135
target: '$(Build.SourceVersion)'
136-
tagSource: 'manual'
136+
tagSource: 'userSpecifiedTag'
137137
tag: 'v$(version)'
138138
title: 'Pre-release v$(version)'
139139
isPreRelease: true
140140
assets: |
141141
$(Pipeline.Workspace)/winappcli-x64.zip
142142
$(Pipeline.Workspace)/winappcli-arm64.zip
143+
$(Pipeline.Workspace)/msix-packages/*.msix
143144
$(Pipeline.Workspace)/npm-package/*.tgz
144145
assetUploadMode: 'delete'
145146
addChangeLog: false
@@ -148,8 +149,6 @@ extends:
148149
🚀 **Automated Pre-release Build**
149150
150151
Version: `$(version)`
151-
Base Version: `$(base_version)`
152-
Build Number: `$(build_number)`
153152
Commit: `$(Build.SourceVersion)`
154153
155154
## Installation Options

‎.pipelines/templates/build.yaml‎

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ steps:
1515
inputs:
1616
pwsh: true
1717
filePath: $(System.DefaultWorkingDirectory)\scripts\build-cli.ps1
18-
arguments: '-Stable ${{ parameters.stable }}'
18+
arguments: "-Stable:$${{ parameters.stable }} -SkipMsix"
1919
- ${{ if eq(parameters['DoEsrp'], 'true') }}:
2020
- task: EsrpCodeSigning@5
2121
displayName: Code Sign ESRP - CLI
@@ -55,6 +55,42 @@ steps:
5555
"ToolVersion": "1.0"
5656
}
5757
]
58+
- task: PowerShell@2
59+
displayName: Bundle MSIX Packages
60+
inputs:
61+
pwsh: true
62+
filePath: $(System.DefaultWorkingDirectory)\scripts\package-msix.ps1
63+
arguments: "-Stable:$${{ parameters.stable }}"
64+
- ${{ if eq(parameters['DoEsrp'], 'true') }}:
65+
- task: EsrpCodeSigning@5
66+
displayName: Code Sign ESRP - MSIX Packages
67+
inputs:
68+
ConnectedServiceName: ${{ parameters.signingIdentity.serviceName }}
69+
AppRegistrationClientId: ${{ parameters.signingIdentity.appId }}
70+
AppRegistrationTenantId: ${{ parameters.signingIdentity.tenantId }}
71+
AuthAKVName: ${{ parameters.signingIdentity.akvName }}
72+
AuthCertName: ${{ parameters.signingIdentity.authCertName }}
73+
AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
74+
FolderPath: '$(System.DefaultWorkingDirectory)/artifacts/msix-packages/'
75+
Pattern: '*.msix'
76+
UseMinimatch: true
77+
signConfigType: inlineSignParams
78+
inlineOperation: |
79+
[
80+
{
81+
"KeyCode": "CP-230012",
82+
"OperationCode": "SigntoolSign",
83+
"Parameters": {
84+
"OpusName": "Microsoft Windows Developer SDK CLI",
85+
"OpusInfo": "https://github.com/Microsoft/WinAppCli",
86+
"FileDigest": "/fd \"SHA256\"",
87+
"PageHash": "/PH",
88+
"TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
89+
},
90+
"ToolName": "sign",
91+
"ToolVersion": "1.0"
92+
}
93+
]
5894
- task: CopyFiles@2
5995
displayName: Copy Artifacts - Test Results
6096
inputs:
@@ -87,4 +123,15 @@ steps:
87123
displayName: Upload Artifact - NPM Package
88124
inputs:
89125
path: '$(Build.ArtifactStagingDirectory)/npmpackage'
90-
artifactName: npm-package
126+
artifactName: npm-package
127+
- task: CopyFiles@2
128+
displayName: Copy Artifacts - MSIX packages
129+
inputs:
130+
sourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/msix-packages/'
131+
contents: '*.msix'
132+
targetFolder: '$(Build.ArtifactStagingDirectory)/msix-packages'
133+
- task: 1ES.PublishPipelineArtifact@1
134+
displayName: Upload Artifact - MSIX packages
135+
inputs:
136+
path: '$(Build.ArtifactStagingDirectory)/msix-packages'
137+
artifactName: msix-packages

‎msix/appxmanifest.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414

1515
<Identity
1616
Name="winapp"
17-
Publisher="CN=nikolame"
17+
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
1818
Version="1.0.0.0"
1919
ProcessorArchitecture="x64"/>
2020

2121
<Properties>
22-
<DisplayName>Windows Development CLI (Dev Build)</DisplayName>
23-
<PublisherDisplayName>nikolame</PublisherDisplayName>
22+
<DisplayName>Windows App Development CLI</DisplayName>
23+
<PublisherDisplayName>Microsoft</PublisherDisplayName>
2424
<Logo>Assets\StoreLogo.png</Logo>
2525
</Properties>
2626

2727
<Dependencies>
28-
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.26100.0" />
28+
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19045.0" MaxVersionTested="10.0.26100.0" />
2929
</Dependencies>
3030

3131
<Resources>
@@ -38,7 +38,7 @@
3838
EntryPoint="Windows.FullTrustApplication"
3939
uap10:TrustLevel="mediumIL" >
4040
<uap:VisualElements
41-
DisplayName="Windows Development CLI (Dev Build)"
41+
DisplayName="Windows App Development CLI"
4242
Description="CLI for Windows development related tasks"
4343
BackgroundColor="transparent"
4444
Square150x150Logo="Assets\Square150x150Logo.png"

‎scripts/build-cli.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ param(
2828
[switch]$Clean = $false,
2929
[switch]$SkipTests = $false,
3030
[switch]$FailOnTestFailure = $true,
31-
[switch]$SkipMsix = $true,
31+
[switch]$SkipMsix = $false,
3232
[switch]$Stable = $false
3333
)
3434

@@ -251,9 +251,9 @@ try
251251

252252
$PackageMsixScript = Join-Path $PSScriptRoot "package-msix.ps1"
253253
$CliBinariesPath = Join-Path (Join-Path $ProjectRoot $ArtifactsPath) "cli"
254-
255-
& $PackageMsixScript -CliBinariesPath $CliBinariesPath -Version $MsixVersion
256-
254+
255+
& $PackageMsixScript -CliBinariesPath $CliBinariesPath -Version $MsixVersion -Stable $Stable
256+
257257
if ($LASTEXITCODE -ne 0) {
258258
Write-Warning "MSIX bundle creation failed, but continuing..."
259259
} else {

0 commit comments

Comments
 (0)