warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes dictionary codegen (#844)

Browse source 
* Fixes code gen with .net 6 by not using .net 6
* Fixes dictionary codegen
* Fixes kvp codegen
This commit is contained in:
Kamron Batman 2021-11-13 16:18:16 -08:00 • committed by GitHub
parent c31bf20d0e
commit 78f587f496
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 112 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build-test.yml vendored
View file

@ -30,4 +30,4 @@ jobs:
- name: Build - name: Build
run: ./publish.cmd run: ./publish.cmd
- name: Test - name: Test
run: dotnet test --no-restore run: dotnet test --no-restore --framework net6.0

2
Directory.Build.props
View file

@ -4,7 +4,7 @@
<Authors>Kamron Batman</Authors> <Authors>Kamron Batman</Authors>
<Company>ModernUO</Company> <Company>ModernUO</Company>
<Copyright>2019-2020</Copyright> <Copyright>2019-2020</Copyright>
<TargetFramework>net6.0</TargetFramework> <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
<LangVersion>preview</LangVersion> <LangVersion>preview</LangVersion>

96
Projects/SerializationGenerator/SerializableMigration/Rules/DictionaryMigrationRule.cs
View file

@ -15,7 +15,6 @@
using System; using System;
using System.Collections.Immutable; using System.Collections.Immutable;
using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis;
@ -25,7 +24,6 @@ namespace SerializableMigration
{ {
public class DictionaryMigrationRule : ISerializableMigrationRule public class DictionaryMigrationRule : ISerializableMigrationRule
{ {
private const string KEY_VALUE_PAIR_DELIMITER = "----";
public string RuleName => nameof(DictionaryMigrationRule); public string RuleName => nameof(DictionaryMigrationRule);
public bool GenerateRuleState( public bool GenerateRuleState(
@ -78,25 +76,29 @@ namespace SerializableMigration
extraOptions += "@Tidy"; extraOptions += "@Tidy";
} }
var keyPropertyLength = serializableKeyProperty.RuleArguments?.Length ?? 0; var keyArgumentsLength = serializableKeyProperty.RuleArguments?.Length ?? 0;
var valuePropertyLength = serializableValueProperty.RuleArguments?.Length ?? 0; var valueArgumentsLength = serializableValueProperty.RuleArguments?.Length ?? 0;
ruleArguments = new string[keyPropertyLength + valuePropertyLength + 6]; var index = 0;
ruleArguments[0] = extraOptions;
ruleArguments[1] = keySymbolType.ToDisplayString();
ruleArguments[2] = serializableKeyProperty.Rule;
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[index++] = valueSymbolType.ToDisplayString();
ruleArguments[4 + keyPropertyLength] = valueSymbolType.ToDisplayString(); ruleArguments[index++] = serializableValueProperty.Rule;
ruleArguments[5 + keyPropertyLength] = 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; return true;
@ -112,20 +114,26 @@ namespace SerializableMigration
} }
var ruleArguments = property.RuleArguments; var ruleArguments = property.RuleArguments;
var index = 1;
var keyType = ruleArguments![index++];
var keyElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments![2]]; var keyElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]];
var valueRuleIndex = Array.IndexOf(ruleArguments, KEY_VALUE_PAIR_DELIMITER, 4); var keyRuleArguments = new string[int.Parse(ruleArguments[index++])];
if (valueRuleIndex == -1)
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]; var valueType = ruleArguments[index++];
Array.Copy(ruleArguments, 3, keyRuleArguments, 0, keyRuleArguments.Length); var valueElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]];
var valueRuleArguments = new string[int.Parse(ruleArguments[index++])];
var valueElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments[valueRuleIndex + 2]]; if (valueRuleArguments.Length > 0)
var valueRuleArguments = new string[ruleArguments.Length - valueRuleIndex - 2]; {
Array.Copy(ruleArguments, 2 + valueRuleIndex, valueRuleArguments, 0, valueRuleArguments.Length); Array.Copy(ruleArguments, index, valueRuleArguments, 0, valueRuleArguments.Length);
}
var propertyName = property.Name; var propertyName = property.Name;
var propertyVarPrefix = $"{char.ToLower(propertyName[0])}{propertyName.Substring(1, propertyName.Length - 1)}"; var propertyVarPrefix = $"{char.ToLower(propertyName[0])}{propertyName.Substring(1, propertyName.Length - 1)}";
@ -135,16 +143,16 @@ namespace SerializableMigration
var propertyCount = $"{propertyVarPrefix}Count"; var propertyCount = $"{propertyVarPrefix}Count";
source.AppendLine($"{indent}{ruleArguments[1]} {propertyKeyEntry};"); 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}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}for (var {propertyIndex} = 0; {propertyIndex} < {propertyCount}; {propertyIndex}++)");
source.AppendLine($"{indent}{{"); source.AppendLine($"{indent}{{");
var serializableKeyElement = new SerializableProperty var serializableKeyElement = new SerializableProperty
{ {
Name = propertyKeyEntry, Name = propertyKeyEntry,
Type = ruleArguments[1], Type = keyType,
Rule = keyElementRule.RuleName, Rule = keyElementRule.RuleName,
RuleArguments = keyRuleArguments RuleArguments = keyRuleArguments
}; };
@ -154,7 +162,7 @@ namespace SerializableMigration
var serializableValueElement = new SerializableProperty var serializableValueElement = new SerializableProperty
{ {
Name = propertyValueEntry, Name = propertyValueEntry,
Type = ruleArguments[valueRuleIndex + 1], Type = valueType,
Rule = valueElementRule.RuleName, Rule = valueElementRule.RuleName,
RuleArguments = valueRuleArguments RuleArguments = valueRuleArguments
}; };
@ -175,21 +183,27 @@ namespace SerializableMigration
} }
var ruleArguments = property.RuleArguments; 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 keyElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments![index++]];
var valueRuleIndex = Array.IndexOf(ruleArguments, KEY_VALUE_PAIR_DELIMITER, 3); var keyRuleArguments = new string[int.Parse(ruleArguments[index++])];
if (valueRuleIndex == -1)
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]; var valueType = ruleArguments[index++];
Array.Copy(ruleArguments, 3, keyRuleArguments, 0, keyRuleArguments.Length); var valueElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]];
var valueRuleArguments = new string[int.Parse(ruleArguments[index++])];
var valueElementRule = SerializableMigrationRulesEngine.Rules[ruleArguments[valueRuleIndex + 2]]; if (valueRuleArguments.Length > 0)
var valueRuleArguments = new string[ruleArguments.Length - valueRuleIndex - 2]; {
Array.Copy(ruleArguments, 2 + valueRuleIndex, valueRuleArguments, 0, valueRuleArguments.Length); Array.Copy(ruleArguments, index, valueRuleArguments, 0, valueRuleArguments.Length);
}
var propertyName = property.Name; var propertyName = property.Name;
var propertyVarPrefix = $"{char.ToLower(propertyName[0])}{propertyName.Substring(1, propertyName.Length - 1)}"; var propertyVarPrefix = $"{char.ToLower(propertyName[0])}{propertyName.Substring(1, propertyName.Length - 1)}";
@ -211,7 +225,7 @@ namespace SerializableMigration
var serializableKeyElement = new SerializableProperty var serializableKeyElement = new SerializableProperty
{ {
Name = propertyKeyEntry, Name = propertyKeyEntry,
Type = ruleArguments[1], Type = keyType,
Rule = keyElementRule.RuleName, Rule = keyElementRule.RuleName,
RuleArguments = keyRuleArguments RuleArguments = keyRuleArguments
}; };
@ -221,12 +235,12 @@ namespace SerializableMigration
var serializableValueElement = new SerializableProperty var serializableValueElement = new SerializableProperty
{ {
Name = propertyValueEntry, Name = propertyValueEntry,
Type = ruleArguments[valueRuleIndex + 1], Type = valueType,
Rule = valueElementRule.RuleName, Rule = valueElementRule.RuleName,
RuleArguments = valueRuleArguments RuleArguments = valueRuleArguments
}; };
keyElementRule.GenerateSerializationMethod(source, $"{indent} ", serializableValueElement); valueElementRule.GenerateSerializationMethod(source, $"{indent} ", serializableValueElement);
source.AppendLine($"{indent} }}"); source.AppendLine($"{indent} }}");
source.AppendLine($"{indent}}}"); source.AppendLine($"{indent}}}");

74
Projects/SerializationGenerator/SerializableMigration/Rules/KeyValuePairMigrationRule.cs
View file

@ -41,12 +41,12 @@ namespace SerializableMigration
return false; return false;
} }
var typeArguments = namedTypeSymbol.TypeArguments; var keySymbolType = namedTypeSymbol.TypeArguments[0];
var keySerializedProperty = SerializableMigrationRulesEngine.GenerateSerializableProperty( var keySerializedProperty = SerializableMigrationRulesEngine.GenerateSerializableProperty(
compilation, compilation,
"key", "key",
typeArguments[0], keySymbolType,
0, 0,
attributes, attributes,
serializableTypes, serializableTypes,
@ -55,10 +55,12 @@ namespace SerializableMigration
null null
); );
var valueSymbolType = namedTypeSymbol.TypeArguments[1];
var valueSerializedProperty = SerializableMigrationRulesEngine.GenerateSerializableProperty( var valueSerializedProperty = SerializableMigrationRulesEngine.GenerateSerializableProperty(
compilation, compilation,
"value", "value",
typeArguments[1], valueSymbolType,
1, 1,
attributes, attributes,
serializableTypes, serializableTypes,
@ -72,17 +74,19 @@ namespace SerializableMigration
var index = 0; var index = 0;
// Key // Key
ruleArguments = new string[5 + keyArgumentsLength + valueArgumentsLength]; ruleArguments = new string[6 + keyArgumentsLength + valueArgumentsLength];
ruleArguments[index++] = typeArguments[0].ToDisplayString(); ruleArguments[index++] = ""; // Extra options
ruleArguments[index++] = keySymbolType.ToDisplayString();
ruleArguments[index++] = keySerializedProperty.Rule; ruleArguments[index++] = keySerializedProperty.Rule;
ruleArguments[index++] = keyArgumentsLength.ToString(); ruleArguments[index++] = keyArgumentsLength.ToString();
if (keyArgumentsLength > 0) if (keyArgumentsLength > 0)
{ {
Array.Copy(keySerializedProperty.RuleArguments!, 0, ruleArguments, index, keyArgumentsLength); Array.Copy(keySerializedProperty.RuleArguments!, 0, ruleArguments, index, keyArgumentsLength);
index += keyArgumentsLength;
} }
// Value // Value
ruleArguments[index++] = typeArguments[1].ToDisplayString(); ruleArguments[index++] = valueSymbolType.ToDisplayString();
ruleArguments[index++] = valueSerializedProperty.Rule; ruleArguments[index++] = valueSerializedProperty.Rule;
if (valueArgumentsLength > 0) if (valueArgumentsLength > 0)
@ -103,10 +107,16 @@ namespace SerializableMigration
} }
var ruleArguments = property.RuleArguments; var ruleArguments = property.RuleArguments;
var keyType = ruleArguments![0]; var index = 1; // skip extra options
var keyRule = SerializableMigrationRulesEngine.Rules[ruleArguments[1]]; var keyType = ruleArguments![index++];
var keyRuleArguments = new string[int.Parse(ruleArguments[2])]; var keyRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]];
Array.Copy(ruleArguments, 3, keyRuleArguments, 0, keyRuleArguments.Length); 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 var serializableKeyProperty = new SerializableProperty
{ {
@ -123,11 +133,14 @@ namespace SerializableMigration
parentReference parentReference
); );
var valueIndex = 3 + keyRuleArguments.Length; var valueType = ruleArguments[index++];
var valueType = ruleArguments[valueIndex++]; var valueRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]];
var valueRule = SerializableMigrationRulesEngine.Rules[ruleArguments[valueIndex++]]; var valueRuleArguments = new string[int.Parse(ruleArguments[index++])];
var valueRuleArguments = new string[ruleArguments.Length - valueIndex];
Array.Copy(ruleArguments, valueIndex, valueRuleArguments, 0, valueRuleArguments.Length); if (valueRuleArguments.Length > 0)
{
Array.Copy(ruleArguments, index, valueRuleArguments, 0, valueRuleArguments.Length);
}
var serializableValueProperty = new SerializableProperty var serializableValueProperty = new SerializableProperty
{ {
@ -137,7 +150,7 @@ namespace SerializableMigration
RuleArguments = valueRuleArguments RuleArguments = valueRuleArguments
}; };
keyRule.GenerateDeserializationMethod( valueRule.GenerateDeserializationMethod(
source, source,
indent, indent,
serializableValueProperty, serializableValueProperty,
@ -159,10 +172,16 @@ namespace SerializableMigration
} }
var ruleArguments = property.RuleArguments; var ruleArguments = property.RuleArguments;
var keyType = ruleArguments![0]; var index = 1; // skip extra options
var keyRule = SerializableMigrationRulesEngine.Rules[ruleArguments[1]]; var keyType = ruleArguments![index++];
var keyRuleArguments = new string[int.Parse(ruleArguments[2])]; var keyRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]];
Array.Copy(ruleArguments, 3, keyRuleArguments, 0, keyRuleArguments.Length); 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 var serializableKeyProperty = new SerializableProperty
{ {
@ -178,11 +197,14 @@ namespace SerializableMigration
serializableKeyProperty serializableKeyProperty
); );
var valueIndex = 3 + keyRuleArguments.Length; var valueType = ruleArguments[index++];
var valueType = ruleArguments[valueIndex++]; var valueRule = SerializableMigrationRulesEngine.Rules[ruleArguments[index++]];
var valueRule = SerializableMigrationRulesEngine.Rules[ruleArguments[valueIndex++]]; var valueRuleArguments = new string[int.Parse(ruleArguments[index++])];
var valueRuleArguments = new string[ruleArguments.Length - valueIndex];
Array.Copy(ruleArguments, valueIndex, valueRuleArguments, 0, valueRuleArguments.Length); if (valueRuleArguments.Length > 0)
{
Array.Copy(ruleArguments, index, valueRuleArguments, 0, valueRuleArguments.Length);
}
var serializableValueProperty = new SerializableProperty var serializableValueProperty = new SerializableProperty
{ {
@ -192,7 +214,7 @@ namespace SerializableMigration
RuleArguments = valueRuleArguments RuleArguments = valueRuleArguments
}; };
keyRule.GenerateSerializationMethod( valueRule.GenerateSerializationMethod(
source, source,
indent, indent,
serializableValueProperty serializableValueProperty

2
Projects/SerializationGenerator/SerializationGenerator.csproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFrameworks>netstandard2.0</TargetFrameworks>
<LangVersion>preview</LangVersion> <LangVersion>preview</LangVersion>
<BuildOutputTargetFolder>analyzers</BuildOutputTargetFolder> <BuildOutputTargetFolder>analyzers</BuildOutputTargetFolder>
</PropertyGroup> </PropertyGroup>

4
azure-pipelines.yml
View file

@ -27,7 +27,7 @@ jobs:
- task: NuGetAuthenticate@0 - task: NuGetAuthenticate@0
- script: ./publish.cmd Release win - script: ./publish.cmd Release win
displayName: 'Build' displayName: 'Build'
- script: dotnet test --no-restore - script: dotnet test --no-restore --framework net6.0
displayName: 'Test' displayName: 'Test'
- job: BuildLinux - job: BuildLinux
@ -76,5 +76,5 @@ jobs:
- task: NuGetAuthenticate@0 - task: NuGetAuthenticate@0
- script: ./publish.cmd Release $(os) - script: ./publish.cmd Release $(os)
displayName: 'Build' displayName: 'Build'
- script: dotnet test --no-restore - script: dotnet test --no-restore --framework net6.0
displayName: 'Test' displayName: 'Test'

8
publish.cmd
View file

@ -32,8 +32,8 @@ dotnet clean --verbosity quiet
echo dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json 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 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 echo dotnet publish ${config} ${os} --framework net6.0 --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 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 echo dotnet build -c Release Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj
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 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 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 echo dotnet publish %config% %os% --framework net6.0 --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 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 echo dotnet build -c Release Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj
dotnet build -c Release Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj dotnet build -c Release Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj