Use Configuration.CodeTypeReferenceOptions everywhere CodeTypeReferen…

…ces are created
mganss · Jun 25, 2019 · 3a0a1bb · 3a0a1bb
1 parent 282893b
commit 3a0a1bb
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 15 deletions.
diff --git a/XmlSchemaClassGenerator.Console/XmlSchemaClassGenerator.Console.csproj b/XmlSchemaClassGenerator.Console/XmlSchemaClassGenerator.Console.csproj
@@ -27,7 +27,7 @@
  </None>
  </ItemGroup>
  <ItemGroup>
- <PackageReference Include="Glob.cs" Version="2.0.13" />
+ <PackageReference Include="Glob.cs" Version="3.0.27" />
  <PackageReference Include="Mono.Options" Version="5.3.0.1" />
  </ItemGroup>
 </Project>
diff --git a/XmlSchemaClassGenerator.Tests/Compiler.cs b/XmlSchemaClassGenerator.Tests/Compiler.cs
@@ -82,7 +82,7 @@ public static Assembly GenerateFiles(string name, IEnumerable<string> files, Gen
  EntityFramework = false,
  GenerateInterfaces = true,
  NamespacePrefix = name,
- GenerateDescriptionAttribute = true
+ GenerateDescriptionAttribute = true,
  };
 
  var output = new FileWatcherOutputWriter(Path.Combine("output", name));
@@ -99,7 +99,8 @@ public static Assembly GenerateFiles(string name, IEnumerable<string> files, Gen
  EntityFramework = generatorPrototype.EntityFramework,
  GenerateInterfaces = generatorPrototype.GenerateInterfaces,
  MemberVisitor = generatorPrototype.MemberVisitor,
- GenerateDescriptionAttribute = generatorPrototype.GenerateDescriptionAttribute
+ GenerateDescriptionAttribute = generatorPrototype.GenerateDescriptionAttribute,
+ CodeTypeReferenceOptions = generatorPrototype.CodeTypeReferenceOptions
  };
 
  gen.Generate(files);

diff --git a/XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj b/XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj
@@ -18,15 +18,15 @@
  <ProjectReference Include="..\XmlSchemaClassGenerator\XmlSchemaClassGenerator.csproj" />
  </ItemGroup>
  <ItemGroup>
- <PackageReference Include="coverlet.msbuild" Version="2.4.0">
+ <PackageReference Include="coverlet.msbuild" Version="2.6.2">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
  </PackageReference>
- <PackageReference Include="Glob.cs" Version="2.0.13" />
+ <PackageReference Include="Glob.cs" Version="3.0.27" />
  <PackageReference Include="Microsoft.Net.Compilers.netcore" Version="1.3.2" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
  <PackageReference Include="System.CodeDom" Version="4.5.0" />
- <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
+ <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
  <PackageReference Include="System.ValueTuple" Version="4.5.0" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
  <PrivateAssets>all</PrivateAssets>

diff --git a/XmlSchemaClassGenerator.Tests/XmlTests.cs b/XmlSchemaClassGenerator.Tests/XmlTests.cs
@@ -114,7 +114,19 @@ public void TestList()
  [UseCulture("en-US")]
  public void TestSimple()
  {
- Compiler.Generate("Simple", SimplePattern);
+ Compiler.Generate("Simple", SimplePattern, new Generator
+ {
+ GenerateNullables = true,
+ IntegerDataType = typeof(int),
+ DataAnnotationMode = DataAnnotationMode.All,
+ GenerateDesignerCategoryAttribute = false,
+ GenerateComplexTypesForCollections = true,
+ EntityFramework = false,
+ GenerateInterfaces = true,
+ NamespacePrefix = "Simple",
+ GenerateDescriptionAttribute = true,
+ CodeTypeReferenceOptions = CodeTypeReferenceOptions.GlobalReference
+ });
  TestSamples("Simple", SimplePattern);
  }
 

diff --git a/XmlSchemaClassGenerator.Tests/xsd/simple/simple.xsd b/XmlSchemaClassGenerator.Tests/xsd/simple/simple.xsd
@@ -385,6 +385,7 @@
  <xs:list itemType="xs:unsignedShort" />
  </xs:simpleType>
  </xs:attribute>
+ <xs:attribute name="System" type="xs:string"></xs:attribute>
  </xs:complexType>
  </xs:element>
 </xs:schema>
diff --git a/XmlSchemaClassGenerator/RestrictionModel.cs b/XmlSchemaClassGenerator/RestrictionModel.cs
@@ -89,7 +89,7 @@ public override DataAnnotationMode MinimumDataAnnotationMode
 
  public override CodeAttributeDeclaration GetAttribute()
  {
- var a = new CodeAttributeDeclaration(new CodeTypeReference(typeof(StringLengthAttribute)),
+ var a = new CodeAttributeDeclaration(new CodeTypeReference(typeof(StringLengthAttribute), Configuration.CodeTypeReferenceOptions),
  new CodeAttributeArgument(Max > 0 ? (CodeExpression)new CodePrimitiveExpression(Max) : new CodeSnippetExpression("int.MaxValue")));
  if (Min > 0) { a.Arguments.Add(new CodeAttributeArgument("MinimumLength", new CodePrimitiveExpression(Min))); }
 
@@ -120,7 +120,8 @@ public override DataAnnotationMode MinimumDataAnnotationMode
 
  public override CodeAttributeDeclaration GetAttribute()
  {
- return new CodeAttributeDeclaration(new CodeTypeReference(typeof(MaxLengthAttribute)), new CodeAttributeArgument(new CodePrimitiveExpression(Value)));
+ return new CodeAttributeDeclaration(new CodeTypeReference(typeof(MaxLengthAttribute), Configuration.CodeTypeReferenceOptions),
+ new CodeAttributeArgument(new CodePrimitiveExpression(Value)));
  }
  }
 
@@ -147,7 +148,8 @@ public override DataAnnotationMode MinimumDataAnnotationMode
 
  public override CodeAttributeDeclaration GetAttribute()
  {
- return new CodeAttributeDeclaration(new CodeTypeReference(typeof(MinLengthAttribute)), new CodeAttributeArgument(new CodePrimitiveExpression(Value)));
+ return new CodeAttributeDeclaration(new CodeTypeReference(typeof(MinLengthAttribute), Configuration.CodeTypeReferenceOptions),
+ new CodeAttributeArgument(new CodePrimitiveExpression(Value)));
  }
  }
 
@@ -218,7 +220,8 @@ public override DataAnnotationMode MinimumDataAnnotationMode
 
  public override CodeAttributeDeclaration GetAttribute()
  {
- return new CodeAttributeDeclaration(new CodeTypeReference(typeof(RegularExpressionAttribute)), new CodeAttributeArgument(new CodePrimitiveExpression(Value)));
+ return new CodeAttributeDeclaration(new CodeTypeReference(typeof(RegularExpressionAttribute), Configuration.CodeTypeReferenceOptions),
+ new CodeAttributeArgument(new CodePrimitiveExpression(Value)));
  }
  }
 

diff --git a/XmlSchemaClassGenerator/TypeModel.cs b/XmlSchemaClassGenerator/TypeModel.cs
@@ -184,7 +184,7 @@ public virtual CodeTypeReference GetReferenceFor(NamespaceModel referencingNames
  name = forInit ? SimpleModel.GetCollectionImplementationName(name, Configuration) : SimpleModel.GetCollectionDefinitionName(name, Configuration);
  }
 
- return new CodeTypeReference(name);
+ return new CodeTypeReference(name, Configuration.CodeTypeReferenceOptions);
  }
 
  public virtual CodeExpression GetDefaultValueFor(string defaultString, bool attribute)
@@ -910,7 +910,7 @@ public void AddMembersTo(CodeTypeDeclaration typeDeclaration, bool withDataBindi
  {
  var specifiedProperty = new CodeMemberProperty
  {
- Type = new CodeTypeReference(typeof(bool)),
+ Type = new CodeTypeReference(typeof(bool), Configuration.CodeTypeReferenceOptions),
  Name = Name + "Specified",
  HasSet = false,
  HasGet = true,
@@ -1268,7 +1268,8 @@ public override CodeExpression GetDefaultValueFor(string defaultString, bool att
  }
  else if (type == typeof(DateTime))
  {
- var rv = new CodeMethodInvokeExpression(new CodeTypeReferenceExpression(typeof(DateTime)), "Parse", new CodePrimitiveExpression(defaultString));
+ var rv = new CodeMethodInvokeExpression(new CodeTypeReferenceExpression(new CodeTypeReference(typeof(DateTime), Configuration.CodeTypeReferenceOptions)),
+ "Parse", new CodePrimitiveExpression(defaultString));
  return rv;
  }
  else if (type == typeof(bool) && !string.IsNullOrWhiteSpace(defaultString))