Skip to content

Winget manifest uploader #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Winget manifest uploader #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@
"vscode-nmake-tools.workspaceBuildDirectories": [
"."
],
"azure-pipelines.1ESPipelineTemplatesSchemaFile": true
"azure-pipelines.1ESPipelineTemplatesSchemaFile": true,
"powershell.codeFormatting.preset": "OTBS"
}
112 changes: 67 additions & 45 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

param(
[switch]$Release,
[ValidateSet('current','aarch64-pc-windows-msvc','x86_64-pc-windows-msvc','aarch64-apple-darwin','x86_64-apple-darwin','aarch64-unknown-linux-gnu','aarch64-unknown-linux-musl','x86_64-unknown-linux-gnu','x86_64-unknown-linux-musl')]
[ValidateSet('current', 'aarch64-pc-windows-msvc', 'x86_64-pc-windows-msvc', 'aarch64-apple-darwin', 'x86_64-apple-darwin', 'aarch64-unknown-linux-gnu', 'aarch64-unknown-linux-musl', 'x86_64-unknown-linux-gnu', 'x86_64-unknown-linux-musl')]
$architecture = 'current',
[switch]$Clippy,
[switch]$SkipBuild,
[ValidateSet('msix','msix-private','msixbundle','tgz','zip')]
[ValidateSet('msix', 'msix-private', 'msixbundle', 'tgz', 'zip')]
$packageType,
[switch]$Test,
[switch]$GetPackageVersion,
Expand All @@ -16,7 +16,9 @@ param(
[switch]$UseCratesIO,
[switch]$UpdateLockFile,
[switch]$Audit,
[switch]$UseCFSAuth
[switch]$UseCFSAuth,
[switch]$SubmitWinGetManifest,
[string]$GitToken
)

if ($GetPackageVersion) {
Expand Down Expand Up @@ -110,8 +112,7 @@ function Find-LinkExe {
$linkexe = (Get-Location).Path
Write-Verbose -Verbose "Using $linkexe"
$linkexe
}
finally {
} finally {
Pop-Location
}
}
Expand All @@ -131,8 +132,7 @@ if ($null -ne $packageType) {
if (!$IsWindows) {
curl https://sh.rustup.rs -sSf | sh -s -- -y
$env:PATH += ":$env:HOME/.cargo/bin"
}
else {
} else {
Invoke-WebRequest 'https://static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe' -OutFile 'temp:/rustup-init.exe'
Write-Verbose -Verbose "Use the default settings to ensure build works"
& 'temp:/rustup-init.exe' -y
Expand All @@ -150,9 +150,9 @@ if (!$SkipBuild -and !$SkipLinkCheck -and $IsWindows -and !(Get-Command 'link.ex
if (!(Test-Path $BuildToolsPath)) {
Write-Verbose -Verbose "link.exe not found, installing C++ build tools"
Invoke-WebRequest 'https://aka.ms/vs/17/release/vs_BuildTools.exe' -OutFile 'temp:/vs_buildtools.exe'
$arg = @('--passive','--add','Microsoft.VisualStudio.Workload.VCTools','--includerecommended')
$arg = @('--passive', '--add', 'Microsoft.VisualStudio.Workload.VCTools', '--includerecommended')
if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') {
$arg += '--add','Microsoft.VisualStudio.Component.VC.Tools.ARM64'
$arg += '--add', 'Microsoft.VisualStudio.Component.VC.Tools.ARM64'
}
Start-Process -FilePath 'temp:/vs_buildtools.exe' -ArgumentList $arg -Wait
Remove-Item temp:/vs_installer.exe -ErrorAction Ignore
Expand Down Expand Up @@ -182,8 +182,7 @@ $flags = @($Release ? '-r' : $null)
if ($architecture -eq 'current') {
$path = ".\target\$configuration"
$target = Join-Path $PSScriptRoot 'bin' $configuration
}
else {
} else {
& $rustup target add $architecture
$flags += '--target'
$flags += $architecture
Expand Down Expand Up @@ -223,8 +222,7 @@ if (!$SkipBuild) {
$env:CARGO_REGISTRIES_POWERSHELL_TOKEN = $header
$env:CARGO_REGISTRIES_POWERSHELL_CREDENTIAL_PROVIDER = 'cargo:token'
}
}
else {
} else {
Write-Warning "Azure CLI not found, proceeding with anonymous access."
}
}
Expand Down Expand Up @@ -277,8 +275,7 @@ if (!$SkipBuild) {
if ($project -eq 'tree-sitter-dscexpression') {
if ($UpdateLockFile) {
cargo generate-lockfile
}
else {
} else {
if ($Audit) {
if ($null -eq (Get-Command cargo-audit -ErrorAction Ignore)) {
cargo install cargo-audit --features=fix
Expand All @@ -291,26 +288,21 @@ if (!$SkipBuild) {
}
}

if (Test-Path "./Cargo.toml")
{
if (Test-Path "./Cargo.toml") {
if ($Clippy) {
if ($clippy_unclean_projects -contains $project) {
Write-Verbose -Verbose "Skipping clippy for $project"
}
elseif ($pedantic_unclean_projects -contains $project) {
} elseif ($pedantic_unclean_projects -contains $project) {
Write-Verbose -Verbose "Running clippy for $project"
cargo clippy @flags -- -Dwarnings
}
else {
} else {
Write-Verbose -Verbose "Running clippy with pedantic for $project"
cargo clippy @flags --% -- -Dwarnings -Dclippy::pedantic
}
}
else {
} else {
if ($UpdateLockFile) {
cargo generate-lockfile
}
else {
} else {
if ($Audit) {
if ($null -eq (Get-Command cargo-audit -ErrorAction Ignore)) {
cargo install cargo-audit --features=fix
Expand All @@ -333,8 +325,7 @@ if (!$SkipBuild) {

if ($IsWindows) {
Copy-Item "$path/$binary.exe" $target -ErrorAction Ignore
}
else {
} else {
Copy-Item "$path/$binary" $target -ErrorAction Ignore
}

Expand Down Expand Up @@ -386,8 +377,7 @@ if (!$Clippy -and !$SkipBuild) {
$dirSeparator = [System.IO.Path]::DirectorySeparatorChar
if ($Release) {
$oldTarget = $target.Replace($dirSeparator + 'release', $dirSeparator + 'debug')
}
else {
} else {
$oldTarget = $target.Replace($dirSeparator + 'debug', $dirSeparator + 'release')
}
$env:PATH = $env:PATH.Replace($oldTarget, '')
Expand Down Expand Up @@ -426,15 +416,14 @@ if ($Test) {

if ($IsWindows) {
# PSDesiredStateConfiguration module is needed for Microsoft.Windows/WindowsPowerShell adapter
$FullyQualifiedName = @{ModuleName="PSDesiredStateConfiguration";ModuleVersion="2.0.7"}
if (-not(Get-Module -ListAvailable -FullyQualifiedName $FullyQualifiedName))
{
$FullyQualifiedName = @{ModuleName = "PSDesiredStateConfiguration"; ModuleVersion = "2.0.7" }
if (-not(Get-Module -ListAvailable -FullyQualifiedName $FullyQualifiedName)) {
Install-PSResource -Name PSDesiredStateConfiguration -Version 2.0.7 -Repository $repository -TrustRepository
}
}

if (-not(Get-Module -ListAvailable -Name Pester))
{ "Installing module Pester"
if (-not(Get-Module -ListAvailable -Name Pester)) {
"Installing module Pester"
Install-PSResource Pester -WarningAction Ignore -Repository $repository -TrustRepository
}

Expand All @@ -447,8 +436,7 @@ if ($Test) {
Write-Host -ForegroundColor Cyan "Testing $project ..."
try {
Push-Location "$PSScriptRoot/$project"
if (Test-Path "./Cargo.toml")
{
if (Test-Path "./Cargo.toml") {
cargo test

if ($LASTEXITCODE -ne 0) {
Expand Down Expand Up @@ -477,8 +465,8 @@ if ($Test) {
"Updated PSModulePath is:"
$env:PSModulePath

if (-not(Get-Module -ListAvailable -Name Pester))
{ "Installing module Pester"
if (-not(Get-Module -ListAvailable -Name Pester)) {
"Installing module Pester"
$InstallTargetDir = ($env:PSModulePath -split ";")[0]
Find-PSResource -Name 'Pester' -Repository $repository | Save-PSResource -Path $InstallTargetDir -TrustRepository
}
Expand All @@ -496,8 +484,7 @@ function Find-MakeAppx() {
# try to find
if (!$UseX64MakeAppx -and $architecture -eq 'aarch64-pc-windows-msvc') {
$arch = 'arm64'
}
else {
} else {
$arch = 'x64'
}

Expand Down Expand Up @@ -542,8 +529,7 @@ if ($packageType -eq 'msixbundle') {
Write-Verbose -Verbose "Preview version detected"
if ($isPrivate) {
$productName += "-Private"
}
else {
} else {
$productName += "-Preview"
}
# save preview number
Expand All @@ -560,8 +546,7 @@ if ($packageType -eq 'msixbundle') {

if ($isPrivate) {
$displayName += "-Private"
}
else {
} else {
$displayName += "-Preview"
}
}
Expand Down Expand Up @@ -705,4 +690,41 @@ if ($packageType -eq 'msixbundle') {
Write-Host -ForegroundColor Green "`nGz file is created at $gzFile"
}

$env:RUST_BACKTRACE=1
function Submit-DSCWinGetAssets {
param(
[string]$GitToken
)

$project = 'PowerShell/DSC'
# TODO: Package identifier might change in the future
$packageId = 'Microsoft.DSC.Preview'
$restParameters = @{
SslProtocol = 'Tls13'
Headers = @{'X-GitHub-Api-Version' = '2022-11-28' }
}

$assets = (Invoke-RestMethod -uri "https://api.github.com/repos/$Project/releases" -Headers $restParameters)[0].assets # Get the latest version
# Grab the download URLs for supported WinGet
$downloadUrls = $assets.Where({ $_.content_type -in @('application/zip', 'application/octet-stream') }).browser_download_url

if (-not (Get-Command wingetcreate -ErrorAction SilentlyContinue)) {
Invoke-RestMethod https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
}

# TODO: Version number might change in the future
$url = $downloadUrls[0]
if ($url -match 'v(\d+\.\d+\.\d+)-preview\.(\d+)') {
$firstPart = $matches[1].Remove(3) # Remove the last digit
$lastPart = $matches[2] + ".0"
$version = "$firstPart.$lastPart"
}


& wingetcreate.exe update $packageId --version $version --urls $downloadUrls --submit --token $GitToken
}

if ($SubmitWinGetManifest) {
Submit-DSCWinGetAssets -GitToken $GitToken
}

$env:RUST_BACKTRACE = 1