Fix #229

mganss · Oct 28, 2020 · d7c42d2 · d7c42d2
1 parent 8ad9388
commit d7c42d2
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj b/XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj
@@ -876,7 +876,7 @@
  <None Update="xsd\simple\restriction.xsd">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </None>
- <None Update="xsd\simple\simple.xsd">
+ <None Update="xsd\simple\windows1250.xsd">
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </None>
  <None Update="xsd\ts-api\ts-api_2_8.xsd">

diff --git a/XmlSchemaClassGenerator.Tests/xsd/simple/windows1250.xsd b/XmlSchemaClassGenerator.Tests/xsd/simple/windows1250.xsd
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="windows-1250"?>
+<xs:schema targetNamespace="http://tempuri.org/XMLSchema.xsd"
+ elementFormDefault="qualified"
+ xmlns="http://tempuri.org/XMLSchema.xsd"
+ xmlns:mstns="http://tempuri.org/XMLSchema.xsd"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+>
+ <xs:element name="Windows1250Root">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="elem" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/XmlSchemaClassGenerator/Generator.cs b/XmlSchemaClassGenerator/Generator.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Text;
 using System.Xml;
 using System.Xml.Schema;
 
@@ -258,6 +259,11 @@ public bool SeparateSubstitutes
  set { _configuration.SeparateSubstitutes = value; }
  }
 
+ static Generator()
+ {
+ Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+ }
+
  public void Generate(IEnumerable<string> files)
  {
  var set = new XmlSchemaSet();

diff --git a/XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj b/XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj
@@ -28,6 +28,10 @@
  <SymbolPackageFormat>snupkg</SymbolPackageFormat>
  </PropertyGroup>
 
+ <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+ <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
+ </PropertyGroup>
+
  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
  <Reference Include="System" />
  <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -37,19 +41,16 @@
  <Reference Include="Microsoft.CSharp" />
  <Reference Include="System.Data" />
  <Reference Include="System.Xml" />
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
  </ItemGroup>
 
- <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
- <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
- </PropertyGroup>
-
  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
  <PackageReference Include="System.CodeDom" Version="4.7.0" />
  </ItemGroup>
 
  <ItemGroup>
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
  <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+ <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
  </ItemGroup>
 
 </Project>