Skip to content

Commit 3feafc1

Browse files
authored
C++ --> C# (#114)
* feat: Start rewrite * feat: Cleanup * feat: Add folder service * feat: Add blank WinUI * feat: Improve Windows installer * feat: Some WinUI window implementations * feat: WinUI folder operations * feat: WinUI AboutDialog * feat: WinUI app updates * feat: WinUI SettingsPage * feat: Gtk blank project * feat: Rename GTK -> GNOME * fix: csproj Files * fix: Post-build targets * feat: GTK MainWindow * feat: Gtk better builder API * feat: Gtk finish * feat: GNOME use helper library * feat: Build Windows installer * fix: Windows build * fix: Use msbuild for building * Update windows.yml * Update windows.yml * feat: WinUI downgrade to .NET 9 * Update windows.yml * fix: Windows build * fix: Windows build * Update windows.yml * chore: Cleanup * feat: Update docs * feat: Flatpak build * fix: Flatpak build * fix: Flatpak build * fix: Linux build * fix: Linux build * feat: Add publish targets * fix: Target paths * Revert "fix: Target paths" This reverts commit 9d21420. * fix: Target paths
1 parent 456fd8a commit 3feafc1

113 files changed

Lines changed: 3416 additions & 5936 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

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

.github/workflows/snap.yml

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

.github/workflows/spelling.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
codespell:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
16-
- uses: codespell-project/actions-codespell@master
15+
- uses: actions/checkout@v5
16+
- uses: codespell-project/actions-codespell@v2
1717
with:
1818
check_filenames: true
1919
skip: cargo-sources.json,.git,*.svg,*.html,*.js,*.po,*.pot,*.page,*.map,*.rtf,pch.h,CONTRIBUTING.md

.github/workflows/windows.yml

Lines changed: 31 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ permissions:
1010
id-token: write
1111
contents: read
1212
env:
13-
GITHUB_ACTIONS: true
14-
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
13+
PROJECT_NAME: Nickvision.Application.WinUI
14+
INSTALLER_NAME: NickvisionApplicationSetup
1515
jobs:
1616
winui-windows:
1717
name: "WinUI on Windows"
@@ -20,67 +20,43 @@ jobs:
2020
matrix:
2121
variant:
2222
- arch: x64
23-
runner: windows-2025
24-
triplet: x64-windows
25-
#- arch: arm64
26-
# runner: windows-11-arm
27-
# triplet: arm64-windows
23+
runner: windows-latest
24+
subsys: mingw64
25+
type: x86_64
26+
- arch: arm64
27+
runner: windows-11-arm
28+
subsys: clangarm64
29+
type: clang-aarch64
2830
runs-on: ${{ matrix.variant.runner }}
2931
steps:
30-
- name: "Checkout"
31-
uses: actions/checkout@v4
32+
- uses: actions/checkout@v5
3233
with:
3334
submodules: recursive
34-
- name: "Setup Environment and Dependencies"
35-
shell: pwsh
36-
run: |
37-
$ProgressPreference = 'SilentlyContinue'
38-
mkdir build
39-
mkdir build-portable
40-
Invoke-WebRequest https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.26-v1.17/gettext0.26-iconv1.17-shared-64.zip -OutFile gettext.zip
41-
Expand-Archive -Force 'gettext.zip'
42-
move gettext\bin\* C:\Windows\System32
43-
- name: "Vcpkg"
44-
uses: johnwason/vcpkg-action@v7
45-
id: vcpkg
35+
- uses: msys2/setup-msys2@v2
36+
id: msys2
4637
with:
47-
pkgs: libnick
48-
triplet: ${{ matrix.variant.triplet }}
49-
revision: 6548e2ee65216d462b945337ba74d09269fb4e8f
50-
token: ${{ github.token }}
51-
cache-key: ${{ matrix.variant.triplet }}-6548e2ee65216d462b945337ba74d09269fb4e8f
52-
- name: "Build (Installer)"
53-
working-directory: ${{ github.workspace }}/build
54-
run: |
55-
cmake -G "Visual Studio 17 2022" ..
56-
cmake --build . --config Release
57-
- name: "Build (Portable)"
58-
working-directory: ${{ github.workspace }}/build-portable
59-
run: |
60-
cmake -G "Visual Studio 17 2022" -DBUILD_AS_PORTABLE=ON ..
61-
cmake --build . --config Release
62-
- name: "Create Installer"
38+
msystem: ${{ matrix.variant.subsys }}
39+
install: mingw-w64-${{ matrix.variant.type }}-gettext-tools
40+
- uses: actions/setup-dotnet@v5
41+
with:
42+
dotnet-version: '10.0.x'
43+
- name: "Setup PATH"
44+
shell: pwsh
45+
run: echo "${{ steps.msys2.outputs.msys2-location }}\${{ matrix.variant.subsys }}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
46+
- name: "Restore"
47+
run: dotnet restore ${{ env.PROJECT_NAME }}
48+
- name: "Build"
49+
run: dotnet build ${{ env.PROJECT_NAME }} -c Release --no-restore /p:Platform=${{ matrix.variant.arch }}
50+
- name: "Installer"
6351
working-directory: ${{github.workspace}}/inno
52+
env:
53+
APP_FILES_PATH: ${{ env.PROJECT_NAME }}/bin/${{ matrix.variant.arch }}/Release/net10.0-windows10.0.19041.0
6454
shell: pwsh
6555
run: |
6656
$ProgressPreference = 'SilentlyContinue'
67-
Invoke-WebRequest https://aka.ms/vs/17/release/vc_redist.${{ matrix.variant.arch }}.exe -OutFile vc_redist.exe
68-
Invoke-WebRequest https://aka.ms/windowsappsdk/1.8/latest/windowsappruntimeinstall-${{ matrix.variant.arch }}.exe -OutFile windowsappruntimeinstall.exe
57+
Invoke-WebRequest https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/10.0.0/windowsdesktop-runtime-10.0.0-win-${{ matrix.variant.arch }}.exe -OutFile dotnet.exe
6958
iscc setup.iss
70-
- name: "Create Portable"
71-
working-directory: ${{ github.workspace }}/build-portable/org.nickvision.application.winui/Release
72-
shell: pwsh
73-
run: |
74-
$ProgressPreference = 'SilentlyContinue'
75-
Invoke-WebRequest https://aka.ms/vs/17/release/vc_redist.${{ matrix.variant.arch }}.exe -OutFile vc_redist.exe
76-
Invoke-WebRequest https://aka.ms/windowsappsdk/1.8/latest/windowsappruntimeinstall-${{ matrix.variant.arch }}.exe -OutFile windowsappruntimeinstall.exe
77-
- name: "Upload (Installer)"
78-
uses: actions/upload-artifact@v4
79-
with:
80-
path: ${{ github.workspace }}/inno/NickvisionApplicationSetup.exe
81-
name: Windows-${{ matrix.variant.arch }}-Installer
82-
- name: "Upload (Portable)"
83-
uses: actions/upload-artifact@v4
59+
- uses: actions/upload-artifact@v4
8460
with:
85-
path: ${{ github.workspace }}/build-portable/org.nickvision.application.winui/Release
86-
name: Windows-${{ matrix.variant.arch }}-Portable
61+
path: ${{ github.workspace }}/inno/${{ env.INSTALLER_NAME }}.exe
62+
name: ${{ env.INSTALLER_NAME }}-${{ matrix.variant.arch }}

0 commit comments

Comments
 (0)