Bump version to 0.2, add version info to PkgTool and PkgEditor.

maxton · May 16, 2020 · 72370ca · 72370ca
1 parent d781b7b
commit 72370ca
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 10 deletions.
diff --git a/LibOrbisPkg.Core/LibOrbisPkg.Core.csproj b/LibOrbisPkg.Core/LibOrbisPkg.Core.csproj
@@ -7,6 +7,7 @@
     <Platforms>AnyCPU</Platforms>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>CORE</DefineConstants>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -43,6 +44,7 @@
     <Compile Include="..\LibOrbisPkg\PKG\PkgWriter.cs" Link="PKG\PkgWriter.cs" />
     <Compile Include="..\LibOrbisPkg\PlayGo\ChunkDat.cs" Link="PlayGo\ChunkDat.cs" />
     <Compile Include="..\LibOrbisPkg\PlayGo\Manifest.cs" Link="PlayGo\Manifest.cs" />
+    <Compile Include="..\LibOrbisPkg\Properties\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
     <Compile Include="..\LibOrbisPkg\Rif\LicenseDat.cs" Link="Rif\LicenseDat.cs" />
     <Compile Include="..\LibOrbisPkg\Rif\LicenseInfo.cs" Link="Rif\LicenseInfo.cs" />
     <Compile Include="..\LibOrbisPkg\SFO\ParamSfo.cs" Link="SFO\ParamSfo.cs" />
@@ -60,6 +62,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="Properties\" />
     <Folder Include="PlayGo\" />
     <Folder Include="Util\" />
     <Folder Include="Rif\" />

diff --git a/LibOrbisPkg/Properties/AssemblyInfo.cs b/LibOrbisPkg/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("LibOrbisPkg")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright © 2018-2020 Maxton")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.0.0")]
+[assembly: AssemblyFileVersion("0.2.0.0")]
diff --git a/PkgEditor/MainWin.Designer.cs b/PkgEditor/MainWin.Designer.cs
diff --git a/PkgEditor/MainWin.cs b/PkgEditor/MainWin.cs
@@ -8,6 +8,7 @@
 using System.IO;
 using LibOrbisPkg;
 using System.Windows.Forms;
+using System.Diagnostics;
 
 namespace PkgEditor
 {
@@ -263,5 +264,23 @@ private void cryptoDebuggerToolStripMenuItem_Click(object sender, EventArgs e)
     {
       OpenTab(new Views.CryptoDebug(), "Crypto Debugger");
     }
+
+    private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+      var assembly = System.Reflection.Assembly.GetExecutingAssembly();
+      var version = FileVersionInfo.GetVersionInfo(assembly.Location).FileVersion;
+      var libAssembly = System.Reflection.Assembly.GetAssembly(typeof(LibOrbisPkg.PKG.Pkg));
+      var libVersion = FileVersionInfo.GetVersionInfo(libAssembly.Location).FileVersion;
+      MessageBox.Show(this, 
+        "PkgEditor (c) 2020 Maxton" + Environment.NewLine +
+        "LibOrbisPkg version "+ libVersion + Environment.NewLine +
+        "PkgEditor version " + version,
+        "About PkgEditor");
+    }
+
+    private void visitGitHubRepoToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+      Process.Start("https://github.com/maxton/LibOrbisPkg");
+    }
   }
 }
diff --git a/PkgEditor/Properties/AssemblyInfo.cs b/PkgEditor/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("PkgEditor")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright © 2018-2020 Maxton")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.0.0")]
+[assembly: AssemblyFileVersion("0.2.0.0")]
diff --git a/PkgTool/Program.cs b/PkgTool/Program.cs
@@ -473,6 +473,19 @@ static void Main(string[] args)
             new ParamSfo().Write(f);
           }
         }),
+      Verb.Create(
+        "version",
+        "Print the version and exit.",
+        new List<ArgDef>(),
+        _ => {
+          var assembly = System.Reflection.Assembly.GetExecutingAssembly();
+          var version = System.Diagnostics.FileVersionInfo.GetVersionInfo(assembly.Location).FileVersion;
+          var libAssembly = System.Reflection.Assembly.GetAssembly(typeof(Pkg));
+          var libVersion = System.Diagnostics.FileVersionInfo.GetVersionInfo(libAssembly.Location).FileVersion;
+          Console.WriteLine("PkgTool (c) 2020 Maxton");
+          Console.WriteLine("LibOrbisPkg version " + libVersion);
+          Console.WriteLine("PkgTool version " + version);
+        }),
     };
 
     private static void ExtractInParallel(PfsReader inner, string outPath, bool verbose)
@@ -582,6 +595,8 @@ public static Verb Create(string name, string helpText, List<ArgDef> args, Actio
     }
     public override string ToString()
     {
+      if (Args == null || Args.Count == 0)
+        return Name;
       var options = Args
         .Select(x => 
           x.Type == ArgType.Boolean ? $"[--{x.Name}]" :

diff --git a/PkgTool/Properties/AssemblyInfo.cs b/PkgTool/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.0.0")]
+[assembly: AssemblyFileVersion("0.2.0.0")]
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.1.{build}
+version: 0.2.{build}
 
 
 branches: