Skip to content

Begin adding fonts to YamlCreate #325757

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

Merged
denelon merged 3 commits into from
Dec 23, 2025
Merged

Begin adding fonts to YamlCreate #325757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90fdd0c
Begin adding fonts to YamlCreate
Trenly Dec 22, 2025
384d12d
Add Font Support
Trenly Dec 22, 2025
fdd3ba0
Remove bad comment
Trenly Dec 22, 2025
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
2 changes: 1 addition & 1 deletion Tools/Modules/YamlCreate/YamlCreate.InstallerDetection/YamlCreate.InstallerDetection.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ function Resolve-InstallerType {
)

# Ordering is important here due to the specificity achievable by each of the detection methods
# if (Test-IsFont -Path $Path) { return 'font' } # Font detection is not implemented yet
if (Test-IsFont -Path $Path) { return 'font' }
if (Test-IsWix -Path $Path) { return 'wix' }
if (Test-IsMsi -Path $Path) { return 'msi' }
if (Test-IsMsix -Path $Path) { return 'msix' }
Expand Down
92 changes: 85 additions & 7 deletions Tools/YamlCreate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ if ($Settings) {
exit
}

$ScriptHeader = '# Created with YamlCreate.ps1 v2.5.0'
$ScriptHeader = '# Created with YamlCreate.ps1 v2.6.0'
$ManifestVersion = '1.10.0'
$PSDefaultParameterValues = @{ '*:Encoding' = 'UTF8' }
$Utf8NoBomEncoding = New-Object System.Text.UTF8Encoding $False
Expand Down Expand Up @@ -273,11 +273,18 @@ $useDirectSchemaLink = if ($env:GITHUB_ACTIONS -eq $true) {
} else {
(Invoke-WebRequest "https://aka.ms/winget-manifest.version.$ManifestVersion.schema.json" -UseBasicParsing).Content -match '<!doctype html>'
}

if ($ManifestVersion -ne 'latest') {
$FullManifestVersion = "v$ManifestVersion"
} else {
$FullManifestVersion = $ManifestVersion
}

$SchemaUrls = @{
version = if ($useDirectSchemaLink) { "https://raw.githubusercontent.com/microsoft/winget-cli/master/schemas/JSON/manifests/v$ManifestVersion/manifest.version.$ManifestVersion.json" } else { "https://aka.ms/winget-manifest.version.$ManifestVersion.schema.json" }
defaultLocale = if ($useDirectSchemaLink) { "https://raw.githubusercontent.com/microsoft/winget-cli/master/schemas/JSON/manifests/v$ManifestVersion/manifest.defaultLocale.$ManifestVersion.json" } else { "https://aka.ms/winget-manifest.defaultLocale.$ManifestVersion.schema.json" }
locale = if ($useDirectSchemaLink) { "https://raw.githubusercontent.com/microsoft/winget-cli/master/schemas/JSON/manifests/v$ManifestVersion/manifest.locale.$ManifestVersion.json" } else { "https://aka.ms/winget-manifest.locale.$ManifestVersion.schema.json" }
installer = if ($useDirectSchemaLink) { "https://raw.githubusercontent.com/microsoft/winget-cli/master/schemas/JSON/manifests/v$ManifestVersion/manifest.installer.$ManifestVersion.json" } else { "https://aka.ms/winget-manifest.installer.$ManifestVersion.schema.json" }
version = if ($useDirectSchemaLink) { "https://raw.githubusercontent.com/microsoft/winget-cli/master/schemas/JSON/manifests/$FullManifestVersion/manifest.version.$ManifestVersion.json" } else { "https://aka.ms/winget-manifest.version.$ManifestVersion.schema.json" }
defaultLocale = if ($useDirectSchemaLink) { "https://raw.githubusercontent.com/microsoft/winget-cli/master/schemas/JSON/manifests/$FullManifestVersion/manifest.defaultLocale.$ManifestVersion.json" } else { "https://aka.ms/winget-manifest.defaultLocale.$ManifestVersion.schema.json" }
locale = if ($useDirectSchemaLink) { "https://raw.githubusercontent.com/microsoft/winget-cli/master/schemas/JSON/manifests/$FullManifestVersion/manifest.locale.$ManifestVersion.json" } else { "https://aka.ms/winget-manifest.locale.$ManifestVersion.schema.json" }
installer = if ($useDirectSchemaLink) { "https://raw.githubusercontent.com/microsoft/winget-cli/master/schemas/JSON/manifests/$FullManifestVersion/manifest.installer.$ManifestVersion.json" } else { "https://aka.ms/winget-manifest.installer.$ManifestVersion.schema.json" }
}

# Fetch Schema data from github for entry validation, key ordering, and automatic commenting
Expand All @@ -292,6 +299,13 @@ try {
$InstallerEntryProperties = (ConvertTo-Yaml $InstallerSchema.definitions.Installer.properties | ConvertFrom-Yaml -Ordered).Keys
$InstallerDependencyProperties = (ConvertTo-Yaml $InstallerSchema.definitions.Dependencies.properties | ConvertFrom-Yaml -Ordered).Keys
$AppsAndFeaturesEntryProperties = (ConvertTo-Yaml $InstallerSchema.definitions.AppsAndFeaturesEntry.properties | ConvertFrom-Yaml -Ordered).Keys

# Update the manifest version in case `latest` was specified
$ManifestVersion = $VersionSchema.properties.ManifestVersion.default
# Update the schema URLs to reflect the correct version for use in the manifest header
@($SchemaUrls.Keys) | ForEach-Object {
$SchemaUrls[$_] = "https://aka.ms/winget-manifest.$_.$ManifestVersion.schema.json"
}
} catch {
# Here we want to pass the exception as an inner exception for debugging if necessary
throw [System.Net.WebException]::new('Manifest schemas could not be downloaded. Try running the script again', $_.Exception)
Expand Down Expand Up @@ -851,6 +865,22 @@ Function Read-NestedInstaller {
}
}
}

if ($_EffectiveType -eq 'font') {
# Prompt to see if multiple entries are needed
$_menu = @{
entries = @(
'[Y] Yes'
'*[N] No'
)
Prompt = 'Do you want to create another font entry?'
DefaultString = 'N'
}
switch ( Invoke-KeypressMenu -Prompt $_menu['Prompt'] -Entries $_menu['Entries'] -DefaultString $_menu['DefaultString']) {
'Y' { $AnotherNestedInstaller = $true }
default { $AnotherNestedInstaller = $false }
}
}
$_NestedInstallerFiles += $_InstallerFile
} until (!$AnotherNestedInstaller)
$_Installer['NestedInstallerFiles'] = $_NestedInstallerFiles
Expand Down Expand Up @@ -1307,6 +1337,11 @@ Function Read-InstallerEntry {
if ($AnotherInstaller -eq '0') {
Write-Host; Read-InstallerEntry
}

# If the app folder is in manifests and the installer type is font, change the app folder to point at fonts
if ($script:AppFolder -match 'manifests' -and (Get-EffectiveInstallerType $_Installer) -eq 'font') {
$script:AppFolder = $script:AppFolder -replace 'manifests', 'fonts'
}
}

# Prompts user for Installer Values using the `Quick Update` Method
Expand Down Expand Up @@ -2435,6 +2470,13 @@ if (Test-Path -Path "$PSScriptRoot\..\manifests") {
$ManifestsFolder = (Resolve-Path '.\').Path
}

# Set the root folder where new font manifests should be created
if (Test-Path -Path "$PSScriptRoot\..\fonts") {
$FontsFolder = (Resolve-Path "$PSScriptRoot\..\fonts").Path
} else {
$FontsFolder = (Resolve-Path '.\').Path
}

# Initialize the return value to be a success
$script:_returnValue = [ReturnValue]::new(200)

Expand Down Expand Up @@ -2695,13 +2737,45 @@ if ($ScriptSettings.ContinueWithExistingPRs -ne 'always' -and $script:Option -ne

# Set the folder for the specific package and version
$script:AppFolder = Join-Path $ManifestsFolder -ChildPath $PackageIdentifier.ToLower().Chars(0) | Join-Path -ChildPath $PackageIdentifierFolder | Join-Path -ChildPath $PackageVersion
$script:FontFolder = Join-Path $FontsFolder -ChildPath $PackageIdentifier.ToLower().Chars(0) | Join-Path -ChildPath $PackageIdentifierFolder | Join-Path -ChildPath $PackageVersion

# Attempt to see if the old package exists in the manifests folder, font folder, or both
$script:DestinationFolder = $null;
if (Test-Path -Path (Split-Path $script:AppFolder)) {
$script:DestinationFolder = $script:AppFolder
}
if (Test-Path -Path (Split-Path $script:FontFolder)) {
if ($script:DestinationFolder) {
$script:DestinationFolder = @($script:DestinationFolder; $script:FontFolder)
} else {
$script:DestinationFolder = $script:FontFolder
}
}
if ($script:DestinationFolder -and $script:DestinationFolder.Count -gt 1) {
$_menu = @{
entries = @('[1] Manifests Folder'; '[2] Fonts Folder')
Prompt = 'The package exists in both the manifests and fonts folder. Which folder do you want to use?'
DefaultString = '1'
}
switch ( Invoke-KeypressMenu -Prompt $_menu['Prompt'] -Entries $_menu['Entries'] -DefaultString $_menu['DefaultString'] ) {
'1' { $script:AppFolder = $script:AppFolder }
'2' { $script:AppFolder = $script:FontFolder }
}
} elseif ($script:DestinationFolder -and $script:DestinationFolder.Count -eq 1) {
$script:AppFolder = $script:DestinationFolder
}

# If the user selected `NewLocale` or `EditMetadata` the version *MUST* already exist in the folder structure
if ($script:Option -in @('NewLocale'; 'EditMetadata'; 'RemoveManifest')) {
# Try getting the old manifests from the specified folder
if (Test-Path -Path "$AppFolder\..\$PackageVersion") {
$script:OldManifests = Get-ChildItem -Path "$AppFolder\..\$PackageVersion"
$LastVersion = $PackageVersion
} elseif (Test-Path -Path "$FontFolder\..\$PackageVersion") {
$script:OldManifests = Get-ChildItem -Path "$FontFolder\..\$PackageVersion"
$LastVersion = $PackageVersion
# Intentionally override AppFolder here to ensure the rest of the script works as expected
$script:AppFolder = $script:FontFolder
}
# If the old manifests could not be found, request a new version
while (-not ($OldManifests.Name -like "$PackageIdentifier*.yaml")) {
Expand All @@ -2713,17 +2787,21 @@ if ($script:Option -in @('NewLocale'; 'EditMetadata'; 'RemoveManifest')) {
}
if (Test-Path -Path "$AppFolder\..\$PromptVersion") {
$script:OldManifests = Get-ChildItem -Path "$AppFolder\..\$PromptVersion"
$script:AppFolder = Join-Path (Split-Path $AppFolder) -ChildPath $LastVersion
} elseif (Test-Path -Path "$FontFolder\..\$PromptVersion") {
$script:OldManifests = Get-ChildItem -Path "$FontFolder\..\$PromptVersion"
# Intentionally use AppFolder here to ensure the rest of the script works as expected
$script:AppFolder = Join-Path (Split-Path $FontFolder) -ChildPath $LastVersion
}
# If a new version is entered, we need to be sure to update the folder for writing manifests
$LastVersion = $PromptVersion
$script:AppFolder = Join-Path (Split-Path $AppFolder) -ChildPath $LastVersion
$script:PackageVersion = $LastVersion
}
}

# If the user selected `QuickUpdateVersion`, the old manifests must exist
# If the user selected `New`, the old manifest type is specified as none
if (-not (Test-Path -Path "$AppFolder\..")) {
if (-not (Test-Path -Path "$AppFolder\..") -and -not (Test-Path -Path "$FontFolder\..")) {
if ($script:Option -in @('QuickUpdateVersion', 'Auto')) {
Write-Host -ForegroundColor Red 'This option requires manifest of previous version of the package. If you want to create a new package, please select Option 1.'
Invoke-CleanExit
Expand Down