From f941ab1c0e4da0a5e5e1dce38421262ec65328f1 Mon Sep 17 00:00:00 2001
From: Hong Li <hongli@microsoft.com>
Date: Sun, 7 Aug 2022 22:39:40 -0700
Subject: [PATCH 1/4] fix a couple issues with
 Microsoft.XmlSerailizer.Generator

---
 .../src/GenerateNupkgProps.targets                          | 6 ++++++
 .../src/build/Microsoft.XmlSerializer.Generator.targets     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets b/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets
index 74fd8ebb92b2cd..04defc6873cced 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets
@@ -19,6 +19,12 @@
   &lt;ItemGroup&gt;
     &lt;DotNetCliToolReference Include="$(PackageId)" Version="$(PackageVersion)" /&gt;
   &lt;/ItemGroup&gt;
+  &lt;PropertyGroup&gt;
+    &lt;AddSerializers&gt;False&lt;/AddSerializers&gt;
+  &lt;/PropertyGroup&gt;
+  &lt;ItemGroup Condition="%24(AddSerializers)==True"&gt;
+    &lt;BuildOutputInPackage Include="%24(OutputPath)%2A.XmlSerializers.dll" /&gt;
+  &lt;/ItemGroup&gt;
 &lt;/Project&gt;
       </PropsFileContents>
     </PropertyGroup>
diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/src/build/Microsoft.XmlSerializer.Generator.targets b/src/libraries/Microsoft.XmlSerializer.Generator/src/build/Microsoft.XmlSerializer.Generator.targets
index 6d905920740908..86f3ed67ff7658 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/src/build/Microsoft.XmlSerializer.Generator.targets
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/src/build/Microsoft.XmlSerializer.Generator.targets
@@ -43,7 +43,7 @@
       Encoding="Unicode"/>      
   </Target> 
 
-  <Target Name="GenerateSerializationAssembly" AfterTargets="Build">
+  <Target Name="GenerateSerializationAssembly" AfterTargets="Build" Inputs="@(ReferencePath);@(IntermediateAssembly)" Outputs="$(_SerializerDllIntermediateFolder)">
     <Delete Condition="Exists('$(_SerializerDllIntermediateFolder)') == 'true'" Files="$(_SerializerDllIntermediateFolder)" ContinueOnError="true"/>
     <Delete Condition="Exists('$(_SerializerPdbIntermediateFolder)') == 'true'" Files="$(_SerializerPdbIntermediateFolder)" ContinueOnError="true"/>
     <Delete Condition="Exists('$(_SerializerCsIntermediateFolder)') == 'true'"  Files="$(_SerializerCsIntermediateFolder)" ContinueOnError="true"/>

From 4a83284ae5ac157077af17faae447394b5cf7602 Mon Sep 17 00:00:00 2001
From: Hong Li <hongli@microsoft.com>
Date: Mon, 8 Aug 2022 17:02:34 -0700
Subject: [PATCH 2/4] update per PR feedback

---
 .../src/GenerateNupkgProps.targets                          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets b/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets
index 04defc6873cced..27c24717af6a25 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets
@@ -20,10 +20,10 @@
     &lt;DotNetCliToolReference Include="$(PackageId)" Version="$(PackageVersion)" /&gt;
   &lt;/ItemGroup&gt;
   &lt;PropertyGroup&gt;
-    &lt;AddSerializers&gt;False&lt;/AddSerializers&gt;
+    &lt;SgenPackSerializer Condition="'%24(SgenPackSerializer)'==''"&gt;False&lt;/SgenPackSerializer&gt;
   &lt;/PropertyGroup&gt;
-  &lt;ItemGroup Condition="%24(AddSerializers)==True"&gt;
-    &lt;BuildOutputInPackage Include="%24(OutputPath)%2A.XmlSerializers.dll" /&gt;
+  &lt;ItemGroup Condition="%24(SgenPackSerializer)==True"&gt;
+    &lt;BuildOutputInPackage Include="%24(OutputPath)%24(AssemblyName).XmlSerializers.dll" /&gt;
   &lt;/ItemGroup&gt;
 &lt;/Project&gt;
       </PropsFileContents>

From fd40268cd5e5192270363040b5cf7fab90299d6f Mon Sep 17 00:00:00 2001
From: Hong Li <hongli@microsoft.com>
Date: Wed, 10 Aug 2022 22:19:32 -0700
Subject: [PATCH 3/4] update 2 - change default to True

---
 .../src/GenerateNupkgProps.targets                            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets b/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets
index 27c24717af6a25..5dc9dc189a1880 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets
@@ -20,9 +20,9 @@
     &lt;DotNetCliToolReference Include="$(PackageId)" Version="$(PackageVersion)" /&gt;
   &lt;/ItemGroup&gt;
   &lt;PropertyGroup&gt;
-    &lt;SgenPackSerializer Condition="'%24(SgenPackSerializer)'==''"&gt;False&lt;/SgenPackSerializer&gt;
+    &lt;SgenPackSerializer Condition="'%24(SgenPackSerializer)'==''"&gt;True&lt;/SgenPackSerializer&gt;
   &lt;/PropertyGroup&gt;
-  &lt;ItemGroup Condition="%24(SgenPackSerializer)==True"&gt;
+  &lt;ItemGroup Condition="'%24(SgenPackSerializer)''==True"&gt;
     &lt;BuildOutputInPackage Include="%24(OutputPath)%24(AssemblyName).XmlSerializers.dll" /&gt;
   &lt;/ItemGroup&gt;
 &lt;/Project&gt;

From 6cdc16129cf49eff8af631a20f1a2c05295d64bc Mon Sep 17 00:00:00 2001
From: Hong Li <hongli@microsoft.com>
Date: Thu, 11 Aug 2022 01:16:44 -0700
Subject: [PATCH 4/4] correct a mistake

---
 .../src/GenerateNupkgProps.targets                              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets b/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets
index 5dc9dc189a1880..031f9371df0aa7 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets
@@ -22,7 +22,7 @@
   &lt;PropertyGroup&gt;
     &lt;SgenPackSerializer Condition="'%24(SgenPackSerializer)'==''"&gt;True&lt;/SgenPackSerializer&gt;
   &lt;/PropertyGroup&gt;
-  &lt;ItemGroup Condition="'%24(SgenPackSerializer)''==True"&gt;
+  &lt;ItemGroup Condition="'%24(SgenPackSerializer)'=='True'"&gt;
     &lt;BuildOutputInPackage Include="%24(OutputPath)%24(AssemblyName).XmlSerializers.dll" /&gt;
   &lt;/ItemGroup&gt;
 &lt;/Project&gt;