NuGetベースのプラグイン導入UIを実装する

.github/workflows/dotnet-desktop.yml

@@ -125,9 +125,6 @@ jobs:
           versionSpec: "6.x"
       - id: gitversion
         uses: gittools/actions/gitversion/execute@v4.7.0
-      - uses: Jimver/cuda-toolkit@v0.2.30
-        with:
-          cuda: '12.9.0'
       - run: |
           dotnet publish WindowTranslator -c Release -o publish --sc ${{ matrix.self }} `
             -p:Version=${{ steps.gitversion.outputs.fullSemVer }} `
@@ -137,14 +134,16 @@ jobs:
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       - run: |
-          $folders = Get-ChildItem -Path "Plugins" -Directory | Where-Object { $_.Name -notmatch "Dummy" -and $_.Name -notmatch "Tests?" }
-          for ($i = 0; $i -lt $folders.Count; $i++) {
-            dotnet publish $folders[$i].FullName -c Release -o "publish\plugins\$($folders[$i].Name)" `
-              -p:Version=${{ steps.gitversion.outputs.fullSemVer }} `
-              -p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }} `
-              -p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }} `
-              -p:InformationalVersion=${{ steps.gitversion.outputs.informationalVersion }} `
-              -p:DecryptKey="${{ secrets.WINDOWTRANSLATOR_DECRYPTKEY }}"
+          dotnet msbuild Plugins\WindowTranslator.Plugins.proj -target:PublishAppBundle `
+            -p:Configuration=Release `
+            -p:AppBundleOutputPath="$((Resolve-Path publish).Path)\plugins" `
+            -p:Version=${{ steps.gitversion.outputs.fullSemVer }} `
+            -p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }} `
+            -p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }} `
+            -p:InformationalVersion=${{ steps.gitversion.outputs.informationalVersion }} `
+            -p:DecryptKey="${{ secrets.WINDOWTRANSLATOR_DECRYPTKEY }}"
+          if ($LASTEXITCODE -ne 0) {
+            exit $LASTEXITCODE
           }
       - uses: actions/download-artifact@v8
         if: ${{ needs.docs.result == 'success' }}

.github/workflows/dotnet-package.yml

@@ -1,12 +1,16 @@
 name: .NET Core Package
 
 on:
+  pull_request:
   push:
     tags: [v*]
 
 jobs:
   build:
     runs-on: windows-latest
+    permissions:
+      contents: read
+      id-token: write
     steps:
       - uses: actions/checkout@v7
         with:
@@ -25,10 +29,57 @@ jobs:
           versionSpec: "6.x"
       - id: gitversion
         uses: gittools/actions/gitversion/execute@v4.7.0
+      - id: package-version
+        shell: pwsh
+        run: |
+          if ('${{ github.event_name }}' -eq 'push') {
+            $tag = '${{ github.ref_name }}'
+            if ($tag -notmatch '^v(?<version>[0-9]+\.[0-9]+\.[0-9]+(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?)$') {
+              Write-Error "NuGet package tag must be v-prefixed SemVer: $tag"
+              exit 1
+            }
+            "version=$($Matches.version)" >> $env:GITHUB_OUTPUT
+          }
+          else {
+            "version=0.0.0-pr.${{ github.run_number }}" >> $env:GITHUB_OUTPUT
+          }
+      - uses: Jimver/cuda-toolkit@v0.2.30
+        with:
+          cuda: '12.9.0'
       - run: |
           dotnet pack WindowTranslator.Abstractions -c Release -o pack `
-            -p:Version=${{ steps.gitversion.outputs.fullSemVer }} `
+            -p:Version=${{ steps.package-version.outputs.version }} `
+            -p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }} `
+            -p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }} `
+            -p:InformationalVersion=${{ steps.gitversion.outputs.informationalVersion }}
+          if ($LASTEXITCODE -ne 0) {
+            exit $LASTEXITCODE
+          }
+          dotnet pack ColorThief\ColorThief -c Release -o pack `
+            -p:Version=${{ steps.package-version.outputs.version }} `
             -p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }} `
             -p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }} `
             -p:InformationalVersion=${{ steps.gitversion.outputs.informationalVersion }}
-          dotnet nuget push pack\*.nupkg -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate
+          if ($LASTEXITCODE -ne 0) {
+            exit $LASTEXITCODE
+          }
+          dotnet msbuild Plugins\WindowTranslator.Plugins.proj -target:PackPlugins `
+            -p:Configuration=Release `
+            -p:PackageOutputPath="$((Resolve-Path pack).Path)" `
+            -p:Version=${{ steps.package-version.outputs.version }} `
+            -p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }} `
+            -p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }} `
+            -p:InformationalVersion=${{ steps.gitversion.outputs.informationalVersion }} `
+            -p:DecryptKey="${{ secrets.WINDOWTRANSLATOR_DECRYPTKEY }}"
+          if ($LASTEXITCODE -ne 0) {
+            exit $LASTEXITCODE
+          }
+      - name: NuGet login
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        id: nuget_login
+        uses: NuGet/login@v1
+        with:
+          user: Freesia
+      - name: NuGet push
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        run: dotnet nuget push pack\*.nupkg --api-key ${{ steps.nuget_login.outputs.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate

ColorThief/ColorThief/ColorThief.csproj

@@ -2,6 +2,10 @@
 
   <PropertyGroup>
     <TargetFramework>net10.0-windows10.0.20348.0</TargetFramework>
+    <PackageId>WindowTranslator.ColorThief</PackageId>
+    <Title>WindowTranslator ColorThief Support Library</Title>
+    <Description>Color extraction support library for the WindowTranslator ColorThief plugin.</Description>
+    <PackageTags>$(PackageTags);ColorThief</PackageTags>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>StudioFreesia.ColorThief</RootNamespace>

Directory.Packages.props

@@ -23,6 +23,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.302" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
@@ -34,6 +35,10 @@
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.298" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
     <PackageVersion Include="Moq" Version="4.20.72" />
+    <PackageVersion Include="NuGet.Frameworks" Version="7.6.0" />
+    <PackageVersion Include="NuGet.Packaging" Version="7.6.0" />
+    <PackageVersion Include="NuGet.Protocol" Version="7.6.0" />
+    <PackageVersion Include="NuGet.Versioning" Version="7.6.0" />
     <PackageVersion Include="Octokit" Version="14.0.0" />
     <PackageVersion Include="Panlingo.LanguageIdentification.FastText" Version="0.6.2" />
     <PackageVersion Include="PropertyTools" Version="3.1.0" />

Plugins/Directory.Build.props

@@ -6,6 +6,14 @@
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
 
+  <!-- アプリへの同梱と NuGet 公開は、各プラグインから明示的に有効化する。 -->
+  <PropertyGroup>
+    <IncludeInAppBundle Condition="'$(IncludeInAppBundle)' == ''">false</IncludeInAppBundle>
+    <PublishToNuGet Condition="'$(PublishToNuGet)' == ''">false</PublishToNuGet>
+    <IncludePluginRuntimeAssetsInPackage
+      Condition="'$(IncludePluginRuntimeAssetsInPackage)' == ''">false</IncludePluginRuntimeAssetsInPackage>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.Extensions.Options" ExcludeAssets="runtime" />
@@ -22,4 +30,4 @@
       <ExcludeAssets>runtime</ExcludeAssets>
     </ProjectReference>
   </ItemGroup>
-</Project>
+</Project>

Plugins/Directory.Build.targets

@@ -1,8 +1,53 @@
 <Project>
+  <PropertyGroup>
+    <IsPackable>$(PublishToNuGet)</IsPackable>
+    <IsPublishable
+      Condition="'$(AppBundleOutputPath)' != ''">$(IncludeInAppBundle)</IsPublishable>
+    <PublishDir
+      Condition="'$(AppBundleOutputPath)' != ''">$(AppBundleOutputPath)\$(MSBuildProjectName)\</PublishDir>
+  </PropertyGroup>
+
   <!-- 上位階層の Directory.Build.targets をインクルード -->
   <Import Project="$(MSBuildProjectDirectory)\..\..\Directory.Build.targets" Condition="Exists('$(MSBuildProjectDirectory)\..\..\Directory.Build.targets')" />
 
-  <Target Condition="'$(IsTestProject)' != 'true'" Name="PostBuild" AfterTargets="PostBuildEvent">
+  <PropertyGroup Condition="'$(IsTestProject)' != 'true' AND '$(IsPackable)' != 'false'">
+    <PackageTags>$(PackageTags);windowtranslator-plugin</PackageTags>
+    <PackageReadmeFile Condition="Exists('$(MSBuildProjectDirectory)\README.md')">README.md</PackageReadmeFile>
+    <PackageIcon>plugin-icon.png</PackageIcon>
+    <TargetsForTfmSpecificBuildOutput
+      Condition="'$(IncludePluginRuntimeAssetsInPackage)' == 'true'">$(TargetsForTfmSpecificBuildOutput);AddPluginRuntimeAssetsToPackage</TargetsForTfmSpecificBuildOutput>
+  </PropertyGroup>
+
+  <ItemGroup Condition="Exists('$(MSBuildProjectDirectory)\README.md')">
+    <None Update="$(MSBuildProjectDirectory)\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IsTestProject)' != 'true' AND '$(IsPackable)' != 'false'">
+    <None Include="$(MSBuildThisFileDirectory)plugin-icon.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <!--
+    PackageReference の build/buildTransitive ターゲットによって出力されるネイティブ資産は、
+    依存パッケージの標準 runtimes/ 配下に存在しない場合がある。
+    必要なプラグインだけ IncludePluginRuntimeAssetsInPackage=true で実際のビルド出力を同梱する。
+  -->
+  <Target
+    Condition="'$(IsPackable)' != 'false' AND '$(IncludePluginRuntimeAssetsInPackage)' == 'true'"
+    Name="AddPluginRuntimeAssetsToPackage">
+    <ItemGroup>
+      <_PluginWinX64RuntimeAsset Include="$(TargetDir)runtimes\win-x64\**\*" />
+      <_PluginWinRuntimeAsset Include="$(TargetDir)runtimes\win\**\*" />
+      <_PluginAnyRuntimeAsset Include="$(TargetDir)runtimes\any\**\*" />
+      <BuildOutputInPackage Include="@(_PluginWinX64RuntimeAsset)"
+                            TargetPath="runtimes\win-x64\%(RecursiveDir)%(Filename)%(Extension)" />
+      <BuildOutputInPackage Include="@(_PluginWinRuntimeAsset)"
+                            TargetPath="runtimes\win\%(RecursiveDir)%(Filename)%(Extension)" />
+      <BuildOutputInPackage Include="@(_PluginAnyRuntimeAsset)"
+                            TargetPath="runtimes\any\%(RecursiveDir)%(Filename)%(Extension)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Condition="'$(IsTestProject)' != 'true' AND ('$(GITHUB_ACTIONS)' != 'true' OR '$(IncludeInAppBundle)' == 'true')" Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="call $(ProjectDir)..\copy_plugins.bat $(OutDir) $(ProjectName) $(Configuration)" />
   </Target>
-</Project>
+</Project>