Merge branch 'dev'

Author: VolcanicArts

VRCOSC.App/Modules/Serialisation/SerialisableModule.cs

@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
-using VRCOSC.App.Packages;
 using VRCOSC.App.SDK.Modules;
 using VRCOSC.App.Serialisation;
 using VRCOSC.App.Utils;
@@ -13,9 +12,6 @@ namespace VRCOSC.App.Modules.Serialisation;
 
 public class SerialisableModule : SerialisableVersion
 {
-    [JsonProperty("package_version")]
-    public string? PackageVersion;
-
     [JsonProperty("enabled")]
     public bool Enabled;
 
@@ -33,7 +29,6 @@ public SerialisableModule()
     public SerialisableModule(Module module)
     {
         Version = 1;
-        PackageVersion = PackageManager.GetInstance().GetInstalledVersion(module.PackageID).ToString();
 
         Enabled = module.Enabled.Value;
         module.Settings.Where(pair => !pair.Value.InternalIsDefault()).ForEach(pair => Settings.Add(pair.Key, pair.Value.InternalSerialise()));

VRCOSC.App/Packages/PackageManager.cs

@@ -9,7 +9,6 @@
 using System.Threading.Tasks;
 using System.Windows;
 using Octokit;
-using Semver;
 using VRCOSC.App.Modules;
 using VRCOSC.App.Packages.Serialisation;
 using VRCOSC.App.Serialisation;
@@ -178,7 +177,6 @@ public async Task UninstallPackage(PackageSource packageSource)
 
     public bool IsInstalled(PackageSource packageSource) => packageSource.PackageID is not null && InstalledPackages.ContainsKey(packageSource.PackageID);
     public string GetInstalledVersion(PackageSource packageSource) => packageSource.PackageID is not null && InstalledPackages.TryGetValue(packageSource.PackageID, out var version) ? version : string.Empty;
-    public SemVersion GetInstalledVersion(string packageId) => packageId == "local" ? new SemVersion(0) : SemVersion.Parse(InstalledPackages[packageId], SemVersionStyles.Any);
 
     private async Task loadCommunityPackages()
     {

VRCOSC.App/SDK/Modules/Attributes.cs

@@ -2,7 +2,6 @@
 // See the LICENSE file in the repository root for full license text.
 
 using System;
-using Semver;
 
 // ReSharper disable ClassNeverInstantiated.Global
 
@@ -155,23 +154,6 @@ public ModuleSettingsWindowAttribute(Type windowType)
     }
 }
 
-[AttributeUsage(AttributeTargets.Method)]
-public class ModuleMigrationAttribute : Attribute
-{
-    internal SemVersion SourceVersion { get; }
-    internal SemVersion DestinationVersion { get; }
-    internal string SourceSetting { get; }
-    internal string DestinationSetting { get; }
-
-    public ModuleMigrationAttribute(string sourceVersion, string destinationVersion, string sourceSetting, string destinationSetting = "")
-    {
-        SourceVersion = SemVersion.Parse(sourceVersion, SemVersionStyles.Any);
-        DestinationVersion = SemVersion.Parse(destinationVersion, SemVersionStyles.Any);
-        SourceSetting = sourceSetting;
-        DestinationSetting = string.IsNullOrEmpty(destinationSetting) ? sourceSetting : destinationSetting;
-    }
-}
-
 public enum ModuleUpdateMode
 {
     /// <summary>

VRCOSC.App/SDK/Modules/Module.cs

@@ -11,7 +11,6 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using Semver;
 using VRCOSC.App.ChatBox;
 using VRCOSC.App.ChatBox.Clips;
 using VRCOSC.App.ChatBox.Clips.Variables;
@@ -102,8 +101,6 @@ public abstract class Module
     public bool HasPrefabs => GetType().GetCustomAttributes<ModulePrefabAttribute>().Any();
     public IEnumerable<ModulePrefabAttribute> Prefabs => GetType().GetCustomAttributes<ModulePrefabAttribute>();
 
-    internal Dictionary<string, Dictionary<SemVersion, MethodInfo>> Migrators = [];
-
     protected Module()
     {
         State.Subscribe(newState => Log(newState.ToString()));
@@ -126,7 +123,6 @@ internal void Load(string filePathOverride = "")
         Groups.Clear();
 
         setSettingsWindow();
-        generateMigrators();
 
         OnPreLoad();
 
@@ -172,29 +168,6 @@ private void setSettingsWindow()
         SettingsWindow = (IManagedWindow)window;
     }
 
-    private void generateMigrators()
-    {
-        Migrators.Clear();
-
-        GetType().GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy).ForEach(info =>
-        {
-            var isDefined = info.IsDefined(typeof(ModuleMigrationAttribute));
-            if (!isDefined) return;
-
-            var attribute = info.GetCustomAttribute<ModuleMigrationAttribute>()!;
-
-            var parameters = info.GetParameters();
-            if (parameters.Length != 1) throw new Exception("Migration methods must have 1 parameter");
-
-            var returnParameter = info.ReturnParameter;
-            if (returnParameter.ParameterType == typeof(void)) throw new Exception("Migration methods must have a return parameter");
-
-            Migrators.TryAdd(attribute.SourceSetting, new Dictionary<SemVersion, MethodInfo>());
-
-            Migrators[attribute.SourceSetting].Add(attribute.SourceVersion, info);
-        });
-    }
-
     #endregion
 
     #region Persistence