diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index 7ce67ee..eb2d1df 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -1,45 +1,58 @@
-# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages
on:
- # Runs on pushes targeting the default branch
push:
branches: ['master']
- # Allows you to run this workflow manually from the Actions tab
- workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: 'pages'
cancel-in-progress: false
jobs:
- # Single deploy job since we're just deploying
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
- runs-on: ubuntu-latest
+ runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v3
+
- name: Setup Pages
uses: actions/setup-node@v3
+ - name: Setup MSBuild
+ uses: microsoft/setup-msbuild@v1
+
- name: Build
run: |
+ powershell
cd web
yarn
- yarn build-only
+ yarn build:zip
echo '' > dist/404.html
+ cd ..\windows
+ echo "" > FodyWeavers.xml
+ mv ..\web\web.zip Resources\web.zip
+ msbuild Musiche.sln -t:"Restore;Build" /p:Configuration=Release /p:Platform="Any CPU"
+ msbuild Musiche.sln -t:"Restore;Build;Publish" /p:Configuration=Release /p:Platform="Any CPU" /p:PublishProfile="Properties\PublishProfiles\net6.0.pubxml" /p:TargetFramework=net6.0-windows
+ cd ..
+ copy windows\bin\Release\net472\Musiche.exe web\dist\Musiche.exe
+ copy windows\bin\Publish\net6.0-windows\Musiche.exe web\dist\Musiche.net6.exe
+ $versionMatch = (Get-Content -Path windows\Musiche.csproj | Select-String -Pattern '(.*?)').Matches
+ if ($versionMatch.Count -eq 0) {
+ $version = "2.0.0"
+ } else {
+ $version = $versionMatch[0].Groups[1].Value
+ }
+ $commitHash = git rev-parse --short HEAD
+ $combinedVersion = "$version-$commitHash"
+ $combinedVersion | Out-File -FilePath web\dist\version
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
diff --git a/windows/Musiche.csproj b/windows/Musiche.csproj
index 1cf11d2..4e490ff 100644
--- a/windows/Musiche.csproj
+++ b/windows/Musiche.csproj
@@ -20,7 +20,7 @@
git
Musiche
HeHang
- 1.0.0
+ 2.0.0
true