fix: deterministic family ordering (current first, legacy last)
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
parent
eade6e2542
commit
129410793a
1 changed files with 15 additions and 24 deletions
|
|
@ -94,14 +94,10 @@ cscript "C:\Program Files\Microsoft Office\Office16\ospp.vbs" /act</code></pre>
|
|||
Click any key to copy.
|
||||
</p>
|
||||
|
||||
{{ $byFamily := dict }}
|
||||
{{ range $windows }}
|
||||
{{ $f := .family }}
|
||||
{{ $arr := index $byFamily $f | default slice }}
|
||||
{{ $arr = $arr | append . }}
|
||||
{{ $byFamily = merge $byFamily (dict $f $arr) }}
|
||||
{{ end }}
|
||||
{{ range $family, $items := $byFamily }}
|
||||
{{ $order := slice "Windows 11 / 10" "Windows LTSC" "Legacy desktop" }}
|
||||
{{ range $family := $order }}
|
||||
{{ $items := where $windows "family" $family }}
|
||||
{{ if $items }}
|
||||
<h3 class="family-head">{{ $family }}</h3>
|
||||
<table class="key-table">
|
||||
<thead><tr><th>Edition</th><th>GVLK</th><th class="notes-col">Notes</th></tr></thead>
|
||||
|
|
@ -116,6 +112,7 @@ cscript "C:\Program Files\Microsoft Office\Office16\ospp.vbs" /act</code></pre>
|
|||
</tbody>
|
||||
</table>
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
<details class="card">
|
||||
<summary>How to use a GVLK on Windows</summary>
|
||||
|
|
@ -132,14 +129,10 @@ slmgr /dlv :: verify (look for "LICENSED")<
|
|||
<h2>Windows Server</h2>
|
||||
<p class="muted">Server SKUs need only 5 unique clients to satisfy the KMS activation count threshold (vs. 25 for desktop).</p>
|
||||
|
||||
{{ $byFamily := dict }}
|
||||
{{ range $servers }}
|
||||
{{ $f := .family }}
|
||||
{{ $arr := index $byFamily $f | default slice }}
|
||||
{{ $arr = $arr | append . }}
|
||||
{{ $byFamily = merge $byFamily (dict $f $arr) }}
|
||||
{{ end }}
|
||||
{{ range $family, $items := $byFamily }}
|
||||
{{ $serverOrder := slice "Windows Server 2025" "Windows Server 2022" "Windows Server 2019" "Windows Server 2016" "Windows Server 2012 R2" "Windows Server 2012" "Windows Server 2008 R2" "Windows Server 2008" }}
|
||||
{{ range $family := $serverOrder }}
|
||||
{{ $items := where $servers "family" $family }}
|
||||
{{ if $items }}
|
||||
<h3 class="family-head">{{ $family }}</h3>
|
||||
<table class="key-table">
|
||||
<thead><tr><th>Edition</th><th>GVLK</th><th class="notes-col">Notes</th></tr></thead>
|
||||
|
|
@ -154,6 +147,7 @@ slmgr /dlv :: verify (look for "LICENSED")<
|
|||
</tbody>
|
||||
</table>
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
</section>
|
||||
|
||||
<section id="office">
|
||||
|
|
@ -165,14 +159,10 @@ slmgr /dlv :: verify (look for "LICENSED")<
|
|||
<code>ospp.vbs /unpkey:<LAST5></code> + <code>/inpkey:<GVLK></code> and <code>/act</code>.
|
||||
</p>
|
||||
|
||||
{{ $byFamily := dict }}
|
||||
{{ range $office }}
|
||||
{{ $f := .family }}
|
||||
{{ $arr := index $byFamily $f | default slice }}
|
||||
{{ $arr = $arr | append . }}
|
||||
{{ $byFamily = merge $byFamily (dict $f $arr) }}
|
||||
{{ end }}
|
||||
{{ range $family, $items := $byFamily }}
|
||||
{{ $officeOrder := slice "Office LTSC 2024" "Office LTSC 2021" "Office 2019" "Office 2016" }}
|
||||
{{ range $family := $officeOrder }}
|
||||
{{ $items := where $office "family" $family }}
|
||||
{{ if $items }}
|
||||
<h3 class="family-head">{{ $family }}</h3>
|
||||
<table class="key-table">
|
||||
<thead><tr><th>Edition</th><th>Product ID</th><th>GVLK</th><th class="notes-col">Channel</th></tr></thead>
|
||||
|
|
@ -188,6 +178,7 @@ slmgr /dlv :: verify (look for "LICENSED")<
|
|||
</tbody>
|
||||
</table>
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
<details class="card">
|
||||
<summary>Sample Configuration.xml — Office Pro Plus 2024 + Project Pro 2024</summary>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue