Skip to content

Commit 3ca6891

Browse files
committed
Merge branch 'dev'
2 parents 591dec4 + d0aae3f commit 3ca6891

File tree

2 files changed

+2
-47
lines changed

2 files changed

+2
-47
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<GlobalVersionYear>$([System.DateTime]::Now.ToString("yyyy"))</GlobalVersionYear>
44
<GlobalVersionMonthDay>$([System.DateTime]::Now.ToString("Mdd"))</GlobalVersionMonthDay>
5-
<GlobalBuild>0</GlobalBuild>
5+
<GlobalBuild>1</GlobalBuild>
66
<GlobalVersion>$(GlobalVersionYear).$(GlobalVersionMonthDay).$(GlobalBuild).0</GlobalVersion>
77
</PropertyGroup>
8-
</Project>
8+
</Project>

VRCOSC.App/Modules/Serialisation/ModuleSerialiser.cs

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
// See the LICENSE file in the repository root for full license text.
33

44
using System;
5-
using System.Collections.Generic;
65
using System.IO;
7-
using System.Reflection;
8-
using Semver;
9-
using VRCOSC.App.Packages;
10-
using VRCOSC.App.SDK.Modules;
116
using VRCOSC.App.SDK.Modules.Attributes.Settings;
127
using VRCOSC.App.Serialisation;
138
using VRCOSC.App.Utils;
@@ -31,50 +26,10 @@ protected override bool ExecuteAfterDeserialisation(SerialisableModule data)
3126

3227
Reference.Enabled.Value = data.Enabled;
3328

34-
var clonedSettings = new Dictionary<string, object?>(data.Settings);
35-
3629
foreach (var settingPair in data.Settings)
3730
{
3831
var (settingKey, settingValue) = settingPair;
3932

40-
var savedVersion = data.PackageVersion is not null ? SemVersion.Parse(data.PackageVersion) : new SemVersion(0);
41-
var latestVersion = PackageManager.GetInstance().GetInstalledVersion(Reference.PackageID);
42-
43-
while (savedVersion != latestVersion)
44-
{
45-
if (Reference.Migrators.TryGetValue(settingKey, out var migrator))
46-
{
47-
if (migrator.TryGetValue(savedVersion, out MethodInfo? info))
48-
{
49-
var attribute = info.GetCustomAttribute<ModuleMigrationAttribute>()!;
50-
var sourceType = info.GetParameters()[0].ParameterType;
51-
52-
if (TryConvertToTargetType(settingValue, sourceType, out var convertedValue))
53-
{
54-
settingValue = info.Invoke(Reference, [convertedValue]);
55-
settingKey = attribute.DestinationSetting;
56-
savedVersion = attribute.DestinationVersion;
57-
shouldReserialise = true;
58-
}
59-
}
60-
else
61-
{
62-
break;
63-
}
64-
}
65-
else
66-
{
67-
break;
68-
}
69-
}
70-
71-
clonedSettings[settingKey] = settingValue;
72-
}
73-
74-
foreach (var settingPair in clonedSettings)
75-
{
76-
var (settingKey, settingValue) = settingPair;
77-
7833
try
7934
{
8035
var setting = Reference.GetSetting<ModuleSetting>(settingKey);

0 commit comments

Comments
 (0)