Skip to content

Commit d7fa7af

Browse files
committed
feat: v3.1.1 (#27)
1 parent 23c3cfc commit d7fa7af

18 files changed

+151
-278
lines changed

.github/workflows/reusable-package.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@ jobs:
55
package:
66
runs-on: windows-latest
77
steps:
8-
- name: Add msbuild to PATH
9-
uses: microsoft/[email protected]
8+
- name: Install WiX v4
9+
shell: pwsh
10+
run: dotnet tool install --global wix
1011
- uses: actions/checkout@v3
1112
- name: Build package
1213
shell: pwsh
13-
run: ./JetBrainsMono/Build-Installer.ps1
14+
run: ./src/Build-Installer.ps1
1415
env:
1516
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1617
- uses: actions/upload-artifact@v3
1718
with:
1819
name: build
19-
path: JetBrainsMono/bin/Release/*.msi
20+
path: src/bin/Release/en-US/*.msi
2021
if-no-files-found: error

JetBrainsMono.sln

Lines changed: 0 additions & 25 deletions
This file was deleted.

JetBrainsMono/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

JetBrainsMono/JetBrainsMono.wixproj

Lines changed: 0 additions & 48 deletions
This file was deleted.

JetBrainsMono/Product.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

README.md

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# JetBrainsMono Nerd Font installer for Windows
22

3-
This is a [WiX v3](https://wixtoolset.org/docs/v3/) based installer for the
3+
This is a [WiX v4](https://wixtoolset.org/docs/intro/) based installer for the
44
[JetBrainsMono Nerd Font](https://www.nerdfonts.com/).
55

66
This installer is available on
@@ -12,38 +12,19 @@ winget install --id DEVCOM.JetBrainsMonoNerdFont
1212

1313
## Build prerequisites
1414

15-
- [Visual Studio 2022 (any edition)](https://visualstudio.microsoft.com/#vs-section)
16-
- [WiX v3](https://wixtoolset.org/docs/wix3/)
17-
- [WiX v3 - Visual Studio 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension)
15+
- [WiX v4](https://wixtoolset.org/docs/intro/)
16+
- [GitHub CLI](https://cli.github.com/)
1817

19-
WiX v3 is available at <https://github.com/wixtoolset/wix3/releases/>. It
20-
requires .NET Framework 3.5, which can be installed with the following command:
18+
Install them with the following commands:
2119

2220
```powershell
23-
Start-Process `
24-
-FilePath pwsh `
25-
-ArgumentList "-Command `"& {Enable-WindowsOptionalFeature -Online -FeatureName NetFx3}`"" `
26-
-Wait `
27-
-Verb RunAs
21+
dotnet tool install --global wix
22+
winget install --id GitHub.cli
2823
```
2924

3025
## Build
3126

32-
Run the `JetBrainsMono\Build-Installer.ps1` PowerShell script to build the
33-
installer.
27+
Run the `src\Build-Installer.ps1` PowerShell script to build the installer.
3428

35-
If successful, the MSI file will be available in the `JetBrainsMono\bin\Release`
29+
If successful, the MSI file will be available in the `src\bin\Release\en-US`
3630
directory.
37-
38-
## Visual Studio project template
39-
40-
You can use the included [Visual Studio project
41-
template](https://learn.microsoft.com/visualstudio/ide/creating-project-and-item-templates)
42-
to build an installer for a Nerd Font of your choice. To use the template, zip
43-
the files in the `VSTemplate` folder and copy it to your
44-
`%USERPROFILE%\Documents\Visual Studio 2022\Templates\ProjectTemplates` folder.
45-
46-
After installing the template, create a new Visual Studio project using it, and
47-
name the project with the name of one of the zip files available for download in
48-
the [releases page](https://github.com/ryanoasis/nerd-fonts/releases) of the
49-
Nerd Font GitHub repository.

VSTemplate/Build-Installer.ps1

Lines changed: 0 additions & 32 deletions
This file was deleted.

VSTemplate/NerdFont.wixproj

Lines changed: 0 additions & 48 deletions
This file was deleted.

VSTemplate/NerdFontInstaller.vstemplate

Lines changed: 0 additions & 23 deletions
This file was deleted.

VSTemplate/Product.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)