Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit b032565

Browse files
shmaoshmao
authored
Move XmlSerializer CodeGen from SGen to S.P.Xml (#26169)
* Move XmlSerializer CodeGen from SGen to S.P.Xml (#24401) * Move XmlSerializer CodeGen from SGen to S.P.Xml The PR is moving the CodeGen code of XmlSerializer from SGen back to System.Private.Xml. * One minor change. * Error handling. * Add PreGenOnly Check for FromMappings. * Fix the sgen generated code error for a type with mismatched attribute and property. (#24671) * Removed XMLSERIALIZERGENERATOR entries.
1 parent d576779 commit b032565

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+5786
-6331
lines changed

‎src/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj‎

Lines changed: 0 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -6,153 +6,15 @@
66
<AssemblyName>dotnet-Microsoft.XmlSerializer.Generator</AssemblyName>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<StringResourcesPath>..\..\System.Private.Xml\src\Resources\Strings.resx</StringResourcesPath>
9-
<DefineConstants>$(DefineConstants);XMLSERIALIZERGENERATOR</DefineConstants>
10-
<SourceDir>..\..\System.Private.Xml\src</SourceDir>
119
<OutputType>Exe</OutputType>
1210
<TargetExt>.dll</TargetExt>
1311
<NoWarn>$(NoWarn);0169;0414;0649</NoWarn>
1412
</PropertyGroup>
1513
<!-- Default configurations to help VS understand the options -->
1614
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
1715
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
18-
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
19-
<Compile Include="$(CommonPath)\System\CSharpHelpers.cs" />
20-
<Compile Include="$(CommonPath)\System\LocalAppContext.cs" />
21-
<Compile Include="$(SourceDir)\System\Xml\BinHexDecoder.cs">
22-
<Link>System\Xml\BinHexDecoder.cs</Link>
23-
</Compile>
24-
<Compile Include="$(SourceDir)\System\Xml\BinHexEncoder.cs">
25-
<Link>System\Xml\BinHexEncoder.cs</Link>
26-
</Compile>
27-
<Compile Include="$(SourceDir)\System\Xml\Core\LocalAppContextSwitches.cs">
28-
<Link>System\Xml\Core\LocalAppContextSwitches.cs</Link>
29-
</Compile>
30-
<Compile Include="$(SourceDir)\System\Xml\Extensions\ExtensionMethods.cs">
31-
<Link>System\Xml\Extensions\ExtensionMethods.cs</Link>
32-
</Compile>
33-
<Compile Include="$(SourceDir)\System\Xml\Serialization\CodeGenerationoptions.cs">
34-
<Link>System\Xml\Serialization\CodeGenerationoptions.cs</Link>
35-
</Compile>
36-
<Compile Include="$(SourceDir)\System\Xml\Serialization\CodeIdentifier.cs">
37-
<Link>System\Xml\Serialization\CodeIdentifier.cs</Link>
38-
</Compile>
39-
<Compile Include="$(SourceDir)\System\Xml\Serialization\CodeIdentifiers.cs">
40-
<Link>System\Xml\Serialization\CodeIdentifiers.cs</Link>
41-
</Compile>
42-
<Compile Include="$(SourceDir)\System\Xml\Serialization\Compilation.cs">
43-
<Link>System\Xml\Serialization\Compilation.cs</Link>
44-
</Compile>
45-
<Compile Include="$(SourceDir)\System\Xml\Serialization\Compiler.cs">
46-
<Link>System\Xml\Serialization\Compiler.cs</Link>
47-
</Compile>
48-
<Compile Include="$(SourceDir)\System\Xml\Serialization\Configuration\DateTimeSerializationSection.cs">
49-
<Link>System\Xml\Serialization\Configuration\DateTimeSerializationSection.cs</Link>
50-
</Compile>
51-
<Compile Include="$(SourceDir)\System\Xml\Serialization\Globals.cs">
52-
<Link>System\Xml\Serialization\Globals.cs</Link>
53-
</Compile>
54-
<Compile Include="$(SourceDir)\System\Xml\Serialization\indentedWriter.cs">
55-
<Link>System\Xml\Serialization\indentedWriter.cs</Link>
56-
</Compile>
57-
<Compile Include="$(SourceDir)\System\Xml\Serialization\IXmlTextParser.cs">
58-
<Link>System\Xml\Serialization\IXmlTextParser.cs</Link>
59-
</Compile>
60-
<Compile Include="$(SourceDir)\System\Xml\Serialization\Mappings.cs">
61-
<Link>System\Xml\Serialization\Mappings.cs</Link>
62-
</Compile>
63-
<Compile Include="$(SourceDir)\System\Xml\Serialization\Models.cs">
64-
<Link>System\Xml\Serialization\Models.cs</Link>
65-
</Compile>
66-
<Compile Include="$(SourceDir)\System\Xml\Serialization\NameTable.cs">
67-
<Link>System\Xml\Serialization\NameTable.cs</Link>
68-
</Compile>
69-
<Compile Include="$(SourceDir)\System\Xml\Serialization\PrimitiveXmlSerializers.cs">
70-
<Link>System\Xml\Serialization\PrimitiveXmlSerializers.cs</Link>
71-
</Compile>
72-
<Compile Include="$(SourceDir)\System\Xml\Serialization\SoapReflectionImporter.cs">
73-
<Link>System\Xml\Serialization\SoapReflectionImporter.cs</Link>
74-
</Compile>
75-
<Compile Include="$(SourceDir)\System\Xml\Serialization\SoapSchemamember.cs">
76-
<Link>System\Xml\Serialization\SoapSchemamember.cs</Link>
77-
</Compile>
78-
<Compile Include="$(SourceDir)\System\Xml\Serialization\TypeCode.cs">
79-
<Link>System\Xml\Serialization\TypeCode.cs</Link>
80-
</Compile>
81-
<Compile Include="$(SourceDir)\System\Xml\Serialization\TypeExtensions.cs">
82-
<Link>System\Xml\Serialization\TypeExtensions.cs</Link>
83-
</Compile>
84-
<Compile Include="$(SourceDir)\System\Xml\Serialization\Types.cs">
85-
<Link>System\Xml\Serialization\Types.cs</Link>
86-
</Compile>
87-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlAttributeOverrides.cs">
88-
<Link>System\Xml\Serialization\XmlAttributeOverrides.cs</Link>
89-
</Compile>
90-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlAttributes.cs">
91-
<Link>System\Xml\Serialization\XmlAttributes.cs</Link>
92-
</Compile>
93-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlCountingReader.cs">
94-
<Link>System\Xml\Serialization\XmlCountingReader.cs</Link>
95-
</Compile>
96-
<Compile Include="$(SourceDir)\System\Xml\Serialization\Xmlcustomformatter.cs">
97-
<Link>System\Xml\Serialization\Xmlcustomformatter.cs</Link>
98-
</Compile>
99-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlMapping.cs">
100-
<Link>System\Xml\Serialization\XmlMapping.cs</Link>
101-
</Compile>
102-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlMemberMapping.cs">
103-
<Link>System\Xml\Serialization\XmlMemberMapping.cs</Link>
104-
</Compile>
105-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlMembersMapping.cs">
106-
<Link>System\Xml\Serialization\XmlMembersMapping.cs</Link>
107-
</Compile>
108-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlReflectionImporter.cs">
109-
<Link>System\Xml\Serialization\XmlReflectionImporter.cs</Link>
110-
</Compile>
111-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlReflectionMember.cs">
112-
<Link>System\Xml\Serialization\XmlReflectionMember.cs</Link>
113-
</Compile>
114-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlSerializationGeneratedCode.cs">
115-
<Link>System\Xml\Serialization\XmlSerializationGeneratedCode.cs</Link>
116-
</Compile>
117-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlSerializationReader.cs">
118-
<Link>System\Xml\Serialization\XmlSerializationReader.cs</Link>
119-
</Compile>
120-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlSerializationWriter.cs">
121-
<Link>System\Xml\Serialization\XmlSerializationWriter.cs</Link>
122-
</Compile>
123-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlSerializer.cs">
124-
<Link>System\Xml\Serialization\XmlSerializer.cs</Link>
125-
</Compile>
126-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlSerializerFactory.cs">
127-
<Link>System\Xml\Serialization\XmlSerializerFactory.cs</Link>
128-
</Compile>
129-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlSerializerNamespaces.cs">
130-
<Link>System\Xml\Serialization\XmlSerializerNamespaces.cs</Link>
131-
</Compile>
132-
<Compile Include="$(SourceDir)\System\Xml\Serialization\XmlTypeMapping.cs">
133-
<Link>System\Xml\Serialization\XmlTypeMapping.cs</Link>
134-
</Compile>
135-
<Compile Include="$(SourceDir)\System\Xml\Serialization\_Events.cs">
136-
<Link>System\Xml\Serialization\_Events.cs</Link>
137-
</Compile>
138-
<Compile Include="$(SourceDir)\System\Xml\XmlCharType.cs">
139-
<Link>System\Xml\XmlCharType.cs</Link>
140-
</Compile>
141-
<Compile Include="$(SourceDir)\System\Xml\XmlReservedNs.cs">
142-
<Link>System\Xml\XmlReservedNs.cs</Link>
143-
</Compile>
144-
</ItemGroup>
14516
<ItemGroup>
146-
<Compile Include="Microsoft\XmlSerializer\Generator\XmlSerializationGeneratedCode.cs" />
147-
<Compile Include="Microsoft\XmlSerializer\Generator\XmlSerializationReader.cs" />
148-
<Compile Include="Microsoft\XmlSerializer\Generator\XmlSerializationWriter.cs" />
14917
<Compile Include="Sgen.cs" />
150-
<Compile Include="System\Xml\Serialization\SoapAttributesExtensions.cs" />
151-
<Compile Include="System\Xml\Serialization\XmlAnyElementAttributeExtensions.cs" />
152-
<Compile Include="System\Xml\Serialization\XmlArrayItemAttributeExtensions.cs" />
153-
<Compile Include="System\Xml\Serialization\XmlChoiceIdentifierAttributeExtensions.cs" />
154-
<Compile Include="System\Xml\Serialization\XmlElementAttributeExtension.cs" />
155-
<Compile Include="System\Xml\Serialization\XmlRootAttributeExtensions.cs" />
15618
</ItemGroup>
15719
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
15820
<Import Project=".\GenerateThisAssemblyCs.targets" />

0 commit comments

Comments
 (0)