Merge branch 'release/2.33.33.3331'

Author: tautcony

.github/workflows/dotnet-ci.yml

@@ -0,0 +1,70 @@
+# For more information on GitHub Actions, refer to https://github.com/features/actions
+# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications,
+# refer to https://github.com/microsoft/github-actions-for-desktop-apps
+
+name: .NET Desktop
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        configuration: [Release]
+        targetplatform: [x64]
+
+    runs-on: windows-2022    # For a list of available runner types, refer to
+                             # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
+
+    env:
+      Solution_Name: Time_Shift.sln                         # Replace with your solution name, i.e. MyWpfApp.sln.
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    # Install the .NET workload
+    - name: Install .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 5.0.x
+
+    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
+    - name: Setup MSBuild.exe
+      uses: microsoft/setup-msbuild@v1
+
+    - uses: nuget/setup-nuget@v1
+      with:
+        nuget-version: '5.x'
+
+    - name: Restore Nuget packages
+      run: nuget restore $env:Solution_Name
+
+    # Restore the application to populate the obj folder with RuntimeIdentifiers
+    - name: Restore the application
+      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
+      env:
+        Configuration: ${{ matrix.configuration }}
+
+    # Build the Application project
+    - name: Build the Application Project
+      run: msbuild $env:Solution_Name /p:Platform=$env:TargetPlatform /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:BuildMode /p:AppxBundle=$env:AppxBundle
+      env:
+        AppxBundle: Never
+        BuildMode: SideloadOnly
+        Configuration: ${{ matrix.configuration }}
+        TargetPlatform: ${{ matrix.targetplatform }}
+
+    # Upload the package: https://github.com/actions/upload-artifact
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: Package-${{ matrix.configuration }}
+        path: |
+          Time_Shift\bin\${{ matrix.targetplatform }}\${{ matrix.configuration }}\
+          !Time_Shift\bin\${{ matrix.targetplatform }}\${{ matrix.configuration }}\*.xml
+          !Time_Shift\bin\${{ matrix.targetplatform }}\${{ matrix.configuration }}\*.pdb

.gitignore

@@ -15,8 +15,6 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
-x64/
-x86/
 build/
 bld/
 [Bb]in/

.travis.yml

@@ -371,3 +371,13 @@
 - 增加安装包构建脚本
 - 修正`Any CPU`编译条件，mp4文件在64位系统下无法正确加载的问题
 - 修正四舍五入后为1000毫秒时时间未能进位的问题
+
+## [2.33.33.333]
+- 修正json导出序列化问题
+- 更新依赖版本
+
+## [2.33.33.3331]
+- 移除注册表的使用
+- 更新依赖版本
+- 增加对playitem无marks的mpls文件的处理
+- 增加github action

ChangeLog.md

@@ -1,16 +1,18 @@
-# ChapterTool [![Build status](https://ci.appveyor.com/api/projects/status/rtc76h5ulveafj5f?svg=true)](https://ci.appveyor.com/project/tautcony/chaptertool)
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Ftautcony%2FChapterTool.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Ftautcony%2FChapterTool?ref=badge_shield)
+<div align="center">
 
-- ChapterTool is made for extracting chapter from various types of files and edit it.
+# ChapterTool </br> ![License: GPL v3](https://img.shields.io/github/license/tautcony/chaptertool.svg) [![Build status](https://ci.appveyor.com/api/projects/status/rtc76h5ulveafj5f?svg=true)](https://ci.appveyor.com/project/tautcony/chaptertool) ![](https://img.shields.io/github/downloads/tautcony/chaptertool/total.svg)
+
+A simple tool for extracting chapters from various types of files and editing them.
+</div>
 
 ## Feature
 
-- Extract chapter file from various types of file
-- Freely time adjustment(expression in Infix notation or Reverse Polish notation)
-- Move all chapter number backward optionally(for OGM format)
-- Load chapter name from a text file as template
+- Extract chapter file from different file types
+- Multiple time adjustments (expression in Infix notation or Reverse Polish notation)
+- Move all chapter numbers backwards optionally (for OGM format)
+- Load chapter name from text file as template
 - Calculate frames from chapter time
-- Supported save formats: `.txt`, `.xml`, `.qpf`, `.json`
+- Supported saving formats: `.txt`, `.xml`, `.qpf`, `.json`.
 
 ### Supported file type
 
@@ -27,7 +29,7 @@
 ## Thanks to
 
  - [Chapters file time Editor](https://www.nmm-hd.org/newbbs/viewtopic.php?f=16&t=24)
- - [BD Chapters MOD](https://www.nmm-hd.org/newbbs/viewtopic.php?f=16&t=517) (no longer in use)
+ - [BD Chapters MOD](https://www.nmm-hd.org/newbbs/viewtopic.php?f=16&t=517)
  - [gMKVExtractGUI](http://sourceforge.net/projects/gmkvextractgui/)
  - [Chapter Grabber](http://jvance.com/pages/ChapterGrabber.xhtml)
  - [MKVToolNix](https://www.bunkus.org/videotools/mkvtoolnix/links.html)
@@ -40,17 +42,14 @@
 
 ## Requirements
 
-- You must have `.NET Framework 4.7` available from Windows Update.
-- The matroska file's support is powerd by [`MKVToolNix`](https://mkvtoolnix.download/downloads.html#windows).
-- The mp4 file's support is powerd by `libmp4v2`, you need get the dll before using this feature.
-
-## Source Code
+- You must have the `.NET Framework 4.8` available from Windows Update.
+- The matroska file support is powered by [`MKVToolNix`](https://mkvtoolnix.download/downloads.html#windows).
+- The mp4 file support is powered by `libmp4v2`, you need to get the dll before using this feature.
 
- - [BitBucket](https://bitbucket.org/TautCony/chaptertool)
- - [GitHub](https://github.com/tautcony/ChapterTool)
+## License
 
- ![](https://img.shields.io/github/downloads/tautcony/chaptertool/total.svg)
- ![](https://img.shields.io/github/license/tautcony/chaptertool.svg)
+Distributed under the GPLv3+ License. See LICENSE for more information.
 
-
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Ftautcony%2FChapterTool.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Ftautcony%2FChapterTool?ref=badge_large)
+## Source Code
+ - [GitHub](https://github.com/tautcony/ChapterTool)
+ - [BitBucket](https://bitbucket.org/TautCony/chaptertool)

README.md

@@ -12,6 +12,10 @@
         <assemblyIdentity name="Sigil" publicKeyToken="2d06c3494341c8ab" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

Time_Shift/App.config

@@ -17,6 +17,16 @@
                   <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
                 </xs:annotation>
               </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
                 <xs:annotation>
                   <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
@@ -43,6 +53,16 @@
                 <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
             <xs:attribute name="DisableCompression" type="xs:boolean">
               <xs:annotation>
                 <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
@@ -73,6 +93,16 @@
                 <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
             <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
               <xs:annotation>
                 <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>

Time_Shift/FodyWeavers.xsd

@@ -31,5 +31,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.33.33.333")]
-[assembly: AssemblyFileVersion("2.33.33.333")]
+[assembly: AssemblyVersion("2.33.33.3331")]
+[assembly: AssemblyFileVersion("2.33.33.3331")]