From f15fac68df1f66a49868c663cb91aafdac381537 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 5 Apr 2026 08:59:41 +0000 Subject: [PATCH 01/15] Initial plan From 63914d399c42de68e7d3e40394df21d84f2ab0a2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 5 Apr 2026 09:04:16 +0000 Subject: [PATCH 02/15] =?UTF-8?q?WiX=E6=8B=A1=E5=BC=B5=E6=A9=9F=E8=83=BD?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E4=BA=92?= =?UTF-8?q?=E6=8F=9B=E6=80=A7=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=83=93=E3=83=AB=E3=83=89=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Agent-Logs-Url: https://github.com/Freeesia/VdLabel/sessions/95c2d3ad-f5f8-49c9-84e7-a1f686ef8a80 Co-authored-by: Freeesia <9002657+Freeesia@users.noreply.github.com> --- .github/workflows/dotnet-desktop.yml | 2 ++ VdLabel.Wix/Program.cs | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 4f8ecaa..357754a 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -140,6 +140,8 @@ jobs: name: licenses - run: | dotnet tool restore + dotnet wix extension add -g WixToolset.Util.wixext/6.0.2 + dotnet wix extension add -g WixToolset.UI.wixext/6.0.2 dotnet run -c Release working-directory: VdLabel.Wix - uses: actions/upload-artifact@v7 diff --git a/VdLabel.Wix/Program.cs b/VdLabel.Wix/Program.cs index 6ecd0fb..06c6f4d 100644 --- a/VdLabel.Wix/Program.cs +++ b/VdLabel.Wix/Program.cs @@ -3,6 +3,10 @@ using WixSharp; using Path = System.IO.Path; +// WiX v6 と互換性のある拡張機能バージョンを明示的に指定する +WixExtension.Util.PreferredVersion = "6.0.2"; +WixExtension.UI.PreferredVersion = "6.0.2"; + const string Manufacturer = "StudioFreesia"; const string App = "VdLabel"; const string ArtifactsDir = @"..\artifacts"; From 2913b710f94fdbd05c5059433b25d780fed49cbc Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 5 Apr 2026 09:31:03 +0000 Subject: [PATCH 03/15] =?UTF-8?q?WiX=E6=8B=A1=E5=BC=B5=E3=82=92=20.wixproj?= =?UTF-8?q?=20=E3=81=AE=20PackageReference=20=E3=81=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=81=99=E3=82=8B=E6=96=B9=E5=BC=8F=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Agent-Logs-Url: https://github.com/Freeesia/VdLabel/sessions/c743b634-a05f-4cd1-b68c-a0db83f7dd1d Co-authored-by: Freeesia <9002657+Freeesia@users.noreply.github.com> --- .github/workflows/dotnet-desktop.yml | 7 +++---- VdLabel.Wix/Program.cs | 8 ++------ VdLabel.Wix/VdLabel.Installer.wixproj | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 VdLabel.Wix/VdLabel.Installer.wixproj diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 357754a..96d08fd 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -63,7 +63,7 @@ jobs: - uses: actions/cache@v5 with: path: ~/.nuget/packages - key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} #hash of project files + key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.wixproj') }} #hash of project files restore-keys: | ${{ runner.os }}-nuget- - uses: actions/setup-dotnet@v5 @@ -123,7 +123,7 @@ jobs: - uses: actions/cache@v5 with: path: ~/.nuget/packages - key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} #hash of project files + key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.wixproj') }} #hash of project files restore-keys: | ${{ runner.os }}-nuget- - uses: actions/setup-dotnet@v5 @@ -140,9 +140,8 @@ jobs: name: licenses - run: | dotnet tool restore - dotnet wix extension add -g WixToolset.Util.wixext/6.0.2 - dotnet wix extension add -g WixToolset.UI.wixext/6.0.2 dotnet run -c Release + dotnet build VdLabel.Installer.wixproj -p:OutputName=VdLabel-${{ needs.build.outputs.version }} working-directory: VdLabel.Wix - uses: actions/upload-artifact@v7 with: diff --git a/VdLabel.Wix/Program.cs b/VdLabel.Wix/Program.cs index 06c6f4d..23d854a 100644 --- a/VdLabel.Wix/Program.cs +++ b/VdLabel.Wix/Program.cs @@ -3,14 +3,9 @@ using WixSharp; using Path = System.IO.Path; -// WiX v6 と互換性のある拡張機能バージョンを明示的に指定する -WixExtension.Util.PreferredVersion = "6.0.2"; -WixExtension.UI.PreferredVersion = "6.0.2"; - const string Manufacturer = "StudioFreesia"; const string App = "VdLabel"; const string ArtifactsDir = @"..\artifacts"; -const string PublishDir = @"..\publish"; const string Executable = $"{App}.exe"; var exePath = Path.Combine(Environment.CurrentDirectory, ArtifactsDir, Executable); @@ -64,4 +59,5 @@ } }; -project.BuildMsi(Path.Combine(PublishDir, $"{App}-{version}.msi")); +// WXS ファイルを生成する（MSI のビルドは VdLabel.Installer.wixproj で行う） +Compiler.BuildWxs(project); diff --git a/VdLabel.Wix/VdLabel.Installer.wixproj b/VdLabel.Wix/VdLabel.Installer.wixproj new file mode 100644 index 0000000..63c9678 --- /dev/null +++ b/VdLabel.Wix/VdLabel.Installer.wixproj @@ -0,0 +1,16 @@ + + + + $(MSBuildProjectDirectory)\..\publish\ + + + + + + + + + + + + From b4632fa0627d6628cd4dce60bdf8e095daabb04d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 5 Apr 2026 09:52:27 +0000 Subject: [PATCH 04/15] =?UTF-8?q?dotnet=20run=20=E3=81=AB=20--project=20?= =?UTF-8?q?=E3=82=92=E6=98=8E=E7=A4=BA=E6=8C=87=E5=AE=9A=E3=81=97=E8=A4=87?= =?UTF-8?q?=E6=95=B0=E3=83=97=E3=83=AD=E3=82=B8=E3=82=A7=E3=82=AF=E3=83=88?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E7=AB=B6=E5=90=88?= =?UTF-8?q?=E3=82=92=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Agent-Logs-Url: https://github.com/Freeesia/VdLabel/sessions/f7fe7368-2bfb-4473-a230-c7d1a8eb2597 Co-authored-by: Freeesia <9002657+Freeesia@users.noreply.github.com> --- .github/workflows/dotnet-desktop.yml | 2 +- VdLabel.Wix/Program.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 96d08fd..d1cc3f0 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -140,7 +140,7 @@ jobs: name: licenses - run: | dotnet tool restore - dotnet run -c Release + dotnet run --project VdLabel.Wix.csproj -c Release dotnet build VdLabel.Installer.wixproj -p:OutputName=VdLabel-${{ needs.build.outputs.version }} working-directory: VdLabel.Wix - uses: actions/upload-artifact@v7 diff --git a/VdLabel.Wix/Program.cs b/VdLabel.Wix/Program.cs index 23d854a..99c3a2b 100644 --- a/VdLabel.Wix/Program.cs +++ b/VdLabel.Wix/Program.cs @@ -60,4 +60,4 @@ }; // WXS ファイルを生成する（MSI のビルドは VdLabel.Installer.wixproj で行う） -Compiler.BuildWxs(project); +Compiler.BuildWxs(project, $"{App}.wxs"); From d4464d461cb53084b63c611dc64da10b981c1f6b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 5 Apr 2026 10:46:52 +0000 Subject: [PATCH 05/15] =?UTF-8?q?fix:=20VdLabel.Wix.csproj=20=E3=82=92=20n?= =?UTF-8?q?et472=20=E3=81=8B=E3=82=89=20net8.0-windows=20=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=97=20System.Windows.Forms=20=E5=8F=82?= =?UTF-8?q?=E7=85=A7=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Agent-Logs-Url: https://github.com/Freeesia/VdLabel/sessions/bc7d8969-4700-4345-820e-9506556f7d11 Co-authored-by: Freeesia <9002657+Freeesia@users.noreply.github.com> --- VdLabel.Wix/VdLabel.Wix.csproj | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/VdLabel.Wix/VdLabel.Wix.csproj b/VdLabel.Wix/VdLabel.Wix.csproj index 2ac7582..da63b29 100644 --- a/VdLabel.Wix/VdLabel.Wix.csproj +++ b/VdLabel.Wix/VdLabel.Wix.csproj @@ -3,7 +3,7 @@ Exe VdLavel.Wix - net472 + net8.0-windows latest @@ -17,8 +17,5 @@ - - - \ No newline at end of file From c3ce1a62d734e0c1f0edb76f6ff492126ec195e6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 5 Apr 2026 10:58:21 +0000 Subject: [PATCH 06/15] =?UTF-8?q?fix:=20TargetFramework=20=E3=82=92=20net8?= =?UTF-8?q?.0=20=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=97=20Compiler.BuildWxs?= =?UTF-8?q?=20=E3=81=AE=E5=BC=95=E6=95=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Agent-Logs-Url: https://github.com/Freeesia/VdLabel/sessions/b129b47b-3930-4302-9b0b-1b8e8c194134 Co-authored-by: Freeesia <9002657+Freeesia@users.noreply.github.com> --- VdLabel.Wix/Program.cs | 3 ++- VdLabel.Wix/VdLabel.Wix.csproj | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/VdLabel.Wix/Program.cs b/VdLabel.Wix/Program.cs index 99c3a2b..8438033 100644 --- a/VdLabel.Wix/Program.cs +++ b/VdLabel.Wix/Program.cs @@ -60,4 +60,5 @@ }; // WXS ファイルを生成する（MSI のビルドは VdLabel.Installer.wixproj で行う） -Compiler.BuildWxs(project, $"{App}.wxs"); +// プロジェクト名 "VdLabel" がそのまま出力ファイル名 VdLabel.wxs になる +Compiler.BuildWxs(project); diff --git a/VdLabel.Wix/VdLabel.Wix.csproj b/VdLabel.Wix/VdLabel.Wix.csproj index da63b29..d76f672 100644 --- a/VdLabel.Wix/VdLabel.Wix.csproj +++ b/VdLabel.Wix/VdLabel.Wix.csproj @@ -3,7 +3,7 @@ Exe VdLavel.Wix - net8.0-windows + net8.0 latest From 3441c53a1583edf3680dbc240044f3fb2d5e42f6 Mon Sep 17 00:00:00 2001 From: Freesia Date: Sun, 5 Apr 2026 21:16:35 +0900 Subject: [PATCH 07/15] =?UTF-8?q?=E3=81=84=E3=81=A3=E3=81=9F=E3=82=93?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E4=BD=9C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=BF=E3=81=A6=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index d1cc3f0..4c01591 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -113,7 +113,7 @@ jobs: name: licenses path: licenses/ installer: - if: ${{ startsWith(github.ref, 'refs/tags/') }} + # if: ${{ startsWith(github.ref, 'refs/tags/') }} needs: - build - license From d9516e1a7d5d89733cd7a3fa3d6c15b7e0937b0f Mon Sep 17 00:00:00 2001 From: Freesia Date: Sun, 5 Apr 2026 21:53:16 +0900 Subject: [PATCH 08/15] =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=82=BB=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=82=82=E3=81=84=E3=81=A3=E3=81=9F=E3=82=93=E6=9C=89?= =?UTF-8?q?=E5=8A=B9=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 4c01591..3d1a98f 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -86,7 +86,7 @@ jobs: name: VdLabel${{ matrix.self && '-full' || '' }}-${{ steps.gitversion.outputs.fullSemVer }} path: publish\ license: - if: ${{ startsWith(github.ref, 'refs/tags/') }} + # if: ${{ startsWith(github.ref, 'refs/tags/') }} runs-on: windows-latest steps: - uses: actions/checkout@v6 From eb33251421d6c2655eb85841bddb35f91c260aee Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 5 Apr 2026 13:01:25 +0000 Subject: [PATCH 09/15] =?UTF-8?q?fix:=20InternalsVisibleTo("VdLabel.Wix.ao?= =?UTF-8?q?t")=20=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=A6=20WixSharp?= =?UTF-8?q?=20=E3=81=AE=20AOT=20=E3=83=8F=E3=83=B3=E3=83=89=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E6=A4=9C=E8=A8=BC=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Agent-Logs-Url: https://github.com/Freeesia/VdLabel/sessions/b4cc288b-a6ba-4ae5-918c-eb64f2bbda0d Co-authored-by: Freeesia <9002657+Freeesia@users.noreply.github.com> --- VdLabel.Wix/AssemblyInfo.cs | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 VdLabel.Wix/AssemblyInfo.cs diff --git a/VdLabel.Wix/AssemblyInfo.cs b/VdLabel.Wix/AssemblyInfo.cs new file mode 100644 index 0000000..9141117 --- /dev/null +++ b/VdLabel.Wix/AssemblyInfo.cs @@ -0,0 +1,4 @@ +using System.Runtime.CompilerServices; + +// WixSharp の AOT ハンドラー検証のためにアセンブリを公開する +[assembly: InternalsVisibleTo("VdLabel.Wix.aot")] From 6fc723f4b75dfbf117f7ef719bd01c07bb37e9b4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 5 Apr 2026 15:04:10 +0000 Subject: [PATCH 10/15] =?UTF-8?q?fix:=20TargetFramework=20=E3=82=92=20net8?= =?UTF-8?q?.0-windows=20=E3=81=AB=E6=88=BB=E3=81=99=EF=BC=88System.Drawing?= =?UTF-8?q?.Common=20=E3=81=8C=E5=BF=85=E8=A6=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Agent-Logs-Url: https://github.com/Freeesia/VdLabel/sessions/a24152a5-067b-4b53-b324-0cb926019c11 Co-authored-by: Freeesia <9002657+Freeesia@users.noreply.github.com> --- VdLabel.Wix/VdLabel.Wix.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VdLabel.Wix/VdLabel.Wix.csproj b/VdLabel.Wix/VdLabel.Wix.csproj index d76f672..da63b29 100644 --- a/VdLabel.Wix/VdLabel.Wix.csproj +++ b/VdLabel.Wix/VdLabel.Wix.csproj @@ -3,7 +3,7 @@ Exe VdLavel.Wix - net8.0 + net8.0-windows latest From adf6026e07d5fffa39e5324e3fd8a9c58db3daad Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 5 Apr 2026 15:57:57 +0000 Subject: [PATCH 11/15] =?UTF-8?q?fix:=20System.Drawing.Common=20=E3=82=92?= =?UTF-8?q?=E6=98=8E=E7=A4=BA=E7=9A=84=E3=81=AB=E5=8F=82=E7=85=A7=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=EF=BC=88.NET=208=20=E3=81=A7=E3=81=AF=E8=87=AA?= =?UTF-8?q?=E5=8B=95=E7=9A=84=E3=81=AB=E5=90=AB=E3=81=BE=E3=82=8C=E3=81=AA?= =?UTF-8?q?=E3=81=84=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Agent-Logs-Url: https://github.com/Freeesia/VdLabel/sessions/ffc37bcf-46e4-4a61-a9ea-96970089cd2a Co-authored-by: Freeesia <9002657+Freeesia@users.noreply.github.com> --- VdLabel.Wix/VdLabel.Wix.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/VdLabel.Wix/VdLabel.Wix.csproj b/VdLabel.Wix/VdLabel.Wix.csproj index da63b29..df939cd 100644 --- a/VdLabel.Wix/VdLabel.Wix.csproj +++ b/VdLabel.Wix/VdLabel.Wix.csproj @@ -15,6 +15,7 @@ + From a2bde8a866e80ea06ec934f6a8b7f6eb377d1e29 Mon Sep 17 00:00:00 2001 From: Freesia Date: Fri, 10 Apr 2026 00:44:36 +0900 Subject: [PATCH 12/15] =?UTF-8?q?=E3=81=84=E3=81=A3=E3=81=9F=E3=82=93?= =?UTF-8?q?=E3=81=9D=E3=82=8C=E3=81=A3=E3=81=BD=E3=81=8F=E3=81=AA=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VdLabel.Wix/AssemblyInfo.cs | 4 ---- VdLabel.Wix/VdLabel.Installer.wixproj | 6 ++---- VdLabel.Wix/VdLabel.Wix.csproj | 8 +++++--- 3 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 VdLabel.Wix/AssemblyInfo.cs diff --git a/VdLabel.Wix/AssemblyInfo.cs b/VdLabel.Wix/AssemblyInfo.cs deleted file mode 100644 index 9141117..0000000 --- a/VdLabel.Wix/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Runtime.CompilerServices; - -// WixSharp の AOT ハンドラー検証のためにアセンブリを公開する -[assembly: InternalsVisibleTo("VdLabel.Wix.aot")] diff --git a/VdLabel.Wix/VdLabel.Installer.wixproj b/VdLabel.Wix/VdLabel.Installer.wixproj index 63c9678..fd3ad57 100644 --- a/VdLabel.Wix/VdLabel.Installer.wixproj +++ b/VdLabel.Wix/VdLabel.Installer.wixproj @@ -2,12 +2,10 @@ $(MSBuildProjectDirectory)\..\publish\ + wix7 + x64 - - - - diff --git a/VdLabel.Wix/VdLabel.Wix.csproj b/VdLabel.Wix/VdLabel.Wix.csproj index df939cd..63353d3 100644 --- a/VdLabel.Wix/VdLabel.Wix.csproj +++ b/VdLabel.Wix/VdLabel.Wix.csproj @@ -2,8 +2,8 @@ Exe - VdLavel.Wix - net8.0-windows + VdLabel.Wix + net472 latest @@ -15,8 +15,10 @@ - + + + \ No newline at end of file From 41f8cc953074f38dd0d882c805b8bf155aa38a04 Mon Sep 17 00:00:00 2001 From: Freesia Date: Sat, 11 Apr 2026 23:10:29 +0900 Subject: [PATCH 13/15] =?UTF-8?q?fix:=20WixToolset=20=E3=82=92=207.0.0=20?= =?UTF-8?q?=E3=81=AB=E3=82=A2=E3=83=83=E3=83=97=E3=82=B0=E3=83=AC=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=81=97=E3=80=81WXS=20=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E5=87=BA=E5=8A=9B=E5=85=88=E3=82=92=20genera?= =?UTF-8?q?ted/=20=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E3=81=AB=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/dotnet-tools.json | 2 +- .gitignore | 3 +++ VdLabel.Wix/Program.cs | 10 ++++------ VdLabel.Wix/VdLabel.Installer.wixproj | 14 +++++++++++--- VdLabel.Wix/VdLabel.Wix.csproj | 4 ++-- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index aa93bda..465faca 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "wix": { - "version": "6.0.2", + "version": "7.0.0", "commands": [ "wix" ], diff --git a/.gitignore b/.gitignore index 7a180e0..f382619 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,9 @@ project.lock.json project.fragment.lock.json artifacts/ +# WixSharp の自動生成 WXS ファイル +VdLabel.Wix/generated/ + # ASP.NET Scaffolding ScaffoldingReadMe.txt diff --git a/VdLabel.Wix/Program.cs b/VdLabel.Wix/Program.cs index 8438033..17977cf 100644 --- a/VdLabel.Wix/Program.cs +++ b/VdLabel.Wix/Program.cs @@ -23,7 +23,6 @@ project.RebootSupressing = RebootSupressing.Suppress; project.GUID = new("FE947636-81DB-4819-A5D9-939125903F4C"); project.Platform = Platform.x64; -project.Language = "ja-JP"; project.Version = new(version); // コントロールパネルの情報を設定 @@ -35,9 +34,7 @@ UrlUpdateInfo = "https://github.com/Freeesia/VdLabel/releases", }; -// どっちか片方しか設定できない -//project.MajorUpgrade = MajorUpgrade.Default; -project.MajorUpgradeStrategy = MajorUpgradeStrategy.Default; +project.MajorUpgrade = MajorUpgrade.Default; project.BackgroundImage = @"..\assets\installer_back.png"; project.ValidateBackgroundImage = false; @@ -59,6 +56,7 @@ } }; -// WXS ファイルを生成する（MSI のビルドは VdLabel.Installer.wixproj で行う） -// プロジェクト名 "VdLabel" がそのまま出力ファイル名 VdLabel.wxs になる +// WXS ファイルを generated/ フォルダに生成する（MSI のビルドは VdLabel.Installer.wixproj で行う） +// generated/ は .gitignore で除外されているため、生成物がリポジトリに混入しない +project.OutDir = "generated"; Compiler.BuildWxs(project); diff --git a/VdLabel.Wix/VdLabel.Installer.wixproj b/VdLabel.Wix/VdLabel.Installer.wixproj index fd3ad57..2680b2a 100644 --- a/VdLabel.Wix/VdLabel.Installer.wixproj +++ b/VdLabel.Wix/VdLabel.Installer.wixproj @@ -1,14 +1,22 @@ - + $(MSBuildProjectDirectory)\..\publish\ wix7 x64 + + ja-JP - - + + + + + + + + diff --git a/VdLabel.Wix/VdLabel.Wix.csproj b/VdLabel.Wix/VdLabel.Wix.csproj index 63353d3..a799479 100644 --- a/VdLabel.Wix/VdLabel.Wix.csproj +++ b/VdLabel.Wix/VdLabel.Wix.csproj @@ -3,7 +3,7 @@ Exe VdLabel.Wix - net472 + net48 latest @@ -14,7 +14,7 @@ - + From a063c22ddbc5bf41f0557b417780c9e6f484118b Mon Sep 17 00:00:00 2001 From: Freesia Date: Sat, 11 Apr 2026 23:12:57 +0900 Subject: [PATCH 14/15] =?UTF-8?q?fix:=20.wixpdb=20=E3=81=AE=E5=87=BA?= =?UTF-8?q?=E5=8A=9B=E3=82=92=E6=8A=91=E5=88=B6=E3=81=99=E3=82=8B=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VdLabel.Wix/VdLabel.Installer.wixproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/VdLabel.Wix/VdLabel.Installer.wixproj b/VdLabel.Wix/VdLabel.Installer.wixproj index 2680b2a..5a62cee 100644 --- a/VdLabel.Wix/VdLabel.Installer.wixproj +++ b/VdLabel.Wix/VdLabel.Installer.wixproj @@ -6,6 +6,8 @@ x64 ja-JP + + true From dcc5fa8a4e57943a213cdcc98e2af104cf74e949 Mon Sep 17 00:00:00 2001 From: Freesia Date: Sat, 11 Apr 2026 23:51:48 +0900 Subject: [PATCH 15/15] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E6=88=BB=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dotnet-desktop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 3d1a98f..d1cc3f0 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -86,7 +86,7 @@ jobs: name: VdLabel${{ matrix.self && '-full' || '' }}-${{ steps.gitversion.outputs.fullSemVer }} path: publish\ license: - # if: ${{ startsWith(github.ref, 'refs/tags/') }} + if: ${{ startsWith(github.ref, 'refs/tags/') }} runs-on: windows-latest steps: - uses: actions/checkout@v6 @@ -113,7 +113,7 @@ jobs: name: licenses path: licenses/ installer: - # if: ${{ startsWith(github.ref, 'refs/tags/') }} + if: ${{ startsWith(github.ref, 'refs/tags/') }} needs: - build - license