diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 3a2b28871..8e8872f94 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -30,4 +30,4 @@ jobs: - name: Build run: ./publish.cmd - name: Test - run: dotnet test --no-restore + run: dotnet test --no-restore --framework net6.0 diff --git a/Directory.Build.props b/Directory.Build.props index 7ebed0b53..27ca9d899 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ Kamron Batman ModernUO 2019-2020 - net6.0 + net5.0;net6.0 x64 x64 preview diff --git a/Projects/SerializationGenerator/SerializableMigration/Rules/DictionaryMigrationRule.cs b/Projects/SerializationGenerator/SerializableMigration/Rules/DictionaryMigrationRule.cs index 632fa61fd..309e4c461 100644 --- a/Projects/SerializationGenerator/SerializableMigration/Rules/DictionaryMigrationRule.cs +++ b/Projects/SerializationGenerator/SerializableMigration/Rules/DictionaryMigrationRule.cs @@ -15,7 +15,6 @@ using System; using System.Collections.Immutable; -using System.IO; using System.Linq; using System.Text; using Microsoft.CodeAnalysis; @@ -25,7 +24,6 @@ namespace SerializableMigration { public class DictionaryMigrationRule : ISerializableMigrationRule { - private const string KEY_VALUE_PAIR_DELIMITER = "----"; public string RuleName => nameof(DictionaryMigrationRule); public bool GenerateRuleState( @@ -78,25 +76,29 @@ namespace SerializableMigration extraOptions += "@Tidy"; } - var keyPropertyLength = serializableKeyProperty.RuleArguments?.Length ?? 0; - var valuePropertyLength = serializableValueProperty.RuleArguments?.Length ?? 0; - ruleArguments = new string[keyPropertyLength + valuePropertyLength + 6]; - ruleArguments[0] = extraOptions; - ruleArguments[1] = keySymbolType.ToDisplayString(); - ruleArguments[2] = serializableKeyProperty.Rule; + var keyArgumentsLength = serializableKeyProperty.RuleArguments?.Length ?? 0; + var valueArgumentsLength = serializableValueProperty.RuleArguments?.Length ?? 0; + var index = 0; - if (keyPropertyLength > 0) + ruleArguments = new string[7 + keyArgumentsLength + valueArgumentsLength]; + ruleArguments[index++] = extraOptions; + ruleArguments[index++] = keySymbolType.ToDisplayString(); + ruleArguments[index++] = serializableKeyProperty.Rule; + ruleArguments[index++] = keyArgumentsLength.ToString(); + + if (keyArgumentsLength > 0) { - Array.Copy(serializableKeyProperty.RuleArguments!, 0, ruleArguments, 3, keyPropertyLength); + Array.Copy(serializableKeyProperty.RuleArguments!, 0, ruleArguments, index, keyArgumentsLength); + index += keyArgumentsLength; } - ruleArguments[3 + keyPropertyLength] = KEY_VALUE_PAIR_DELIMITER; - ruleArguments[4 + keyPropertyLength] = valueSymbolType.ToDisplayString(); - ruleArguments[5 + keyPropertyLength] = serializableValueProperty.Rule; + ruleArguments[index++] = valueSymbolType.ToDisplayString(); + ruleArguments[index++] = serializableValueProperty.Rule; + ruleArguments[index++] = valueArgumentsLength.ToString(); - if (valuePropertyLength > 0) + if (valueArgumentsLength > 0) { - Array.Copy(serializableValueProperty.RuleArguments!, 0, ruleArguments, 6 + keyPropertyLength, valuePropertyLength); + Array.Copy(serializableValueProperty.RuleArguments!, 0, ruleArguments, index, valueArgumentsLength); } return true; @@ -112,20 +114,26 @@ namespace SerializableMigration } var ruleArguments = property.RuleArguments; + var index = 1; + var keyType = ruleArguments![index++]; - var keyElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments![2]]; - var valueRuleIndex = Array.IndexOf(ruleArguments, KEY_VALUE_PAIR_DELIMITER, 4); - if (valueRuleIndex == -1) + var keyElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]]; + var keyRuleArguments = new string[int.Parse(ruleArguments[index++])]; + + if (keyRuleArguments.Length > 0) { - throw new InvalidDataException($"Cannot find key-value delimiter in arguments for {property.Name}"); + Array.Copy(ruleArguments, index, keyRuleArguments, 0, keyRuleArguments.Length); + index += keyRuleArguments.Length; } - var keyRuleArguments = new string[valueRuleIndex - 3]; - Array.Copy(ruleArguments, 3, keyRuleArguments, 0, keyRuleArguments.Length); + var valueType = ruleArguments[index++]; + var valueElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]]; + var valueRuleArguments = new string[int.Parse(ruleArguments[index++])]; - var valueElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments[valueRuleIndex + 2]]; - var valueRuleArguments = new string[ruleArguments.Length - valueRuleIndex - 2]; - Array.Copy(ruleArguments, 2 + valueRuleIndex, valueRuleArguments, 0, valueRuleArguments.Length); + if (valueRuleArguments.Length > 0) + { + Array.Copy(ruleArguments, index, valueRuleArguments, 0, valueRuleArguments.Length); + } var propertyName = property.Name; var propertyVarPrefix = $"{char.ToLower(propertyName[0])}{propertyName.Substring(1, propertyName.Length - 1)}"; @@ -135,16 +143,16 @@ namespace SerializableMigration var propertyCount = $"{propertyVarPrefix}Count"; source.AppendLine($"{indent}{ruleArguments[1]} {propertyKeyEntry};"); - source.AppendLine($"{indent}{ruleArguments[valueRuleIndex + 1]} {propertyValueEntry};"); + source.AppendLine($"{indent}{valueType} {propertyValueEntry};"); source.AppendLine($"{indent}var {propertyCount} = reader.ReadEncodedInt();"); - source.AppendLine($"{indent}{propertyName} = new System.Collections.Generic.Dictionary<{ruleArguments[1]}, {ruleArguments[valueRuleIndex + 1]}>({propertyCount});"); + source.AppendLine($"{indent}{propertyName} = new System.Collections.Generic.Dictionary<{keyType}, {valueType}>({propertyCount});"); source.AppendLine($"{indent}for (var {propertyIndex} = 0; {propertyIndex} < {propertyCount}; {propertyIndex}++)"); source.AppendLine($"{indent}{{"); var serializableKeyElement = new SerializableProperty { Name = propertyKeyEntry, - Type = ruleArguments[1], + Type = keyType, Rule = keyElementRule.RuleName, RuleArguments = keyRuleArguments }; @@ -154,7 +162,7 @@ namespace SerializableMigration var serializableValueElement = new SerializableProperty { Name = propertyValueEntry, - Type = ruleArguments[valueRuleIndex + 1], + Type = valueType, Rule = valueElementRule.RuleName, RuleArguments = valueRuleArguments }; @@ -175,21 +183,27 @@ namespace SerializableMigration } var ruleArguments = property.RuleArguments; - var shouldTidy = ruleArguments![0].Contains("@Tidy"); + var index = 0; + var shouldTidy = ruleArguments![index++].Contains("@Tidy"); + var keyType = ruleArguments![index++]; - var keyElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments[2]]; - var valueRuleIndex = Array.IndexOf(ruleArguments, KEY_VALUE_PAIR_DELIMITER, 3); - if (valueRuleIndex == -1) + var keyElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments![index++]]; + var keyRuleArguments = new string[int.Parse(ruleArguments[index++])]; + + if (keyRuleArguments.Length > 0) { - throw new InvalidDataException($"Cannot find key-value delimiter in arguments for {property.Name}"); + Array.Copy(ruleArguments, index, keyRuleArguments, 0, keyRuleArguments.Length); + index += keyRuleArguments.Length; } - var keyRuleArguments = new string[valueRuleIndex - 3]; - Array.Copy(ruleArguments, 3, keyRuleArguments, 0, keyRuleArguments.Length); + var valueType = ruleArguments[index++]; + var valueElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]]; + var valueRuleArguments = new string[int.Parse(ruleArguments[index++])]; - var valueElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments[valueRuleIndex + 2]]; - var valueRuleArguments = new string[ruleArguments.Length - valueRuleIndex - 2]; - Array.Copy(ruleArguments, 2 + valueRuleIndex, valueRuleArguments, 0, valueRuleArguments.Length); + if (valueRuleArguments.Length > 0) + { + Array.Copy(ruleArguments, index, valueRuleArguments, 0, valueRuleArguments.Length); + } var propertyName = property.Name; var propertyVarPrefix = $"{char.ToLower(propertyName[0])}{propertyName.Substring(1, propertyName.Length - 1)}"; @@ -211,7 +225,7 @@ namespace SerializableMigration var serializableKeyElement = new SerializableProperty { Name = propertyKeyEntry, - Type = ruleArguments[1], + Type = keyType, Rule = keyElementRule.RuleName, RuleArguments = keyRuleArguments }; @@ -221,12 +235,12 @@ namespace SerializableMigration var serializableValueElement = new SerializableProperty { Name = propertyValueEntry, - Type = ruleArguments[valueRuleIndex + 1], + Type = valueType, Rule = valueElementRule.RuleName, RuleArguments = valueRuleArguments }; - keyElementRule.GenerateSerializationMethod(source, $"{indent} ", serializableValueElement); + valueElementRule.GenerateSerializationMethod(source, $"{indent} ", serializableValueElement); source.AppendLine($"{indent} }}"); source.AppendLine($"{indent}}}"); diff --git a/Projects/SerializationGenerator/SerializableMigration/Rules/KeyValuePairMigrationRule.cs b/Projects/SerializationGenerator/SerializableMigration/Rules/KeyValuePairMigrationRule.cs index 7ebdf064d..1797764c1 100644 --- a/Projects/SerializationGenerator/SerializableMigration/Rules/KeyValuePairMigrationRule.cs +++ b/Projects/SerializationGenerator/SerializableMigration/Rules/KeyValuePairMigrationRule.cs @@ -41,12 +41,12 @@ namespace SerializableMigration return false; } - var typeArguments = namedTypeSymbol.TypeArguments; + var keySymbolType = namedTypeSymbol.TypeArguments[0]; var keySerializedProperty = SerializableMigrationRulesEngine.GenerateSerializableProperty( compilation, "key", - typeArguments[0], + keySymbolType, 0, attributes, serializableTypes, @@ -55,10 +55,12 @@ namespace SerializableMigration null ); + var valueSymbolType = namedTypeSymbol.TypeArguments[1]; + var valueSerializedProperty = SerializableMigrationRulesEngine.GenerateSerializableProperty( compilation, "value", - typeArguments[1], + valueSymbolType, 1, attributes, serializableTypes, @@ -72,17 +74,19 @@ namespace SerializableMigration var index = 0; // Key - ruleArguments = new string[5 + keyArgumentsLength + valueArgumentsLength]; - ruleArguments[index++] = typeArguments[0].ToDisplayString(); + ruleArguments = new string[6 + keyArgumentsLength + valueArgumentsLength]; + ruleArguments[index++] = ""; // Extra options + ruleArguments[index++] = keySymbolType.ToDisplayString(); ruleArguments[index++] = keySerializedProperty.Rule; ruleArguments[index++] = keyArgumentsLength.ToString(); if (keyArgumentsLength > 0) { Array.Copy(keySerializedProperty.RuleArguments!, 0, ruleArguments, index, keyArgumentsLength); + index += keyArgumentsLength; } // Value - ruleArguments[index++] = typeArguments[1].ToDisplayString(); + ruleArguments[index++] = valueSymbolType.ToDisplayString(); ruleArguments[index++] = valueSerializedProperty.Rule; if (valueArgumentsLength > 0) @@ -103,10 +107,16 @@ namespace SerializableMigration } var ruleArguments = property.RuleArguments; - var keyType = ruleArguments![0]; - var keyRule = SerializableMigrationRulesEngine.Rules[ruleArguments[1]]; - var keyRuleArguments = new string[int.Parse(ruleArguments[2])]; - Array.Copy(ruleArguments, 3, keyRuleArguments, 0, keyRuleArguments.Length); + var index = 1; // skip extra options + var keyType = ruleArguments![index++]; + var keyRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]]; + var keyRuleArguments = new string[int.Parse(ruleArguments[index++])]; + + if (keyRuleArguments.Length > 0) + { + Array.Copy(ruleArguments, index, keyRuleArguments, 0, keyRuleArguments.Length); + index += keyRuleArguments.Length; + } var serializableKeyProperty = new SerializableProperty { @@ -123,11 +133,14 @@ namespace SerializableMigration parentReference ); - var valueIndex = 3 + keyRuleArguments.Length; - var valueType = ruleArguments[valueIndex++]; - var valueRule = SerializableMigrationRulesEngine.Rules[ruleArguments[valueIndex++]]; - var valueRuleArguments = new string[ruleArguments.Length - valueIndex]; - Array.Copy(ruleArguments, valueIndex, valueRuleArguments, 0, valueRuleArguments.Length); + var valueType = ruleArguments[index++]; + var valueRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]]; + var valueRuleArguments = new string[int.Parse(ruleArguments[index++])]; + + if (valueRuleArguments.Length > 0) + { + Array.Copy(ruleArguments, index, valueRuleArguments, 0, valueRuleArguments.Length); + } var serializableValueProperty = new SerializableProperty { @@ -137,7 +150,7 @@ namespace SerializableMigration RuleArguments = valueRuleArguments }; - keyRule.GenerateDeserializationMethod( + valueRule.GenerateDeserializationMethod( source, indent, serializableValueProperty, @@ -159,10 +172,16 @@ namespace SerializableMigration } var ruleArguments = property.RuleArguments; - var keyType = ruleArguments![0]; - var keyRule = SerializableMigrationRulesEngine.Rules[ruleArguments[1]]; - var keyRuleArguments = new string[int.Parse(ruleArguments[2])]; - Array.Copy(ruleArguments, 3, keyRuleArguments, 0, keyRuleArguments.Length); + var index = 1; // skip extra options + var keyType = ruleArguments![index++]; + var keyRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]]; + var keyRuleArguments = new string[int.Parse(ruleArguments[index++])]; + + if (keyRuleArguments.Length > 0) + { + Array.Copy(ruleArguments, index, keyRuleArguments, 0, keyRuleArguments.Length); + index += keyRuleArguments.Length; + } var serializableKeyProperty = new SerializableProperty { @@ -178,11 +197,14 @@ namespace SerializableMigration serializableKeyProperty ); - var valueIndex = 3 + keyRuleArguments.Length; - var valueType = ruleArguments[valueIndex++]; - var valueRule = SerializableMigrationRulesEngine.Rules[ruleArguments[valueIndex++]]; - var valueRuleArguments = new string[ruleArguments.Length - valueIndex]; - Array.Copy(ruleArguments, valueIndex, valueRuleArguments, 0, valueRuleArguments.Length); + var valueType = ruleArguments[index++]; + var valueRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]]; + var valueRuleArguments = new string[int.Parse(ruleArguments[index++])]; + + if (valueRuleArguments.Length > 0) + { + Array.Copy(ruleArguments, index, valueRuleArguments, 0, valueRuleArguments.Length); + } var serializableValueProperty = new SerializableProperty { @@ -192,7 +214,7 @@ namespace SerializableMigration RuleArguments = valueRuleArguments }; - keyRule.GenerateSerializationMethod( + valueRule.GenerateSerializationMethod( source, indent, serializableValueProperty diff --git a/Projects/SerializationGenerator/SerializationGenerator.csproj b/Projects/SerializationGenerator/SerializationGenerator.csproj index 1839dfeb3..03b5a5bdb 100755 --- a/Projects/SerializationGenerator/SerializationGenerator.csproj +++ b/Projects/SerializationGenerator/SerializationGenerator.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + netstandard2.0 preview analyzers diff --git a/azure-pipelines.yml b/azure-pipelines.yml index db3ef8f9a..6923ed2ae 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,7 +27,7 @@ jobs: - task: NuGetAuthenticate@0 - script: ./publish.cmd Release win displayName: 'Build' - - script: dotnet test --no-restore + - script: dotnet test --no-restore --framework net6.0 displayName: 'Test' - job: BuildLinux @@ -76,5 +76,5 @@ jobs: - task: NuGetAuthenticate@0 - script: ./publish.cmd Release $(os) displayName: 'Build' - - script: dotnet test --no-restore + - script: dotnet test --no-restore --framework net6.0 displayName: 'Test' diff --git a/publish.cmd b/publish.cmd index 140dd547c..e0f9fe6df 100755 --- a/publish.cmd +++ b/publish.cmd @@ -32,8 +32,8 @@ dotnet clean --verbosity quiet echo dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json -echo dotnet publish ${config} ${os} --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj -dotnet publish ${config} ${os} --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj +echo dotnet publish ${config} ${os} --framework net6.0 --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj +dotnet publish ${config} ${os} --framework net6.0 --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj echo dotnet build -c Release Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj dotnet build -c Release Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj @@ -65,8 +65,8 @@ dotnet clean --verbosity quiet echo dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json -echo dotnet publish %config% %os% --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj -dotnet publish %config% %os% --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj +echo dotnet publish %config% %os% --framework net6.0 --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj +dotnet publish %config% %os% --framework net6.0 --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj echo dotnet build -c Release Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj dotnet build -c Release Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj