chore: migrate assembly

thewakingsands · Jan 31, 2025 · af6b973 · af6b973
1 parent ff44b4b
commit af6b973
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 81 deletions.
diff --git a/Cafe.Matcha.Packer/Cafe.Matcha.Packer.csproj b/Cafe.Matcha.Packer/Cafe.Matcha.Packer.csproj
@@ -2,13 +2,8 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <OutputPath>..\bin\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
-  <ItemGroup>
-    <None Update="assets\manifest.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
 </Project>
diff --git a/Cafe.Matcha.Packer/Program.cs b/Cafe.Matcha.Packer/Program.cs
@@ -10,35 +10,10 @@ namespace Cafe.Matcha.Packer
 
     public class Program
     {
-        private static void GenerateAssembly()
-        {
-            string version = DateTime.UtcNow.ToString("yy.M.d.Hmm");
-
-            var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"..\Cafe.Matcha\AssemblyCopyright.cs");
-            var template = @"// Copyright (c) FFCafe. All rights reserved.
-// Licensed under the AGPL-3.0 license. See LICENSE file in the project root for full license information.
-
-using System.Reflection;
-
-[assembly: AssemblyTitle(""Cafe.Matcha"")]
-[assembly: AssemblyDescription(""Cafe.Matcha"")]
-[assembly: AssemblyCompany(""FFCafe"")]
-[assembly: AssemblyVersion(""{0}"")]
-[assembly: AssemblyCopyright(""Copyright © FFCafe {1}"")]
-
-namespace Cafe.Matcha
-{
-    public partial class Data
-    {
-        public const string Version = ""{0}"";
-    }
+        private const string Manifest = @"{
+  ""entryPoint"": ""Plugins/Cafe.Matcha/Cafe.Matcha.dll""
 }
 ";
-            var content = template.Replace("{0}", version).Replace("{1}", DateTime.Now.Year.ToString());
-            Console.WriteLine(content);
-            File.WriteAllText(path, content);
-        }
-
         private static void Bundle(string env)
         {
             var root = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, env);
@@ -51,7 +26,12 @@ private static void Bundle(string env)
             {
                 using (var archive = new ZipArchive(ms, ZipArchiveMode.Create, true))
                 {
-                    archive.CreateEntryFromFile(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @".\assets\manifest.json"), "manifest.json");
+                    var manifestEntry = archive.CreateEntry("manifest.json");
+                    using (var entryStream = manifestEntry.Open())
+                    using (var streamWriter = new StreamWriter(entryStream))
+                    {
+                        streamWriter.Write(Manifest);
+                    }
 
                     foreach (var dll in Directory.GetFiles(root, "*.dll"))
                     {
@@ -75,14 +55,7 @@ private static void Bundle(string env)
         private static void Main(string[] args)
         {
             string env = args.Length >= 1 ? args[0] : "Release";
-            if (env == "Assembly")
-            {
-                GenerateAssembly();
-            }
-            else
-            {
-                Bundle(env);
-            }
+            Bundle(env);
         }
     }
 }
diff --git a/Cafe.Matcha.Packer/Properties/AssemblyInfo.cs b/Cafe.Matcha.Packer/Properties/AssemblyInfo.cs
diff --git a/Cafe.Matcha.Packer/assets/manifest.json b/Cafe.Matcha.Packer/assets/manifest.json
diff --git a/Cafe.Matcha/.gitignore b/Cafe.Matcha/.gitignore
diff --git a/Cafe.Matcha/Cafe.Matcha.csproj b/Cafe.Matcha/Cafe.Matcha.csproj
@@ -1,17 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <OutputType>Library</OutputType>
     <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
     <StartupObject></StartupObject>
     <Obfuscate>true</Obfuscate>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
+  <PropertyGroup>
+    <Company>FFCafe</Company>
+    <Copyright>Copyright © FFCafe $([System.DateTime]::UtcNow.Year)</Copyright>
+    <Version>$([System.DateTime]::UtcNow.ToString("yy.M.d.Hmm"))</Version>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\bin\Debug\</OutputPath>
   </PropertyGroup>
@@ -99,7 +103,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Confuser.MSBuild">
-      <Version>1.4.1</Version>
+      <Version>1.6.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -126,19 +130,10 @@
     <PackageReference Include="RecursiveChangeNotifier">
       <Version>0.4.0</Version>
     </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.118</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="System.Reactive">
       <Version>6.0.1</Version>
     </PackageReference>
   </ItemGroup>
-  <PropertyGroup />
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="$(OutDir)..\Cafe.Matcha.Packer Assembly&#xD;&#xA;cd $(ProjectDir)Constant\&#xD;&#xA;&#xD;&#xA;if not exist Secret.Local.cs (&#xD;&#xA;    type nul &gt; Secret.Local.cs&#xD;&#xA;)" />
-  </Target>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="del $(OutDir) /F&#xD;&#xA;xcopy &quot;$(OutDir)confused\*.*&quot; &quot;$(OutDir)&quot; /E /Y /C&#xD;&#xA;$(OutDir)..\Cafe.Matcha.Packer $(ConfigurationName)" />
   </Target>

diff --git a/Cafe.Matcha/Data.cs b/Cafe.Matcha/Data.cs
@@ -6,17 +6,20 @@ namespace Cafe.Matcha
     using System;
     using System.Collections.Generic;
     using System.IO;
+    using System.Reflection;
     using System.Windows;
     using Cafe.Matcha.Utils;
     using Newtonsoft.Json;
 
-    public partial class Data : StaticBindingTarget<Data>
+    public class Data : StaticBindingTarget<Data>
     {
 #if GLOBAL
         public const string Title = "Matcha";
 #else
         public const string Title = "抹茶 Matcha";
 #endif
+        public static string Version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
+
         public Dictionary<int, Models.FateData> Fates { get; set; }
         public Dictionary<int, Models.DynamicEventData> DynamicEvents;
         public Dictionary<int, Models.InstanceData> Instances;

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
-<!-- StyleCop Analyzers configuration -->
+  <!-- StyleCop Analyzers configuration -->
   <PropertyGroup>
     <CodeAnalysisRuleSet>$(SolutionDir)StyleCop.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>