Fix #154

mganss · Dec 28, 2019 · 0a6640d · 0a6640d
1 parent 679e1f8
commit 0a6640d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj b/XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj
@@ -12,6 +12,7 @@
  <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
  <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+ <LangVersion>latest</LangVersion>
  </PropertyGroup>
  <ItemGroup>
  <Compile Remove="xsd\vstst\vstst2.cs" />

diff --git a/XmlSchemaClassGenerator/TypeModel.cs b/XmlSchemaClassGenerator/TypeModel.cs
@@ -914,10 +914,18 @@ public void AddMembersTo(CodeTypeDeclaration typeDeclaration, bool withDataBindi
  {
  var ifNotEquals = new CodeConditionStatement(
  new CodeBinaryOperatorExpression(
- new CodeMethodInvokeExpression(valueExpression, "Equals", getValueOrDefaultExpression),
- CodeBinaryOperatorType.ValueEquality,
- new CodePrimitiveExpression(false)
- ),
+ new CodeBinaryOperatorExpression(
+ new CodeMethodInvokeExpression(valueExpression, "Equals", getValueOrDefaultExpression),
+ CodeBinaryOperatorType.ValueEquality,
+ new CodePrimitiveExpression(false)
+ ),
+ CodeBinaryOperatorType.BooleanOr,
+ new CodeBinaryOperatorExpression(
+ new CodeMethodInvokeExpression(specifiedExpression, "Equals", hasValueExpression),
+ CodeBinaryOperatorType.ValueEquality,
+ new CodePrimitiveExpression(false)
+ )
+ ),
  setValueStatement,
  setSpecifiedStatement,
  new CodeExpressionStatement(new CodeMethodInvokeExpression(null, "OnPropertyChanged",

diff --git a/XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj b/XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj
@@ -18,6 +18,7 @@
  <RepositoryType>git</RepositoryType>
  <RepositoryUrl>git://github.com/mganss/XmlSchemaClassGenerator</RepositoryUrl>
  <RootNamespace>XmlSchemaClassGenerator</RootNamespace>
+ <LangVersion>latest</LangVersion>
  </PropertyGroup>
 
  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">